iannucci@chromium.org | 405b87e | 2015-11-12 18:08:34 +0000 | [diff] [blame] | 1 | #!/usr/bin/env python |
miket@chromium.org | 183df1a | 2012-01-04 19:44:55 +0000 | [diff] [blame] | 2 | # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
maruel@chromium.org | 725f1c3 | 2011-04-01 20:24:54 +0000 | [diff] [blame] | 3 | # Use of this source code is governed by a BSD-style license that can be |
| 4 | # found in the LICENSE file. |
| 5 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 6 | # Copyright (C) 2008 Evan Martin <martine@danga.com> |
| 7 | |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 8 | """A git-command for integrating reviews on Rietveld and Gerrit.""" |
maruel@chromium.org | 725f1c3 | 2011-04-01 20:24:54 +0000 | [diff] [blame] | 9 | |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 10 | from __future__ import print_function |
| 11 | |
tapted@chromium.org | 6a0b07c | 2013-07-10 01:29:19 +0000 | [diff] [blame] | 12 | from distutils.version import LooseVersion |
calamity@chromium.org | ffde55c | 2015-03-12 00:44:17 +0000 | [diff] [blame] | 13 | from multiprocessing.pool import ThreadPool |
thakis@chromium.org | 3421c99 | 2014-11-02 02:20:32 +0000 | [diff] [blame] | 14 | import base64 |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 15 | import collections |
sheyang@google.com | 6ebaf78 | 2015-05-12 19:17:54 +0000 | [diff] [blame] | 16 | import httplib |
maruel@chromium.org | 4f6852c | 2012-04-20 20:39:20 +0000 | [diff] [blame] | 17 | import json |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 18 | import logging |
calamity@chromium.org | cf19748 | 2016-04-29 20:15:53 +0000 | [diff] [blame] | 19 | import multiprocessing |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 20 | import optparse |
| 21 | import os |
| 22 | import re |
ukai@chromium.org | 78c4b98 | 2012-02-14 02:20:26 +0000 | [diff] [blame] | 23 | import stat |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 24 | import sys |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 25 | import textwrap |
sheyang@google.com | 6ebaf78 | 2015-05-12 19:17:54 +0000 | [diff] [blame] | 26 | import traceback |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 27 | import urllib |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 28 | import urllib2 |
maruel@chromium.org | 967c0a8 | 2013-06-17 22:52:24 +0000 | [diff] [blame] | 29 | import urlparse |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 30 | import uuid |
thestig@chromium.org | 00858c8 | 2013-12-02 23:08:03 +0000 | [diff] [blame] | 31 | import webbrowser |
thakis@chromium.org | 3421c99 | 2014-11-02 02:20:32 +0000 | [diff] [blame] | 32 | import zlib |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 33 | |
| 34 | try: |
maruel@chromium.org | c98c0c5 | 2011-04-06 13:39:43 +0000 | [diff] [blame] | 35 | import readline # pylint: disable=F0401,W0611 |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 36 | except ImportError: |
| 37 | pass |
| 38 | |
maruel@chromium.org | 2e23ce3 | 2013-05-07 12:42:28 +0000 | [diff] [blame] | 39 | from third_party import colorama |
sheyang@google.com | 6ebaf78 | 2015-05-12 19:17:54 +0000 | [diff] [blame] | 40 | from third_party import httplib2 |
maruel@chromium.org | 2a74d37 | 2011-03-29 19:05:50 +0000 | [diff] [blame] | 41 | from third_party import upload |
vadimsh@chromium.org | cf6a5d2 | 2015-04-09 22:02:00 +0000 | [diff] [blame] | 42 | import auth |
skobes | 6468b90 | 2016-10-24 08:45:10 -0700 | [diff] [blame] | 43 | import checkout |
nick@chromium.org | 3ac1c4e | 2014-01-16 02:44:42 +0000 | [diff] [blame] | 44 | import clang_format |
tandrii@chromium.org | 71184c0 | 2016-01-13 15:18:44 +0000 | [diff] [blame] | 45 | import commit_queue |
erg@chromium.org | e0a7c5d | 2015-02-23 20:30:08 +0000 | [diff] [blame] | 46 | import dart_format |
iannucci@chromium.org | 596cd5c | 2016-04-04 21:34:39 +0000 | [diff] [blame] | 47 | import setup_color |
maruel@chromium.org | 6f09cd9 | 2011-04-01 16:38:12 +0000 | [diff] [blame] | 48 | import fix_encoding |
maruel@chromium.org | 0e0436a | 2011-10-25 13:32:41 +0000 | [diff] [blame] | 49 | import gclient_utils |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 50 | import gerrit_util |
szager@chromium.org | 151ebcf | 2016-03-09 01:08:25 +0000 | [diff] [blame] | 51 | import git_cache |
iannucci@chromium.org | 9e84927 | 2014-04-04 00:31:55 +0000 | [diff] [blame] | 52 | import git_common |
tandrii@chromium.org | 09d7a6a | 2016-03-04 15:44:48 +0000 | [diff] [blame] | 53 | import git_footers |
piman@chromium.org | 336f912 | 2014-09-04 02:16:55 +0000 | [diff] [blame] | 54 | import owners |
iannucci@chromium.org | 9e84927 | 2014-04-04 00:31:55 +0000 | [diff] [blame] | 55 | import owners_finder |
maruel@chromium.org | 2a74d37 | 2011-03-29 19:05:50 +0000 | [diff] [blame] | 56 | import presubmit_support |
maruel@chromium.org | cab38e9 | 2011-04-09 00:30:51 +0000 | [diff] [blame] | 57 | import rietveld |
maruel@chromium.org | 2a74d37 | 2011-03-29 19:05:50 +0000 | [diff] [blame] | 58 | import scm |
maruel@chromium.org | 0633fb4 | 2013-08-16 20:06:14 +0000 | [diff] [blame] | 59 | import subcommand |
maruel@chromium.org | 32f9f5e | 2011-09-14 13:41:47 +0000 | [diff] [blame] | 60 | import subprocess2 |
maruel@chromium.org | 2a74d37 | 2011-03-29 19:05:50 +0000 | [diff] [blame] | 61 | import watchlists |
| 62 | |
tandrii | 7400cf0 | 2016-06-21 08:48:07 -0700 | [diff] [blame] | 63 | __version__ = '2.0' |
maruel@chromium.org | 2a74d37 | 2011-03-29 19:05:50 +0000 | [diff] [blame] | 64 | |
tandrii | 9d2c7a3 | 2016-06-22 03:42:45 -0700 | [diff] [blame] | 65 | COMMIT_BOT_EMAIL = 'commit-bot@chromium.org' |
iannucci | e7f6895 | 2016-08-15 17:45:29 -0700 | [diff] [blame] | 66 | DEFAULT_SERVER = 'https://codereview.chromium.org' |
maruel@chromium.org | 0ba7f96 | 2011-01-11 22:13:58 +0000 | [diff] [blame] | 67 | POSTUPSTREAM_HOOK_PATTERN = '.git/hooks/post-cl-%s' |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 68 | DESCRIPTION_BACKUP_FILE = '~/.git_cl_description_backup' |
pgervais@chromium.org | d6617f3 | 2013-11-19 00:34:54 +0000 | [diff] [blame] | 69 | GIT_INSTRUCTIONS_URL = 'http://code.google.com/p/chromium/wiki/UsingGit' |
rmistry@google.com | c68112d | 2015-03-03 12:48:06 +0000 | [diff] [blame] | 70 | REFS_THAT_ALIAS_TO_OTHER_REFS = { |
| 71 | 'refs/remotes/origin/lkgr': 'refs/remotes/origin/master', |
| 72 | 'refs/remotes/origin/lkcr': 'refs/remotes/origin/master', |
| 73 | } |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 74 | |
thestig@chromium.org | 44202a2 | 2014-03-11 19:22:18 +0000 | [diff] [blame] | 75 | # Valid extensions for files we want to lint. |
| 76 | DEFAULT_LINT_REGEX = r"(.*\.cpp|.*\.cc|.*\.h)" |
| 77 | DEFAULT_LINT_IGNORE_REGEX = r"$^" |
| 78 | |
borenet | 6c0efe6 | 2016-10-19 08:13:29 -0700 | [diff] [blame] | 79 | # Buildbucket master name prefix. |
| 80 | MASTER_PREFIX = 'master.' |
| 81 | |
maruel@chromium.org | 2e23ce3 | 2013-05-07 12:42:28 +0000 | [diff] [blame] | 82 | # Shortcut since it quickly becomes redundant. |
| 83 | Fore = colorama.Fore |
maruel@chromium.org | 9054173 | 2011-04-01 17:54:18 +0000 | [diff] [blame] | 84 | |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 85 | # Initialized in main() |
| 86 | settings = None |
| 87 | |
| 88 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 89 | def DieWithError(message): |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 90 | print(message, file=sys.stderr) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 91 | sys.exit(1) |
| 92 | |
| 93 | |
thestig@chromium.org | 8b0553c | 2014-02-11 00:33:37 +0000 | [diff] [blame] | 94 | def GetNoGitPagerEnv(): |
| 95 | env = os.environ.copy() |
| 96 | # 'cat' is a magical git string that disables pagers on all platforms. |
| 97 | env['GIT_PAGER'] = 'cat' |
| 98 | return env |
| 99 | |
vadimsh@chromium.org | 566a02a | 2014-08-22 01:34:13 +0000 | [diff] [blame] | 100 | |
bsep@chromium.org | 627d900 | 2016-04-29 00:00:52 +0000 | [diff] [blame] | 101 | def RunCommand(args, error_ok=False, error_message=None, shell=False, **kwargs): |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 102 | try: |
bsep@chromium.org | 627d900 | 2016-04-29 00:00:52 +0000 | [diff] [blame] | 103 | return subprocess2.check_output(args, shell=shell, **kwargs) |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 104 | except subprocess2.CalledProcessError as e: |
| 105 | logging.debug('Failed running %s', args) |
maruel@chromium.org | 32f9f5e | 2011-09-14 13:41:47 +0000 | [diff] [blame] | 106 | if not error_ok: |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 107 | DieWithError( |
maruel@chromium.org | 32f9f5e | 2011-09-14 13:41:47 +0000 | [diff] [blame] | 108 | 'Command "%s" failed.\n%s' % ( |
| 109 | ' '.join(args), error_message or e.stdout or '')) |
| 110 | return e.stdout |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 111 | |
| 112 | |
| 113 | def RunGit(args, **kwargs): |
maruel@chromium.org | 32f9f5e | 2011-09-14 13:41:47 +0000 | [diff] [blame] | 114 | """Returns stdout.""" |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 115 | return RunCommand(['git'] + args, **kwargs) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 116 | |
| 117 | |
enne@chromium.org | 3b7e15c | 2014-01-21 17:44:47 +0000 | [diff] [blame] | 118 | def RunGitWithCode(args, suppress_stderr=False): |
maruel@chromium.org | 32f9f5e | 2011-09-14 13:41:47 +0000 | [diff] [blame] | 119 | """Returns return code and stdout.""" |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 120 | if suppress_stderr: |
| 121 | stderr = subprocess2.VOID |
| 122 | else: |
| 123 | stderr = sys.stderr |
szager@chromium.org | 9bb85e2 | 2012-06-13 20:28:23 +0000 | [diff] [blame] | 124 | try: |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 125 | (out, _), code = subprocess2.communicate(['git'] + args, |
| 126 | env=GetNoGitPagerEnv(), |
| 127 | stdout=subprocess2.PIPE, |
| 128 | stderr=stderr) |
| 129 | return code, out |
| 130 | except subprocess2.CalledProcessError as e: |
| 131 | logging.debug('Failed running %s', args) |
| 132 | return e.returncode, e.stdout |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 133 | |
| 134 | |
bauerb@chromium.org | 27386dd | 2015-02-16 10:45:39 +0000 | [diff] [blame] | 135 | def RunGitSilent(args): |
clemensh@chromium.org | cbd7dc3 | 2016-05-31 10:33:50 +0000 | [diff] [blame] | 136 | """Returns stdout, suppresses stderr and ignores the return code.""" |
bauerb@chromium.org | 27386dd | 2015-02-16 10:45:39 +0000 | [diff] [blame] | 137 | return RunGitWithCode(args, suppress_stderr=True)[1] |
| 138 | |
| 139 | |
tapted@chromium.org | 6a0b07c | 2013-07-10 01:29:19 +0000 | [diff] [blame] | 140 | def IsGitVersionAtLeast(min_version): |
ilevy@chromium.org | cc56ee4 | 2013-07-10 22:16:29 +0000 | [diff] [blame] | 141 | prefix = 'git version ' |
tapted@chromium.org | 6a0b07c | 2013-07-10 01:29:19 +0000 | [diff] [blame] | 142 | version = RunGit(['--version']).strip() |
ilevy@chromium.org | cc56ee4 | 2013-07-10 22:16:29 +0000 | [diff] [blame] | 143 | return (version.startswith(prefix) and |
| 144 | LooseVersion(version[len(prefix):]) >= LooseVersion(min_version)) |
tapted@chromium.org | 6a0b07c | 2013-07-10 01:29:19 +0000 | [diff] [blame] | 145 | |
| 146 | |
pgervais@chromium.org | 8ba38ff | 2015-06-11 21:41:25 +0000 | [diff] [blame] | 147 | def BranchExists(branch): |
| 148 | """Return True if specified branch exists.""" |
| 149 | code, _ = RunGitWithCode(['rev-parse', '--verify', branch], |
| 150 | suppress_stderr=True) |
| 151 | return not code |
| 152 | |
| 153 | |
tandrii | 2a16b95 | 2016-10-19 07:09:44 -0700 | [diff] [blame] | 154 | def time_sleep(seconds): |
| 155 | # Use this so that it can be mocked in tests without interfering with python |
| 156 | # system machinery. |
| 157 | import time # Local import to discourage others from importing time globally. |
| 158 | return time.sleep(seconds) |
| 159 | |
| 160 | |
maruel@chromium.org | 9054173 | 2011-04-01 17:54:18 +0000 | [diff] [blame] | 161 | def ask_for_data(prompt): |
| 162 | try: |
| 163 | return raw_input(prompt) |
| 164 | except KeyboardInterrupt: |
| 165 | # Hide the exception. |
| 166 | sys.exit(1) |
| 167 | |
| 168 | |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 169 | def _git_branch_config_key(branch, key): |
| 170 | """Helper method to return Git config key for a branch.""" |
| 171 | assert branch, 'branch name is required to set git config for it' |
| 172 | return 'branch.%s.%s' % (branch, key) |
| 173 | |
| 174 | |
| 175 | def _git_get_branch_config_value(key, default=None, value_type=str, |
| 176 | branch=False): |
| 177 | """Returns git config value of given or current branch if any. |
| 178 | |
| 179 | Returns default in all other cases. |
| 180 | """ |
| 181 | assert value_type in (int, str, bool) |
| 182 | if branch is False: # Distinguishing default arg value from None. |
| 183 | branch = GetCurrentBranch() |
| 184 | |
rogerta@chromium.org | caa1655 | 2013-03-18 20:45:05 +0000 | [diff] [blame] | 185 | if not branch: |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 186 | return default |
rogerta@chromium.org | caa1655 | 2013-03-18 20:45:05 +0000 | [diff] [blame] | 187 | |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 188 | args = ['config'] |
tandrii | 33a46ff | 2016-08-23 05:53:40 -0700 | [diff] [blame] | 189 | if value_type == bool: |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 190 | args.append('--bool') |
tandrii | 33a46ff | 2016-08-23 05:53:40 -0700 | [diff] [blame] | 191 | # git config also has --int, but apparently git config suffers from integer |
| 192 | # overflows (http://crbug.com/640115), so don't use it. |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 193 | args.append(_git_branch_config_key(branch, key)) |
| 194 | code, out = RunGitWithCode(args) |
| 195 | if code == 0: |
| 196 | value = out.strip() |
| 197 | if value_type == int: |
| 198 | return int(value) |
| 199 | if value_type == bool: |
| 200 | return bool(value.lower() == 'true') |
| 201 | return value |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 202 | return default |
| 203 | |
| 204 | |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 205 | def _git_set_branch_config_value(key, value, branch=None, **kwargs): |
| 206 | """Sets the value or unsets if it's None of a git branch config. |
| 207 | |
| 208 | Valid, though not necessarily existing, branch must be provided, |
| 209 | otherwise currently checked out branch is used. |
| 210 | """ |
| 211 | if not branch: |
| 212 | branch = GetCurrentBranch() |
| 213 | assert branch, 'a branch name OR currently checked out branch is required' |
| 214 | args = ['config'] |
qyearsley | 12fa6ff | 2016-08-24 09:18:40 -0700 | [diff] [blame] | 215 | # Check for boolean first, because bool is int, but int is not bool. |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 216 | if value is None: |
| 217 | args.append('--unset') |
| 218 | elif isinstance(value, bool): |
| 219 | args.append('--bool') |
| 220 | value = str(value).lower() |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 221 | else: |
tandrii | 33a46ff | 2016-08-23 05:53:40 -0700 | [diff] [blame] | 222 | # git config also has --int, but apparently git config suffers from integer |
| 223 | # overflows (http://crbug.com/640115), so don't use it. |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 224 | value = str(value) |
| 225 | args.append(_git_branch_config_key(branch, key)) |
| 226 | if value is not None: |
| 227 | args.append(value) |
| 228 | RunGit(args, **kwargs) |
| 229 | |
| 230 | |
iannucci@chromium.org | 53937ba | 2012-10-02 18:20:43 +0000 | [diff] [blame] | 231 | def add_git_similarity(parser): |
| 232 | parser.add_option( |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 233 | '--similarity', metavar='SIM', type=int, action='store', |
iannucci@chromium.org | 53937ba | 2012-10-02 18:20:43 +0000 | [diff] [blame] | 234 | help='Sets the percentage that a pair of files need to match in order to' |
| 235 | ' be considered copies (default 50)') |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 236 | parser.add_option( |
| 237 | '--find-copies', action='store_true', |
| 238 | help='Allows git to look for copies.') |
| 239 | parser.add_option( |
| 240 | '--no-find-copies', action='store_false', dest='find_copies', |
| 241 | help='Disallows git from looking for copies.') |
iannucci@chromium.org | 53937ba | 2012-10-02 18:20:43 +0000 | [diff] [blame] | 242 | |
| 243 | old_parser_args = parser.parse_args |
| 244 | def Parse(args): |
| 245 | options, args = old_parser_args(args) |
| 246 | |
iannucci@chromium.org | 53937ba | 2012-10-02 18:20:43 +0000 | [diff] [blame] | 247 | if options.similarity is None: |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 248 | options.similarity = _git_get_branch_config_value( |
| 249 | 'git-cl-similarity', default=50, value_type=int) |
iannucci@chromium.org | 53937ba | 2012-10-02 18:20:43 +0000 | [diff] [blame] | 250 | else: |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 251 | print('Note: Saving similarity of %d%% in git config.' |
| 252 | % options.similarity) |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 253 | _git_set_branch_config_value('git-cl-similarity', options.similarity) |
iannucci@chromium.org | 53937ba | 2012-10-02 18:20:43 +0000 | [diff] [blame] | 254 | |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 255 | options.similarity = max(0, min(options.similarity, 100)) |
| 256 | |
| 257 | if options.find_copies is None: |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 258 | options.find_copies = _git_get_branch_config_value( |
| 259 | 'git-find-copies', default=True, value_type=bool) |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 260 | else: |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 261 | _git_set_branch_config_value('git-find-copies', bool(options.find_copies)) |
iannucci@chromium.org | 53937ba | 2012-10-02 18:20:43 +0000 | [diff] [blame] | 262 | |
| 263 | print('Using %d%% similarity for rename/copy detection. ' |
| 264 | 'Override with --similarity.' % options.similarity) |
| 265 | |
| 266 | return options, args |
| 267 | parser.parse_args = Parse |
| 268 | |
| 269 | |
machenbach@chromium.org | 4545314 | 2015-09-15 08:45:22 +0000 | [diff] [blame] | 270 | def _get_properties_from_options(options): |
| 271 | properties = dict(x.split('=', 1) for x in options.properties) |
| 272 | for key, val in properties.iteritems(): |
| 273 | try: |
| 274 | properties[key] = json.loads(val) |
| 275 | except ValueError: |
| 276 | pass # If a value couldn't be evaluated, treat it as a string. |
| 277 | return properties |
| 278 | |
| 279 | |
sheyang@google.com | 6ebaf78 | 2015-05-12 19:17:54 +0000 | [diff] [blame] | 280 | def _prefix_master(master): |
| 281 | """Convert user-specified master name to full master name. |
| 282 | |
| 283 | Buildbucket uses full master name(master.tryserver.chromium.linux) as bucket |
| 284 | name, while the developers always use shortened master name |
| 285 | (tryserver.chromium.linux) by stripping off the prefix 'master.'. This |
| 286 | function does the conversion for buildbucket migration. |
| 287 | """ |
borenet | 6c0efe6 | 2016-10-19 08:13:29 -0700 | [diff] [blame] | 288 | if master.startswith(MASTER_PREFIX): |
sheyang@google.com | 6ebaf78 | 2015-05-12 19:17:54 +0000 | [diff] [blame] | 289 | return master |
borenet | 6c0efe6 | 2016-10-19 08:13:29 -0700 | [diff] [blame] | 290 | return '%s%s' % (MASTER_PREFIX, master) |
| 291 | |
| 292 | |
| 293 | def _unprefix_master(bucket): |
| 294 | """Convert bucket name to shortened master name. |
| 295 | |
| 296 | Buildbucket uses full master name(master.tryserver.chromium.linux) as bucket |
| 297 | name, while the developers always use shortened master name |
| 298 | (tryserver.chromium.linux) by stripping off the prefix 'master.'. This |
| 299 | function does the conversion for buildbucket migration. |
| 300 | """ |
| 301 | if bucket.startswith(MASTER_PREFIX): |
| 302 | return bucket[len(MASTER_PREFIX):] |
| 303 | return bucket |
sheyang@google.com | 6ebaf78 | 2015-05-12 19:17:54 +0000 | [diff] [blame] | 304 | |
| 305 | |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 306 | def _buildbucket_retry(operation_name, http, *args, **kwargs): |
| 307 | """Retries requests to buildbucket service and returns parsed json content.""" |
| 308 | try_count = 0 |
| 309 | while True: |
| 310 | response, content = http.request(*args, **kwargs) |
| 311 | try: |
| 312 | content_json = json.loads(content) |
| 313 | except ValueError: |
| 314 | content_json = None |
| 315 | |
| 316 | # Buildbucket could return an error even if status==200. |
| 317 | if content_json and content_json.get('error'): |
nodir@chromium.org | baff4e1 | 2016-03-08 00:33:57 +0000 | [diff] [blame] | 318 | error = content_json.get('error') |
| 319 | if error.get('code') == 403: |
| 320 | raise BuildbucketResponseException( |
| 321 | 'Access denied: %s' % error.get('message', '')) |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 322 | msg = 'Error in response. Reason: %s. Message: %s.' % ( |
nodir@chromium.org | baff4e1 | 2016-03-08 00:33:57 +0000 | [diff] [blame] | 323 | error.get('reason', ''), error.get('message', '')) |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 324 | raise BuildbucketResponseException(msg) |
| 325 | |
| 326 | if response.status == 200: |
| 327 | if not content_json: |
| 328 | raise BuildbucketResponseException( |
| 329 | 'Buildbucket returns invalid json content: %s.\n' |
| 330 | 'Please file bugs at http://crbug.com, label "Infra-BuildBucket".' % |
| 331 | content) |
| 332 | return content_json |
| 333 | if response.status < 500 or try_count >= 2: |
| 334 | raise httplib2.HttpLib2Error(content) |
| 335 | |
| 336 | # status >= 500 means transient failures. |
| 337 | logging.debug('Transient errors when %s. Will retry.', operation_name) |
tandrii | 2a16b95 | 2016-10-19 07:09:44 -0700 | [diff] [blame] | 338 | time_sleep(0.5 + 1.5*try_count) |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 339 | try_count += 1 |
| 340 | assert False, 'unreachable' |
| 341 | |
| 342 | |
qyearsley | 1fdfcb6 | 2016-10-24 13:22:03 -0700 | [diff] [blame] | 343 | def _get_bucket_map(changelist, options, option_parser): |
qyearsley | dd49f94 | 2016-10-28 11:57:22 -0700 | [diff] [blame] | 344 | """Returns a dict mapping bucket names to builders and tests, |
| 345 | for triggering try jobs. |
qyearsley | 1fdfcb6 | 2016-10-24 13:22:03 -0700 | [diff] [blame] | 346 | """ |
qyearsley | dd49f94 | 2016-10-28 11:57:22 -0700 | [diff] [blame] | 347 | # If no bots are listed, we try to get a set of builders and tests based |
| 348 | # on GetPreferredTryMasters functions in PRESUBMIT.py files. |
qyearsley | 1fdfcb6 | 2016-10-24 13:22:03 -0700 | [diff] [blame] | 349 | if not options.bot: |
| 350 | change = changelist.GetChange( |
| 351 | changelist.GetCommonAncestorWithUpstream(), None) |
qyearsley | 136b49f | 2016-10-31 09:02:26 -0700 | [diff] [blame] | 352 | # Get try masters from PRESUBMIT.py files. |
nodir | e4f0fe0 | 2016-11-04 16:23:30 -0700 | [diff] [blame] | 353 | masters = presubmit_support.DoGetTryMasters( |
qyearsley | 1fdfcb6 | 2016-10-24 13:22:03 -0700 | [diff] [blame] | 354 | change=change, |
| 355 | changed_files=change.LocalPaths(), |
| 356 | repository_root=settings.GetRoot(), |
| 357 | default_presubmit=None, |
| 358 | project=None, |
| 359 | verbose=options.verbose, |
| 360 | output_stream=sys.stdout) |
nodir | e4f0fe0 | 2016-11-04 16:23:30 -0700 | [diff] [blame] | 361 | if masters is None: |
| 362 | return None |
| 363 | return {MASTER_PREFIX + m: b for m, b in masters.iteritems()} |
qyearsley | 1fdfcb6 | 2016-10-24 13:22:03 -0700 | [diff] [blame] | 364 | |
qyearsley | 1fdfcb6 | 2016-10-24 13:22:03 -0700 | [diff] [blame] | 365 | if options.bucket: |
| 366 | return {options.bucket: {b: [] for b in options.bot}} |
qyearsley | dd49f94 | 2016-10-28 11:57:22 -0700 | [diff] [blame] | 367 | if options.master: |
| 368 | return {_prefix_master(options.master): {b: [] for b in options.bot}} |
qyearsley | 1fdfcb6 | 2016-10-24 13:22:03 -0700 | [diff] [blame] | 369 | |
qyearsley | dd49f94 | 2016-10-28 11:57:22 -0700 | [diff] [blame] | 370 | # If bots are listed but no master or bucket, then we need to find out |
| 371 | # the corresponding master for each bot. |
| 372 | bucket_map, error_message = _get_bucket_map_for_builders(options.bot) |
| 373 | if error_message: |
| 374 | option_parser.error( |
| 375 | 'Tryserver master cannot be found because: %s\n' |
| 376 | 'Please manually specify the tryserver master, e.g. ' |
| 377 | '"-m tryserver.chromium.linux".' % error_message) |
| 378 | return bucket_map |
qyearsley | 1fdfcb6 | 2016-10-24 13:22:03 -0700 | [diff] [blame] | 379 | |
| 380 | |
qyearsley | 123a468 | 2016-10-26 09:12:17 -0700 | [diff] [blame] | 381 | def _get_bucket_map_for_builders(builders): |
| 382 | """Returns a map of buckets to builders for the given builders.""" |
qyearsley | 1fdfcb6 | 2016-10-24 13:22:03 -0700 | [diff] [blame] | 383 | map_url = 'https://builders-map.appspot.com/' |
| 384 | try: |
qyearsley | 123a468 | 2016-10-26 09:12:17 -0700 | [diff] [blame] | 385 | builders_map = json.load(urllib2.urlopen(map_url)) |
qyearsley | 1fdfcb6 | 2016-10-24 13:22:03 -0700 | [diff] [blame] | 386 | except urllib2.URLError as e: |
| 387 | return None, ('Failed to fetch builder-to-master map from %s. Error: %s.' % |
| 388 | (map_url, e)) |
| 389 | except ValueError as e: |
| 390 | return None, ('Invalid json string from %s. Error: %s.' % (map_url, e)) |
qyearsley | 123a468 | 2016-10-26 09:12:17 -0700 | [diff] [blame] | 391 | if not builders_map: |
qyearsley | 1fdfcb6 | 2016-10-24 13:22:03 -0700 | [diff] [blame] | 392 | return None, 'Failed to build master map.' |
| 393 | |
qyearsley | 123a468 | 2016-10-26 09:12:17 -0700 | [diff] [blame] | 394 | bucket_map = {} |
| 395 | for builder in builders: |
qyearsley | 123a468 | 2016-10-26 09:12:17 -0700 | [diff] [blame] | 396 | masters = builders_map.get(builder, []) |
| 397 | if not masters: |
qyearsley | 1fdfcb6 | 2016-10-24 13:22:03 -0700 | [diff] [blame] | 398 | return None, ('No matching master for builder %s.' % builder) |
qyearsley | 123a468 | 2016-10-26 09:12:17 -0700 | [diff] [blame] | 399 | if len(masters) > 1: |
qyearsley | 1fdfcb6 | 2016-10-24 13:22:03 -0700 | [diff] [blame] | 400 | return None, ('The builder name %s exists in multiple masters %s.' % |
qyearsley | 123a468 | 2016-10-26 09:12:17 -0700 | [diff] [blame] | 401 | (builder, masters)) |
| 402 | bucket = _prefix_master(masters[0]) |
| 403 | bucket_map.setdefault(bucket, {})[builder] = [] |
| 404 | |
| 405 | return bucket_map, None |
qyearsley | 1fdfcb6 | 2016-10-24 13:22:03 -0700 | [diff] [blame] | 406 | |
| 407 | |
borenet | 6c0efe6 | 2016-10-19 08:13:29 -0700 | [diff] [blame] | 408 | def _trigger_try_jobs(auth_config, changelist, buckets, options, |
tandrii | de281ae | 2016-10-12 06:02:30 -0700 | [diff] [blame] | 409 | category='git_cl_try', patchset=None): |
qyearsley | 1fdfcb6 | 2016-10-24 13:22:03 -0700 | [diff] [blame] | 410 | """Sends a request to Buildbucket to trigger try jobs for a changelist. |
| 411 | |
| 412 | Args: |
| 413 | auth_config: AuthConfig for Rietveld. |
| 414 | changelist: Changelist that the try jobs are associated with. |
| 415 | buckets: A nested dict mapping bucket names to builders to tests. |
| 416 | options: Command-line options. |
| 417 | """ |
tandrii | de281ae | 2016-10-12 06:02:30 -0700 | [diff] [blame] | 418 | assert changelist.GetIssue(), 'CL must be uploaded first' |
| 419 | codereview_url = changelist.GetCodereviewServer() |
| 420 | assert codereview_url, 'CL must be uploaded first' |
| 421 | patchset = patchset or changelist.GetMostRecentPatchset() |
| 422 | assert patchset, 'CL must be uploaded first' |
| 423 | |
| 424 | codereview_host = urlparse.urlparse(codereview_url).hostname |
| 425 | authenticator = auth.get_authenticator_for_host(codereview_host, auth_config) |
sheyang@google.com | 6ebaf78 | 2015-05-12 19:17:54 +0000 | [diff] [blame] | 426 | http = authenticator.authorize(httplib2.Http()) |
| 427 | http.force_exception_to_status_code = True |
tandrii | de281ae | 2016-10-12 06:02:30 -0700 | [diff] [blame] | 428 | |
| 429 | # TODO(tandrii): consider caching Gerrit CL details just like |
| 430 | # _RietveldChangelistImpl does, then caching values in these two variables |
| 431 | # won't be necessary. |
| 432 | owner_email = changelist.GetIssueOwner() |
sheyang@google.com | 6ebaf78 | 2015-05-12 19:17:54 +0000 | [diff] [blame] | 433 | |
| 434 | buildbucket_put_url = ( |
| 435 | 'https://{hostname}/_ah/api/buildbucket/v1/builds/batch'.format( |
sheyang@chromium.org | db37557 | 2015-08-17 19:22:23 +0000 | [diff] [blame] | 436 | hostname=options.buildbucket_host)) |
tandrii | de281ae | 2016-10-12 06:02:30 -0700 | [diff] [blame] | 437 | buildset = 'patch/{codereview}/{hostname}/{issue}/{patch}'.format( |
| 438 | codereview='gerrit' if changelist.IsGerrit() else 'rietveld', |
| 439 | hostname=codereview_host, |
| 440 | issue=changelist.GetIssue(), |
sheyang@google.com | 6ebaf78 | 2015-05-12 19:17:54 +0000 | [diff] [blame] | 441 | patch=patchset) |
tandrii | 8c5a353 | 2016-11-04 07:52:02 -0700 | [diff] [blame] | 442 | |
| 443 | shared_parameters_properties = changelist.GetTryjobProperties(patchset) |
| 444 | shared_parameters_properties['category'] = category |
| 445 | if options.clobber: |
| 446 | shared_parameters_properties['clobber'] = True |
tandrii | de281ae | 2016-10-12 06:02:30 -0700 | [diff] [blame] | 447 | extra_properties = _get_properties_from_options(options) |
tandrii | 8c5a353 | 2016-11-04 07:52:02 -0700 | [diff] [blame] | 448 | if extra_properties: |
| 449 | shared_parameters_properties.update(extra_properties) |
sheyang@google.com | 6ebaf78 | 2015-05-12 19:17:54 +0000 | [diff] [blame] | 450 | |
| 451 | batch_req_body = {'builds': []} |
| 452 | print_text = [] |
| 453 | print_text.append('Tried jobs on:') |
borenet | 6c0efe6 | 2016-10-19 08:13:29 -0700 | [diff] [blame] | 454 | for bucket, builders_and_tests in sorted(buckets.iteritems()): |
| 455 | print_text.append('Bucket: %s' % bucket) |
| 456 | master = None |
| 457 | if bucket.startswith(MASTER_PREFIX): |
| 458 | master = _unprefix_master(bucket) |
sheyang@google.com | 6ebaf78 | 2015-05-12 19:17:54 +0000 | [diff] [blame] | 459 | for builder, tests in sorted(builders_and_tests.iteritems()): |
| 460 | print_text.append(' %s: %s' % (builder, tests)) |
| 461 | parameters = { |
| 462 | 'builder_name': builder, |
nodir@chromium.org | d221731 | 2015-09-21 15:51:21 +0000 | [diff] [blame] | 463 | 'changes': [{ |
tandrii | de281ae | 2016-10-12 06:02:30 -0700 | [diff] [blame] | 464 | 'author': {'email': owner_email}, |
nodir@chromium.org | d221731 | 2015-09-21 15:51:21 +0000 | [diff] [blame] | 465 | 'revision': options.revision, |
| 466 | }], |
tandrii | 8c5a353 | 2016-11-04 07:52:02 -0700 | [diff] [blame] | 467 | 'properties': shared_parameters_properties.copy(), |
sheyang@google.com | 6ebaf78 | 2015-05-12 19:17:54 +0000 | [diff] [blame] | 468 | } |
machenbach@chromium.org | 2403e80 | 2016-04-29 12:34:42 +0000 | [diff] [blame] | 469 | if 'presubmit' in builder.lower(): |
| 470 | parameters['properties']['dry_run'] = 'true' |
tandrii@chromium.org | 3764fa2 | 2015-10-21 16:40:40 +0000 | [diff] [blame] | 471 | if tests: |
| 472 | parameters['properties']['testfilter'] = tests |
borenet | 6c0efe6 | 2016-10-19 08:13:29 -0700 | [diff] [blame] | 473 | |
| 474 | tags = [ |
| 475 | 'builder:%s' % builder, |
| 476 | 'buildset:%s' % buildset, |
| 477 | 'user_agent:git_cl_try', |
| 478 | ] |
| 479 | if master: |
| 480 | parameters['properties']['master'] = master |
| 481 | tags.append('master:%s' % master) |
| 482 | |
sheyang@google.com | 6ebaf78 | 2015-05-12 19:17:54 +0000 | [diff] [blame] | 483 | batch_req_body['builds'].append( |
| 484 | { |
| 485 | 'bucket': bucket, |
| 486 | 'parameters_json': json.dumps(parameters), |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 487 | 'client_operation_id': str(uuid.uuid4()), |
borenet | 6c0efe6 | 2016-10-19 08:13:29 -0700 | [diff] [blame] | 488 | 'tags': tags, |
sheyang@google.com | 6ebaf78 | 2015-05-12 19:17:54 +0000 | [diff] [blame] | 489 | } |
| 490 | ) |
| 491 | |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 492 | _buildbucket_retry( |
qyearsley | eab3c04 | 2016-08-24 09:18:28 -0700 | [diff] [blame] | 493 | 'triggering try jobs', |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 494 | http, |
| 495 | buildbucket_put_url, |
| 496 | 'PUT', |
| 497 | body=json.dumps(batch_req_body), |
| 498 | headers={'Content-Type': 'application/json'} |
| 499 | ) |
tandrii@chromium.org | 35c6145 | 2016-02-26 15:24:57 +0000 | [diff] [blame] | 500 | print_text.append('To see results here, run: git cl try-results') |
| 501 | print_text.append('To see results in browser, run: git cl web') |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 502 | print('\n'.join(print_text)) |
kjellander@chromium.org | 4442454 | 2015-06-02 18:35:29 +0000 | [diff] [blame] | 503 | |
sheyang@google.com | 6ebaf78 | 2015-05-12 19:17:54 +0000 | [diff] [blame] | 504 | |
tandrii | 221ab25 | 2016-10-06 08:12:04 -0700 | [diff] [blame] | 505 | def fetch_try_jobs(auth_config, changelist, buildbucket_host, |
| 506 | patchset=None): |
qyearsley | eab3c04 | 2016-08-24 09:18:28 -0700 | [diff] [blame] | 507 | """Fetches try jobs from buildbucket. |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 508 | |
qyearsley | 53f48a1 | 2016-09-01 10:45:13 -0700 | [diff] [blame] | 509 | Returns a map from build id to build info as a dictionary. |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 510 | """ |
tandrii | 221ab25 | 2016-10-06 08:12:04 -0700 | [diff] [blame] | 511 | assert buildbucket_host |
| 512 | assert changelist.GetIssue(), 'CL must be uploaded first' |
| 513 | assert changelist.GetCodereviewServer(), 'CL must be uploaded first' |
| 514 | patchset = patchset or changelist.GetMostRecentPatchset() |
| 515 | assert patchset, 'CL must be uploaded first' |
| 516 | |
| 517 | codereview_url = changelist.GetCodereviewServer() |
| 518 | codereview_host = urlparse.urlparse(codereview_url).hostname |
| 519 | authenticator = auth.get_authenticator_for_host(codereview_host, auth_config) |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 520 | if authenticator.has_cached_credentials(): |
| 521 | http = authenticator.authorize(httplib2.Http()) |
| 522 | else: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 523 | print('Warning: Some results might be missing because %s' % |
| 524 | # Get the message on how to login. |
tandrii | 221ab25 | 2016-10-06 08:12:04 -0700 | [diff] [blame] | 525 | (auth.LoginRequiredError(codereview_host).message,)) |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 526 | http = httplib2.Http() |
| 527 | |
| 528 | http.force_exception_to_status_code = True |
| 529 | |
tandrii | 221ab25 | 2016-10-06 08:12:04 -0700 | [diff] [blame] | 530 | buildset = 'patch/{codereview}/{hostname}/{issue}/{patch}'.format( |
| 531 | codereview='gerrit' if changelist.IsGerrit() else 'rietveld', |
| 532 | hostname=codereview_host, |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 533 | issue=changelist.GetIssue(), |
tandrii | 221ab25 | 2016-10-06 08:12:04 -0700 | [diff] [blame] | 534 | patch=patchset) |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 535 | params = {'tag': 'buildset:%s' % buildset} |
| 536 | |
| 537 | builds = {} |
| 538 | while True: |
| 539 | url = 'https://{hostname}/_ah/api/buildbucket/v1/search?{params}'.format( |
tandrii | 221ab25 | 2016-10-06 08:12:04 -0700 | [diff] [blame] | 540 | hostname=buildbucket_host, |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 541 | params=urllib.urlencode(params)) |
qyearsley | eab3c04 | 2016-08-24 09:18:28 -0700 | [diff] [blame] | 542 | content = _buildbucket_retry('fetching try jobs', http, url, 'GET') |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 543 | for build in content.get('builds', []): |
| 544 | builds[build['id']] = build |
| 545 | if 'next_cursor' in content: |
| 546 | params['start_cursor'] = content['next_cursor'] |
| 547 | else: |
| 548 | break |
| 549 | return builds |
| 550 | |
| 551 | |
qyearsley | eab3c04 | 2016-08-24 09:18:28 -0700 | [diff] [blame] | 552 | def print_try_jobs(options, builds): |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 553 | """Prints nicely result of fetch_try_jobs.""" |
| 554 | if not builds: |
qyearsley | eab3c04 | 2016-08-24 09:18:28 -0700 | [diff] [blame] | 555 | print('No try jobs scheduled') |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 556 | return |
| 557 | |
| 558 | # Make a copy, because we'll be modifying builds dictionary. |
| 559 | builds = builds.copy() |
| 560 | builder_names_cache = {} |
| 561 | |
| 562 | def get_builder(b): |
| 563 | try: |
| 564 | return builder_names_cache[b['id']] |
| 565 | except KeyError: |
| 566 | try: |
| 567 | parameters = json.loads(b['parameters_json']) |
| 568 | name = parameters['builder_name'] |
| 569 | except (ValueError, KeyError) as error: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 570 | print('WARNING: failed to get builder name for build %s: %s' % ( |
| 571 | b['id'], error)) |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 572 | name = None |
| 573 | builder_names_cache[b['id']] = name |
| 574 | return name |
| 575 | |
| 576 | def get_bucket(b): |
| 577 | bucket = b['bucket'] |
| 578 | if bucket.startswith('master.'): |
| 579 | return bucket[len('master.'):] |
| 580 | return bucket |
| 581 | |
| 582 | if options.print_master: |
| 583 | name_fmt = '%%-%ds %%-%ds' % ( |
| 584 | max(len(str(get_bucket(b))) for b in builds.itervalues()), |
| 585 | max(len(str(get_builder(b))) for b in builds.itervalues())) |
| 586 | def get_name(b): |
| 587 | return name_fmt % (get_bucket(b), get_builder(b)) |
| 588 | else: |
| 589 | name_fmt = '%%-%ds' % ( |
| 590 | max(len(str(get_builder(b))) for b in builds.itervalues())) |
| 591 | def get_name(b): |
| 592 | return name_fmt % get_builder(b) |
| 593 | |
| 594 | def sort_key(b): |
| 595 | return b['status'], b.get('result'), get_name(b), b.get('url') |
| 596 | |
| 597 | def pop(title, f, color=None, **kwargs): |
| 598 | """Pop matching builds from `builds` dict and print them.""" |
| 599 | |
tandrii@chromium.org | 6cf98c8 | 2016-03-15 11:56:00 +0000 | [diff] [blame] | 600 | if not options.color or color is None: |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 601 | colorize = str |
| 602 | else: |
| 603 | colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET) |
| 604 | |
| 605 | result = [] |
| 606 | for b in builds.values(): |
| 607 | if all(b.get(k) == v for k, v in kwargs.iteritems()): |
| 608 | builds.pop(b['id']) |
| 609 | result.append(b) |
| 610 | if result: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 611 | print(colorize(title)) |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 612 | for b in sorted(result, key=sort_key): |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 613 | print(' ', colorize('\t'.join(map(str, f(b))))) |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 614 | |
| 615 | total = len(builds) |
| 616 | pop(status='COMPLETED', result='SUCCESS', |
| 617 | title='Successes:', color=Fore.GREEN, |
| 618 | f=lambda b: (get_name(b), b.get('url'))) |
| 619 | pop(status='COMPLETED', result='FAILURE', failure_reason='INFRA_FAILURE', |
| 620 | title='Infra Failures:', color=Fore.MAGENTA, |
| 621 | f=lambda b: (get_name(b), b.get('url'))) |
| 622 | pop(status='COMPLETED', result='FAILURE', failure_reason='BUILD_FAILURE', |
| 623 | title='Failures:', color=Fore.RED, |
| 624 | f=lambda b: (get_name(b), b.get('url'))) |
| 625 | pop(status='COMPLETED', result='CANCELED', |
| 626 | title='Canceled:', color=Fore.MAGENTA, |
| 627 | f=lambda b: (get_name(b),)) |
| 628 | pop(status='COMPLETED', result='FAILURE', |
| 629 | failure_reason='INVALID_BUILD_DEFINITION', |
| 630 | title='Wrong master/builder name:', color=Fore.MAGENTA, |
| 631 | f=lambda b: (get_name(b),)) |
| 632 | pop(status='COMPLETED', result='FAILURE', |
| 633 | title='Other failures:', |
| 634 | f=lambda b: (get_name(b), b.get('failure_reason'), b.get('url'))) |
| 635 | pop(status='COMPLETED', |
| 636 | title='Other finished:', |
| 637 | f=lambda b: (get_name(b), b.get('result'), b.get('url'))) |
| 638 | pop(status='STARTED', |
| 639 | title='Started:', color=Fore.YELLOW, |
| 640 | f=lambda b: (get_name(b), b.get('url'))) |
| 641 | pop(status='SCHEDULED', |
| 642 | title='Scheduled:', |
| 643 | f=lambda b: (get_name(b), 'id=%s' % b['id'])) |
| 644 | # The last section is just in case buildbucket API changes OR there is a bug. |
| 645 | pop(title='Other:', |
| 646 | f=lambda b: (get_name(b), 'id=%s' % b['id'])) |
| 647 | assert len(builds) == 0 |
qyearsley | eab3c04 | 2016-08-24 09:18:28 -0700 | [diff] [blame] | 648 | print('Total: %d try jobs' % total) |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 649 | |
| 650 | |
qyearsley | 53f48a1 | 2016-09-01 10:45:13 -0700 | [diff] [blame] | 651 | def write_try_results_json(output_file, builds): |
| 652 | """Writes a subset of the data from fetch_try_jobs to a file as JSON. |
| 653 | |
| 654 | The input |builds| dict is assumed to be generated by Buildbucket. |
| 655 | Buildbucket documentation: http://goo.gl/G0s101 |
| 656 | """ |
| 657 | |
| 658 | def convert_build_dict(build): |
| 659 | return { |
| 660 | 'buildbucket_id': build.get('id'), |
| 661 | 'status': build.get('status'), |
| 662 | 'result': build.get('result'), |
| 663 | 'bucket': build.get('bucket'), |
| 664 | 'builder_name': json.loads( |
| 665 | build.get('parameters_json', '{}')).get('builder_name'), |
| 666 | 'failure_reason': build.get('failure_reason'), |
| 667 | 'url': build.get('url'), |
| 668 | } |
| 669 | |
| 670 | converted = [] |
| 671 | for _, build in sorted(builds.items()): |
| 672 | converted.append(convert_build_dict(build)) |
| 673 | write_json(output_file, converted) |
| 674 | |
| 675 | |
bauerb@chromium.org | 866276c | 2011-03-18 20:09:31 +0000 | [diff] [blame] | 676 | def MatchSvnGlob(url, base_url, glob_spec, allow_wildcards): |
| 677 | """Return the corresponding git ref if |base_url| together with |glob_spec| |
| 678 | matches the full |url|. |
| 679 | |
| 680 | If |allow_wildcards| is true, |glob_spec| can contain wildcards (see below). |
| 681 | """ |
| 682 | fetch_suburl, as_ref = glob_spec.split(':') |
| 683 | if allow_wildcards: |
| 684 | glob_match = re.match('(.+/)?(\*|{[^/]*})(/.+)?', fetch_suburl) |
| 685 | if glob_match: |
| 686 | # Parse specs like "branches/*/src:refs/remotes/svn/*" or |
| 687 | # "branches/{472,597,648}/src:refs/remotes/svn/*". |
| 688 | branch_re = re.escape(base_url) |
| 689 | if glob_match.group(1): |
| 690 | branch_re += '/' + re.escape(glob_match.group(1)) |
| 691 | wildcard = glob_match.group(2) |
| 692 | if wildcard == '*': |
| 693 | branch_re += '([^/]*)' |
| 694 | else: |
| 695 | # Escape and replace surrounding braces with parentheses and commas |
| 696 | # with pipe symbols. |
| 697 | wildcard = re.escape(wildcard) |
| 698 | wildcard = re.sub('^\\\\{', '(', wildcard) |
| 699 | wildcard = re.sub('\\\\,', '|', wildcard) |
| 700 | wildcard = re.sub('\\\\}$', ')', wildcard) |
| 701 | branch_re += wildcard |
| 702 | if glob_match.group(3): |
| 703 | branch_re += re.escape(glob_match.group(3)) |
| 704 | match = re.match(branch_re, url) |
| 705 | if match: |
| 706 | return re.sub('\*$', match.group(1), as_ref) |
| 707 | |
| 708 | # Parse specs like "trunk/src:refs/remotes/origin/trunk". |
| 709 | if fetch_suburl: |
| 710 | full_url = base_url + '/' + fetch_suburl |
| 711 | else: |
| 712 | full_url = base_url |
| 713 | if full_url == url: |
| 714 | return as_ref |
| 715 | return None |
| 716 | |
maruel@chromium.org | 32f9f5e | 2011-09-14 13:41:47 +0000 | [diff] [blame] | 717 | |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 718 | def print_stats(similarity, find_copies, args): |
maruel@chromium.org | 49e3d80 | 2012-07-18 23:54:45 +0000 | [diff] [blame] | 719 | """Prints statistics about the change to the user.""" |
| 720 | # --no-ext-diff is broken in some versions of Git, so try to work around |
| 721 | # this by overriding the environment (but there is still a problem if the |
| 722 | # git config key "diff.external" is used). |
thestig@chromium.org | 8b0553c | 2014-02-11 00:33:37 +0000 | [diff] [blame] | 723 | env = GetNoGitPagerEnv() |
maruel@chromium.org | 49e3d80 | 2012-07-18 23:54:45 +0000 | [diff] [blame] | 724 | if 'GIT_EXTERNAL_DIFF' in env: |
| 725 | del env['GIT_EXTERNAL_DIFF'] |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 726 | |
| 727 | if find_copies: |
scottmg | b84b5e3 | 2016-11-10 09:25:33 -0800 | [diff] [blame] | 728 | similarity_options = ['-l100000', '-C%s' % similarity] |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 729 | else: |
| 730 | similarity_options = ['-M%s' % similarity] |
| 731 | |
szager@chromium.org | d057f9a | 2014-05-29 21:09:36 +0000 | [diff] [blame] | 732 | try: |
| 733 | stdout = sys.stdout.fileno() |
| 734 | except AttributeError: |
| 735 | stdout = None |
maruel@chromium.org | 49e3d80 | 2012-07-18 23:54:45 +0000 | [diff] [blame] | 736 | return subprocess2.call( |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 737 | ['git', |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 738 | 'diff', '--no-ext-diff', '--stat'] + similarity_options + args, |
szager@chromium.org | d057f9a | 2014-05-29 21:09:36 +0000 | [diff] [blame] | 739 | stdout=stdout, env=env) |
maruel@chromium.org | 49e3d80 | 2012-07-18 23:54:45 +0000 | [diff] [blame] | 740 | |
| 741 | |
sheyang@google.com | 6ebaf78 | 2015-05-12 19:17:54 +0000 | [diff] [blame] | 742 | class BuildbucketResponseException(Exception): |
| 743 | pass |
| 744 | |
| 745 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 746 | class Settings(object): |
| 747 | def __init__(self): |
| 748 | self.default_server = None |
| 749 | self.cc = None |
thestig@chromium.org | 7a54e81 | 2014-02-11 19:57:22 +0000 | [diff] [blame] | 750 | self.root = None |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 751 | self.is_git_svn = None |
| 752 | self.svn_branch = None |
| 753 | self.tree_status_url = None |
| 754 | self.viewvc_url = None |
| 755 | self.updated = False |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 756 | self.is_gerrit = None |
bauerb@chromium.org | 54b400c | 2016-01-14 10:08:25 +0000 | [diff] [blame] | 757 | self.squash_gerrit_uploads = None |
tandrii@chromium.org | 2825353 | 2016-04-14 13:46:56 +0000 | [diff] [blame] | 758 | self.gerrit_skip_ensure_authenticated = None |
jbroman@chromium.org | 615a262 | 2013-05-03 13:20:14 +0000 | [diff] [blame] | 759 | self.git_editor = None |
sheyang@chromium.org | 152cf83 | 2014-06-11 21:37:49 +0000 | [diff] [blame] | 760 | self.project = None |
kjellander@chromium.org | 6abc652 | 2014-12-02 07:34:49 +0000 | [diff] [blame] | 761 | self.force_https_commit_url = None |
vadimsh@chromium.org | 566a02a | 2014-08-22 01:34:13 +0000 | [diff] [blame] | 762 | self.pending_ref_prefix = None |
tandrii | f46c20f | 2016-09-14 06:17:05 -0700 | [diff] [blame] | 763 | self.git_number_footer = None |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 764 | |
| 765 | def LazyUpdateIfNeeded(self): |
| 766 | """Updates the settings from a codereview.settings file, if available.""" |
| 767 | if not self.updated: |
pgervais@chromium.org | 87884cc | 2014-01-03 22:23:41 +0000 | [diff] [blame] | 768 | # The only value that actually changes the behavior is |
| 769 | # autoupdate = "false". Everything else means "true". |
nick@chromium.org | 3ac1c4e | 2014-01-16 02:44:42 +0000 | [diff] [blame] | 770 | autoupdate = RunGit(['config', 'rietveld.autoupdate'], |
pgervais@chromium.org | 87884cc | 2014-01-03 22:23:41 +0000 | [diff] [blame] | 771 | error_ok=True |
| 772 | ).strip().lower() |
| 773 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 774 | cr_settings_file = FindCodereviewSettingsFile() |
pgervais@chromium.org | 87884cc | 2014-01-03 22:23:41 +0000 | [diff] [blame] | 775 | if autoupdate != 'false' and cr_settings_file: |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 776 | LoadCodereviewSettingsFromFile(cr_settings_file) |
| 777 | self.updated = True |
| 778 | |
| 779 | def GetDefaultServerUrl(self, error_ok=False): |
| 780 | if not self.default_server: |
| 781 | self.LazyUpdateIfNeeded() |
maruel@chromium.org | eb5edbc | 2012-01-16 17:03:28 +0000 | [diff] [blame] | 782 | self.default_server = gclient_utils.UpgradeToHttps( |
thestig@chromium.org | 8b0553c | 2014-02-11 00:33:37 +0000 | [diff] [blame] | 783 | self._GetRietveldConfig('server', error_ok=True)) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 784 | if error_ok: |
| 785 | return self.default_server |
| 786 | if not self.default_server: |
| 787 | error_message = ('Could not find settings file. You must configure ' |
| 788 | 'your review setup by running "git cl config".') |
maruel@chromium.org | eb5edbc | 2012-01-16 17:03:28 +0000 | [diff] [blame] | 789 | self.default_server = gclient_utils.UpgradeToHttps( |
thestig@chromium.org | 8b0553c | 2014-02-11 00:33:37 +0000 | [diff] [blame] | 790 | self._GetRietveldConfig('server', error_message=error_message)) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 791 | return self.default_server |
| 792 | |
thestig@chromium.org | 7a54e81 | 2014-02-11 19:57:22 +0000 | [diff] [blame] | 793 | @staticmethod |
| 794 | def GetRelativeRoot(): |
| 795 | return RunGit(['rev-parse', '--show-cdup']).strip() |
thestig@chromium.org | 8b0553c | 2014-02-11 00:33:37 +0000 | [diff] [blame] | 796 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 797 | def GetRoot(self): |
thestig@chromium.org | 7a54e81 | 2014-02-11 19:57:22 +0000 | [diff] [blame] | 798 | if self.root is None: |
| 799 | self.root = os.path.abspath(self.GetRelativeRoot()) |
| 800 | return self.root |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 801 | |
szager@chromium.org | 151ebcf | 2016-03-09 01:08:25 +0000 | [diff] [blame] | 802 | def GetGitMirror(self, remote='origin'): |
| 803 | """If this checkout is from a local git mirror, return a Mirror object.""" |
szager@chromium.org | 8159374 | 2016-03-09 20:27:58 +0000 | [diff] [blame] | 804 | local_url = RunGit(['config', '--get', 'remote.%s.url' % remote]).strip() |
szager@chromium.org | 151ebcf | 2016-03-09 01:08:25 +0000 | [diff] [blame] | 805 | if not os.path.isdir(local_url): |
| 806 | return None |
| 807 | git_cache.Mirror.SetCachePath(os.path.dirname(local_url)) |
| 808 | remote_url = git_cache.Mirror.CacheDirToUrl(local_url) |
| 809 | # Use the /dev/null print_func to avoid terminal spew in WaitForRealCommit. |
| 810 | mirror = git_cache.Mirror(remote_url, print_func = lambda *args: None) |
| 811 | if mirror.exists(): |
| 812 | return mirror |
| 813 | return None |
| 814 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 815 | def GetIsGitSvn(self): |
| 816 | """Return true if this repo looks like it's using git-svn.""" |
| 817 | if self.is_git_svn is None: |
vadimsh@chromium.org | 566a02a | 2014-08-22 01:34:13 +0000 | [diff] [blame] | 818 | if self.GetPendingRefPrefix(): |
| 819 | # If PENDING_REF_PREFIX is set then it's a pure git repo no matter what. |
| 820 | self.is_git_svn = False |
| 821 | else: |
| 822 | # If you have any "svn-remote.*" config keys, we think you're using svn. |
| 823 | self.is_git_svn = RunGitWithCode( |
| 824 | ['config', '--local', '--get-regexp', r'^svn-remote\.'])[0] == 0 |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 825 | return self.is_git_svn |
| 826 | |
| 827 | def GetSVNBranch(self): |
| 828 | if self.svn_branch is None: |
| 829 | if not self.GetIsGitSvn(): |
| 830 | DieWithError('Repo doesn\'t appear to be a git-svn repo.') |
| 831 | |
| 832 | # Try to figure out which remote branch we're based on. |
| 833 | # Strategy: |
bauerb@chromium.org | ade368c | 2011-03-01 08:57:50 +0000 | [diff] [blame] | 834 | # 1) iterate through our branch history and find the svn URL. |
| 835 | # 2) find the svn-remote that fetches from the URL. |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 836 | |
| 837 | # regexp matching the git-svn line that contains the URL. |
| 838 | git_svn_re = re.compile(r'^\s*git-svn-id: (\S+)@', re.MULTILINE) |
| 839 | |
bauerb@chromium.org | ade368c | 2011-03-01 08:57:50 +0000 | [diff] [blame] | 840 | # We don't want to go through all of history, so read a line from the |
| 841 | # pipe at a time. |
| 842 | # The -100 is an arbitrary limit so we don't search forever. |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 843 | cmd = ['git', 'log', '-100', '--pretty=medium'] |
thestig@chromium.org | 8b0553c | 2014-02-11 00:33:37 +0000 | [diff] [blame] | 844 | proc = subprocess2.Popen(cmd, stdout=subprocess2.PIPE, |
| 845 | env=GetNoGitPagerEnv()) |
maruel@chromium.org | 740f9d7 | 2011-06-10 18:33:10 +0000 | [diff] [blame] | 846 | url = None |
bauerb@chromium.org | ade368c | 2011-03-01 08:57:50 +0000 | [diff] [blame] | 847 | for line in proc.stdout: |
| 848 | match = git_svn_re.match(line) |
| 849 | if match: |
| 850 | url = match.group(1) |
| 851 | proc.stdout.close() # Cut pipe. |
| 852 | break |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 853 | |
bauerb@chromium.org | ade368c | 2011-03-01 08:57:50 +0000 | [diff] [blame] | 854 | if url: |
| 855 | svn_remote_re = re.compile(r'^svn-remote\.([^.]+)\.url (.*)$') |
| 856 | remotes = RunGit(['config', '--get-regexp', |
| 857 | r'^svn-remote\..*\.url']).splitlines() |
| 858 | for remote in remotes: |
| 859 | match = svn_remote_re.match(remote) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 860 | if match: |
bauerb@chromium.org | ade368c | 2011-03-01 08:57:50 +0000 | [diff] [blame] | 861 | remote = match.group(1) |
| 862 | base_url = match.group(2) |
szager@chromium.org | 4ac2553 | 2013-12-16 22:07:02 +0000 | [diff] [blame] | 863 | rewrite_root = RunGit( |
| 864 | ['config', 'svn-remote.%s.rewriteRoot' % remote], |
| 865 | error_ok=True).strip() |
| 866 | if rewrite_root: |
| 867 | base_url = rewrite_root |
bauerb@chromium.org | ade368c | 2011-03-01 08:57:50 +0000 | [diff] [blame] | 868 | fetch_spec = RunGit( |
bauerb@chromium.org | 866276c | 2011-03-18 20:09:31 +0000 | [diff] [blame] | 869 | ['config', 'svn-remote.%s.fetch' % remote], |
| 870 | error_ok=True).strip() |
| 871 | if fetch_spec: |
| 872 | self.svn_branch = MatchSvnGlob(url, base_url, fetch_spec, False) |
| 873 | if self.svn_branch: |
| 874 | break |
| 875 | branch_spec = RunGit( |
| 876 | ['config', 'svn-remote.%s.branches' % remote], |
| 877 | error_ok=True).strip() |
| 878 | if branch_spec: |
| 879 | self.svn_branch = MatchSvnGlob(url, base_url, branch_spec, True) |
| 880 | if self.svn_branch: |
| 881 | break |
| 882 | tag_spec = RunGit( |
| 883 | ['config', 'svn-remote.%s.tags' % remote], |
| 884 | error_ok=True).strip() |
| 885 | if tag_spec: |
| 886 | self.svn_branch = MatchSvnGlob(url, base_url, tag_spec, True) |
| 887 | if self.svn_branch: |
| 888 | break |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 889 | |
| 890 | if not self.svn_branch: |
| 891 | DieWithError('Can\'t guess svn branch -- try specifying it on the ' |
| 892 | 'command line') |
| 893 | |
| 894 | return self.svn_branch |
| 895 | |
| 896 | def GetTreeStatusUrl(self, error_ok=False): |
| 897 | if not self.tree_status_url: |
| 898 | error_message = ('You must configure your tree status URL by running ' |
| 899 | '"git cl config".') |
thestig@chromium.org | 8b0553c | 2014-02-11 00:33:37 +0000 | [diff] [blame] | 900 | self.tree_status_url = self._GetRietveldConfig( |
| 901 | 'tree-status-url', error_ok=error_ok, error_message=error_message) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 902 | return self.tree_status_url |
| 903 | |
| 904 | def GetViewVCUrl(self): |
| 905 | if not self.viewvc_url: |
thestig@chromium.org | 8b0553c | 2014-02-11 00:33:37 +0000 | [diff] [blame] | 906 | self.viewvc_url = self._GetRietveldConfig('viewvc-url', error_ok=True) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 907 | return self.viewvc_url |
| 908 | |
rmistry@google.com | 9075258 | 2014-01-14 21:04:50 +0000 | [diff] [blame] | 909 | def GetBugPrefix(self): |
thestig@chromium.org | 8b0553c | 2014-02-11 00:33:37 +0000 | [diff] [blame] | 910 | return self._GetRietveldConfig('bug-prefix', error_ok=True) |
rmistry@google.com | 9075258 | 2014-01-14 21:04:50 +0000 | [diff] [blame] | 911 | |
rmistry@google.com | 78948ed | 2015-07-08 23:09:57 +0000 | [diff] [blame] | 912 | def GetIsSkipDependencyUpload(self, branch_name): |
| 913 | """Returns true if specified branch should skip dep uploads.""" |
| 914 | return self._GetBranchConfig(branch_name, 'skip-deps-uploads', |
| 915 | error_ok=True) |
| 916 | |
rmistry@google.com | 5626a92 | 2015-02-26 14:03:30 +0000 | [diff] [blame] | 917 | def GetRunPostUploadHook(self): |
| 918 | run_post_upload_hook = self._GetRietveldConfig( |
| 919 | 'run-post-upload-hook', error_ok=True) |
| 920 | return run_post_upload_hook == "True" |
| 921 | |
bauerb@chromium.org | ae6df35 | 2011-04-06 17:40:39 +0000 | [diff] [blame] | 922 | def GetDefaultCCList(self): |
thestig@chromium.org | 8b0553c | 2014-02-11 00:33:37 +0000 | [diff] [blame] | 923 | return self._GetRietveldConfig('cc', error_ok=True) |
bauerb@chromium.org | ae6df35 | 2011-04-06 17:40:39 +0000 | [diff] [blame] | 924 | |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 925 | def GetDefaultPrivateFlag(self): |
thestig@chromium.org | 8b0553c | 2014-02-11 00:33:37 +0000 | [diff] [blame] | 926 | return self._GetRietveldConfig('private', error_ok=True) |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 927 | |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 928 | def GetIsGerrit(self): |
| 929 | """Return true if this repo is assosiated with gerrit code review system.""" |
| 930 | if self.is_gerrit is None: |
| 931 | self.is_gerrit = self._GetConfig('gerrit.host', error_ok=True) |
| 932 | return self.is_gerrit |
| 933 | |
bauerb@chromium.org | 54b400c | 2016-01-14 10:08:25 +0000 | [diff] [blame] | 934 | def GetSquashGerritUploads(self): |
| 935 | """Return true if uploads to Gerrit should be squashed by default.""" |
| 936 | if self.squash_gerrit_uploads is None: |
tandrii | a60502f | 2016-06-20 02:01:53 -0700 | [diff] [blame] | 937 | self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride() |
| 938 | if self.squash_gerrit_uploads is None: |
| 939 | # Default is squash now (http://crbug.com/611892#c23). |
| 940 | self.squash_gerrit_uploads = not ( |
| 941 | RunGit(['config', '--bool', 'gerrit.squash-uploads'], |
| 942 | error_ok=True).strip() == 'false') |
bauerb@chromium.org | 54b400c | 2016-01-14 10:08:25 +0000 | [diff] [blame] | 943 | return self.squash_gerrit_uploads |
| 944 | |
tandrii | a60502f | 2016-06-20 02:01:53 -0700 | [diff] [blame] | 945 | def GetSquashGerritUploadsOverride(self): |
| 946 | """Return True or False if codereview.settings should be overridden. |
| 947 | |
| 948 | Returns None if no override has been defined. |
| 949 | """ |
| 950 | # See also http://crbug.com/611892#c23 |
| 951 | result = RunGit(['config', '--bool', 'gerrit.override-squash-uploads'], |
| 952 | error_ok=True).strip() |
| 953 | if result == 'true': |
| 954 | return True |
| 955 | if result == 'false': |
| 956 | return False |
| 957 | return None |
| 958 | |
tandrii@chromium.org | 2825353 | 2016-04-14 13:46:56 +0000 | [diff] [blame] | 959 | def GetGerritSkipEnsureAuthenticated(self): |
| 960 | """Return True if EnsureAuthenticated should not be done for Gerrit |
| 961 | uploads.""" |
| 962 | if self.gerrit_skip_ensure_authenticated is None: |
| 963 | self.gerrit_skip_ensure_authenticated = ( |
shinyak@chromium.org | 00dbccd | 2016-04-15 07:24:43 +0000 | [diff] [blame] | 964 | RunGit(['config', '--bool', 'gerrit.skip-ensure-authenticated'], |
tandrii@chromium.org | 2825353 | 2016-04-14 13:46:56 +0000 | [diff] [blame] | 965 | error_ok=True).strip() == 'true') |
| 966 | return self.gerrit_skip_ensure_authenticated |
| 967 | |
jbroman@chromium.org | 615a262 | 2013-05-03 13:20:14 +0000 | [diff] [blame] | 968 | def GetGitEditor(self): |
| 969 | """Return the editor specified in the git config, or None if none is.""" |
| 970 | if self.git_editor is None: |
| 971 | self.git_editor = self._GetConfig('core.editor', error_ok=True) |
| 972 | return self.git_editor or None |
| 973 | |
thestig@chromium.org | 44202a2 | 2014-03-11 19:22:18 +0000 | [diff] [blame] | 974 | def GetLintRegex(self): |
| 975 | return (self._GetRietveldConfig('cpplint-regex', error_ok=True) or |
| 976 | DEFAULT_LINT_REGEX) |
| 977 | |
| 978 | def GetLintIgnoreRegex(self): |
| 979 | return (self._GetRietveldConfig('cpplint-ignore-regex', error_ok=True) or |
| 980 | DEFAULT_LINT_IGNORE_REGEX) |
| 981 | |
sheyang@chromium.org | 152cf83 | 2014-06-11 21:37:49 +0000 | [diff] [blame] | 982 | def GetProject(self): |
| 983 | if not self.project: |
| 984 | self.project = self._GetRietveldConfig('project', error_ok=True) |
| 985 | return self.project |
| 986 | |
kjellander@chromium.org | 6abc652 | 2014-12-02 07:34:49 +0000 | [diff] [blame] | 987 | def GetForceHttpsCommitUrl(self): |
| 988 | if not self.force_https_commit_url: |
| 989 | self.force_https_commit_url = self._GetRietveldConfig( |
| 990 | 'force-https-commit-url', error_ok=True) |
| 991 | return self.force_https_commit_url |
| 992 | |
vadimsh@chromium.org | 566a02a | 2014-08-22 01:34:13 +0000 | [diff] [blame] | 993 | def GetPendingRefPrefix(self): |
| 994 | if not self.pending_ref_prefix: |
| 995 | self.pending_ref_prefix = self._GetRietveldConfig( |
| 996 | 'pending-ref-prefix', error_ok=True) |
| 997 | return self.pending_ref_prefix |
| 998 | |
tandrii | f46c20f | 2016-09-14 06:17:05 -0700 | [diff] [blame] | 999 | def GetHasGitNumberFooter(self): |
| 1000 | # TODO(tandrii): this has to be removed after Rietveld is read-only. |
| 1001 | # see also bugs http://crbug.com/642493 and http://crbug.com/600469. |
| 1002 | if not self.git_number_footer: |
| 1003 | self.git_number_footer = self._GetRietveldConfig( |
| 1004 | 'git-number-footer', error_ok=True) |
| 1005 | return self.git_number_footer |
| 1006 | |
thestig@chromium.org | 8b0553c | 2014-02-11 00:33:37 +0000 | [diff] [blame] | 1007 | def _GetRietveldConfig(self, param, **kwargs): |
| 1008 | return self._GetConfig('rietveld.' + param, **kwargs) |
| 1009 | |
rmistry@google.com | 78948ed | 2015-07-08 23:09:57 +0000 | [diff] [blame] | 1010 | def _GetBranchConfig(self, branch_name, param, **kwargs): |
| 1011 | return self._GetConfig('branch.' + branch_name + '.' + param, **kwargs) |
| 1012 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1013 | def _GetConfig(self, param, **kwargs): |
| 1014 | self.LazyUpdateIfNeeded() |
| 1015 | return RunGit(['config', param], **kwargs).strip() |
| 1016 | |
| 1017 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1018 | def ShortBranchName(branch): |
| 1019 | """Convert a name like 'refs/heads/foo' to just 'foo'.""" |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1020 | return branch.replace('refs/heads/', '', 1) |
| 1021 | |
| 1022 | |
| 1023 | def GetCurrentBranchRef(): |
| 1024 | """Returns branch ref (e.g., refs/heads/master) or None.""" |
| 1025 | return RunGit(['symbolic-ref', 'HEAD'], |
| 1026 | stderr=subprocess2.VOID, error_ok=True).strip() or None |
| 1027 | |
| 1028 | |
| 1029 | def GetCurrentBranch(): |
| 1030 | """Returns current branch or None. |
| 1031 | |
| 1032 | For refs/heads/* branches, returns just last part. For others, full ref. |
| 1033 | """ |
| 1034 | branchref = GetCurrentBranchRef() |
| 1035 | if branchref: |
| 1036 | return ShortBranchName(branchref) |
| 1037 | return None |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1038 | |
| 1039 | |
tandrii@chromium.org | fa330e8 | 2016-04-13 17:09:52 +0000 | [diff] [blame] | 1040 | class _CQState(object): |
| 1041 | """Enum for states of CL with respect to Commit Queue.""" |
| 1042 | NONE = 'none' |
| 1043 | DRY_RUN = 'dry_run' |
| 1044 | COMMIT = 'commit' |
| 1045 | |
| 1046 | ALL_STATES = [NONE, DRY_RUN, COMMIT] |
| 1047 | |
| 1048 | |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 1049 | class _ParsedIssueNumberArgument(object): |
| 1050 | def __init__(self, issue=None, patchset=None, hostname=None): |
| 1051 | self.issue = issue |
| 1052 | self.patchset = patchset |
| 1053 | self.hostname = hostname |
| 1054 | |
| 1055 | @property |
| 1056 | def valid(self): |
| 1057 | return self.issue is not None |
| 1058 | |
| 1059 | |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 1060 | def ParseIssueNumberArgument(arg): |
| 1061 | """Parses the issue argument and returns _ParsedIssueNumberArgument.""" |
| 1062 | fail_result = _ParsedIssueNumberArgument() |
| 1063 | |
| 1064 | if arg.isdigit(): |
| 1065 | return _ParsedIssueNumberArgument(issue=int(arg)) |
| 1066 | if not arg.startswith('http'): |
| 1067 | return fail_result |
| 1068 | url = gclient_utils.UpgradeToHttps(arg) |
| 1069 | try: |
| 1070 | parsed_url = urlparse.urlparse(url) |
| 1071 | except ValueError: |
| 1072 | return fail_result |
| 1073 | for cls in _CODEREVIEW_IMPLEMENTATIONS.itervalues(): |
| 1074 | tmp = cls.ParseIssueURL(parsed_url) |
| 1075 | if tmp is not None: |
| 1076 | return tmp |
| 1077 | return fail_result |
| 1078 | |
| 1079 | |
tandrii | c2405f5 | 2016-10-10 08:13:15 -0700 | [diff] [blame] | 1080 | class GerritIssueNotExists(Exception): |
| 1081 | def __init__(self, issue, url): |
| 1082 | self.issue = issue |
| 1083 | self.url = url |
| 1084 | super(GerritIssueNotExists, self).__init__() |
| 1085 | |
| 1086 | def __str__(self): |
| 1087 | return 'issue %s at %s does not exist or you have no access to it' % ( |
| 1088 | self.issue, self.url) |
| 1089 | |
| 1090 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1091 | class Changelist(object): |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1092 | """Changelist works with one changelist in local branch. |
| 1093 | |
| 1094 | Supports two codereview backends: Rietveld or Gerrit, selected at object |
| 1095 | creation. |
| 1096 | |
tandrii@chromium.org | 8930b3d | 2016-04-13 14:47:02 +0000 | [diff] [blame] | 1097 | Notes: |
| 1098 | * Not safe for concurrent multi-{thread,process} use. |
| 1099 | * Caches values from current branch. Therefore, re-use after branch change |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1100 | with great care. |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1101 | """ |
| 1102 | |
| 1103 | def __init__(self, branchref=None, issue=None, codereview=None, **kwargs): |
| 1104 | """Create a new ChangeList instance. |
| 1105 | |
| 1106 | If issue is given, the codereview must be given too. |
| 1107 | |
| 1108 | If `codereview` is given, it must be 'rietveld' or 'gerrit'. |
| 1109 | Otherwise, it's decided based on current configuration of the local branch, |
| 1110 | with default being 'rietveld' for backwards compatibility. |
| 1111 | See _load_codereview_impl for more details. |
| 1112 | |
| 1113 | **kwargs will be passed directly to codereview implementation. |
| 1114 | """ |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1115 | # Poke settings so we get the "configure your server" message if necessary. |
maruel@chromium.org | 379d07a | 2011-11-30 14:58:10 +0000 | [diff] [blame] | 1116 | global settings |
| 1117 | if not settings: |
| 1118 | # Happens when git_cl.py is used as a utility library. |
| 1119 | settings = Settings() |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1120 | |
| 1121 | if issue: |
| 1122 | assert codereview, 'codereview must be known, if issue is known' |
| 1123 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1124 | self.branchref = branchref |
| 1125 | if self.branchref: |
clemensh@chromium.org | cbd7dc3 | 2016-05-31 10:33:50 +0000 | [diff] [blame] | 1126 | assert branchref.startswith('refs/heads/') |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1127 | self.branch = ShortBranchName(self.branchref) |
| 1128 | else: |
| 1129 | self.branch = None |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1130 | self.upstream_branch = None |
maruel@chromium.org | 1033efd | 2013-07-23 23:25:09 +0000 | [diff] [blame] | 1131 | self.lookedup_issue = False |
| 1132 | self.issue = issue or None |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1133 | self.has_description = False |
| 1134 | self.description = None |
maruel@chromium.org | 1033efd | 2013-07-23 23:25:09 +0000 | [diff] [blame] | 1135 | self.lookedup_patchset = False |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1136 | self.patchset = None |
bauerb@chromium.org | ae6df35 | 2011-04-06 17:40:39 +0000 | [diff] [blame] | 1137 | self.cc = None |
| 1138 | self.watchers = () |
vadimsh@chromium.org | cf6a5d2 | 2015-04-09 22:02:00 +0000 | [diff] [blame] | 1139 | self._remote = None |
vadimsh@chromium.org | cf6a5d2 | 2015-04-09 22:02:00 +0000 | [diff] [blame] | 1140 | |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1141 | self._codereview_impl = None |
tandrii@chromium.org | d68b62b | 2016-03-31 16:09:29 +0000 | [diff] [blame] | 1142 | self._codereview = None |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1143 | self._load_codereview_impl(codereview, **kwargs) |
tandrii@chromium.org | d68b62b | 2016-03-31 16:09:29 +0000 | [diff] [blame] | 1144 | assert self._codereview_impl |
| 1145 | assert self._codereview in _CODEREVIEW_IMPLEMENTATIONS |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1146 | |
| 1147 | def _load_codereview_impl(self, codereview=None, **kwargs): |
| 1148 | if codereview: |
tandrii@chromium.org | d68b62b | 2016-03-31 16:09:29 +0000 | [diff] [blame] | 1149 | assert codereview in _CODEREVIEW_IMPLEMENTATIONS |
| 1150 | cls = _CODEREVIEW_IMPLEMENTATIONS[codereview] |
| 1151 | self._codereview = codereview |
| 1152 | self._codereview_impl = cls(self, **kwargs) |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1153 | return |
| 1154 | |
| 1155 | # Automatic selection based on issue number set for a current branch. |
| 1156 | # Rietveld takes precedence over Gerrit. |
| 1157 | assert not self.issue |
| 1158 | # Whether we find issue or not, we are doing the lookup. |
| 1159 | self.lookedup_issue = True |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1160 | if self.GetBranch(): |
| 1161 | for codereview, cls in _CODEREVIEW_IMPLEMENTATIONS.iteritems(): |
| 1162 | issue = _git_get_branch_config_value( |
| 1163 | cls.IssueConfigKey(), value_type=int, branch=self.GetBranch()) |
| 1164 | if issue: |
| 1165 | self._codereview = codereview |
| 1166 | self._codereview_impl = cls(self, **kwargs) |
| 1167 | self.issue = int(issue) |
| 1168 | return |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1169 | |
| 1170 | # No issue is set for this branch, so decide based on repo-wide settings. |
| 1171 | return self._load_codereview_impl( |
| 1172 | codereview='gerrit' if settings.GetIsGerrit() else 'rietveld', |
| 1173 | **kwargs) |
| 1174 | |
tandrii@chromium.org | d68b62b | 2016-03-31 16:09:29 +0000 | [diff] [blame] | 1175 | def IsGerrit(self): |
| 1176 | return self._codereview == 'gerrit' |
bauerb@chromium.org | ae6df35 | 2011-04-06 17:40:39 +0000 | [diff] [blame] | 1177 | |
| 1178 | def GetCCList(self): |
| 1179 | """Return the users cc'd on this CL. |
| 1180 | |
agable | 92bec4f | 2016-08-24 09:27:27 -0700 | [diff] [blame] | 1181 | Return is a string suitable for passing to git cl with the --cc flag. |
bauerb@chromium.org | ae6df35 | 2011-04-06 17:40:39 +0000 | [diff] [blame] | 1182 | """ |
| 1183 | if self.cc is None: |
tyoshino@chromium.org | 99918ab | 2013-09-30 06:17:28 +0000 | [diff] [blame] | 1184 | base_cc = settings.GetDefaultCCList() |
bauerb@chromium.org | ae6df35 | 2011-04-06 17:40:39 +0000 | [diff] [blame] | 1185 | more_cc = ','.join(self.watchers) |
| 1186 | self.cc = ','.join(filter(None, (base_cc, more_cc))) or '' |
| 1187 | return self.cc |
| 1188 | |
tyoshino@chromium.org | 99918ab | 2013-09-30 06:17:28 +0000 | [diff] [blame] | 1189 | def GetCCListWithoutDefault(self): |
| 1190 | """Return the users cc'd on this CL excluding default ones.""" |
| 1191 | if self.cc is None: |
| 1192 | self.cc = ','.join(self.watchers) |
| 1193 | return self.cc |
| 1194 | |
bauerb@chromium.org | ae6df35 | 2011-04-06 17:40:39 +0000 | [diff] [blame] | 1195 | def SetWatchers(self, watchers): |
| 1196 | """Set the list of email addresses that should be cc'd based on the changed |
| 1197 | files in this CL. |
| 1198 | """ |
| 1199 | self.watchers = watchers |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1200 | |
| 1201 | def GetBranch(self): |
| 1202 | """Returns the short branch name, e.g. 'master'.""" |
| 1203 | if not self.branch: |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1204 | branchref = GetCurrentBranchRef() |
szager@chromium.org | d62c61f | 2014-10-20 22:33:21 +0000 | [diff] [blame] | 1205 | if not branchref: |
| 1206 | return None |
| 1207 | self.branchref = branchref |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1208 | self.branch = ShortBranchName(self.branchref) |
| 1209 | return self.branch |
| 1210 | |
| 1211 | def GetBranchRef(self): |
| 1212 | """Returns the full branch name, e.g. 'refs/heads/master'.""" |
| 1213 | self.GetBranch() # Poke the lazy loader. |
| 1214 | return self.branchref |
| 1215 | |
tandrii@chromium.org | 534f67a | 2016-04-07 18:47:05 +0000 | [diff] [blame] | 1216 | def ClearBranch(self): |
| 1217 | """Clears cached branch data of this object.""" |
| 1218 | self.branch = self.branchref = None |
| 1219 | |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1220 | def _GitGetBranchConfigValue(self, key, default=None, **kwargs): |
| 1221 | assert 'branch' not in kwargs, 'this CL branch is used automatically' |
| 1222 | kwargs['branch'] = self.GetBranch() |
| 1223 | return _git_get_branch_config_value(key, default, **kwargs) |
| 1224 | |
| 1225 | def _GitSetBranchConfigValue(self, key, value, **kwargs): |
| 1226 | assert 'branch' not in kwargs, 'this CL branch is used automatically' |
| 1227 | assert self.GetBranch(), ( |
| 1228 | 'this CL must have an associated branch to %sset %s%s' % |
| 1229 | ('un' if value is None else '', |
| 1230 | key, |
| 1231 | '' if value is None else ' to %r' % value)) |
| 1232 | kwargs['branch'] = self.GetBranch() |
| 1233 | return _git_set_branch_config_value(key, value, **kwargs) |
| 1234 | |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 1235 | @staticmethod |
| 1236 | def FetchUpstreamTuple(branch): |
pgervais@chromium.org | d6617f3 | 2013-11-19 00:34:54 +0000 | [diff] [blame] | 1237 | """Returns a tuple containing remote and remote ref, |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1238 | e.g. 'origin', 'refs/heads/master' |
| 1239 | """ |
| 1240 | remote = '.' |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1241 | upstream_branch = _git_get_branch_config_value('merge', branch=branch) |
| 1242 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1243 | if upstream_branch: |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1244 | remote = _git_get_branch_config_value('remote', branch=branch) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1245 | else: |
bauerb@chromium.org | ade368c | 2011-03-01 08:57:50 +0000 | [diff] [blame] | 1246 | upstream_branch = RunGit(['config', 'rietveld.upstream-branch'], |
| 1247 | error_ok=True).strip() |
| 1248 | if upstream_branch: |
| 1249 | remote = RunGit(['config', 'rietveld.upstream-remote']).strip() |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1250 | else: |
bauerb@chromium.org | ade368c | 2011-03-01 08:57:50 +0000 | [diff] [blame] | 1251 | # Fall back on trying a git-svn upstream branch. |
| 1252 | if settings.GetIsGitSvn(): |
| 1253 | upstream_branch = settings.GetSVNBranch() |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1254 | else: |
bauerb@chromium.org | ade368c | 2011-03-01 08:57:50 +0000 | [diff] [blame] | 1255 | # Else, try to guess the origin remote. |
| 1256 | remote_branches = RunGit(['branch', '-r']).split() |
| 1257 | if 'origin/master' in remote_branches: |
| 1258 | # Fall back on origin/master if it exits. |
| 1259 | remote = 'origin' |
| 1260 | upstream_branch = 'refs/heads/master' |
| 1261 | elif 'origin/trunk' in remote_branches: |
| 1262 | # Fall back on origin/trunk if it exists. Generally a shared |
| 1263 | # git-svn clone |
| 1264 | remote = 'origin' |
| 1265 | upstream_branch = 'refs/heads/trunk' |
| 1266 | else: |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1267 | DieWithError( |
| 1268 | 'Unable to determine default branch to diff against.\n' |
| 1269 | 'Either pass complete "git diff"-style arguments, like\n' |
| 1270 | ' git cl upload origin/master\n' |
| 1271 | 'or verify this branch is set up to track another \n' |
| 1272 | '(via the --track argument to "git checkout -b ...").') |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1273 | |
| 1274 | return remote, upstream_branch |
| 1275 | |
thestig@chromium.org | 8b0553c | 2014-02-11 00:33:37 +0000 | [diff] [blame] | 1276 | def GetCommonAncestorWithUpstream(self): |
pgervais@chromium.org | 8ba38ff | 2015-06-11 21:41:25 +0000 | [diff] [blame] | 1277 | upstream_branch = self.GetUpstreamBranch() |
| 1278 | if not BranchExists(upstream_branch): |
| 1279 | DieWithError('The upstream for the current branch (%s) does not exist ' |
| 1280 | 'anymore.\nPlease fix it and try again.' % self.GetBranch()) |
iannucci@chromium.org | 9e84927 | 2014-04-04 00:31:55 +0000 | [diff] [blame] | 1281 | return git_common.get_or_create_merge_base(self.GetBranch(), |
pgervais@chromium.org | 8ba38ff | 2015-06-11 21:41:25 +0000 | [diff] [blame] | 1282 | upstream_branch) |
thestig@chromium.org | 8b0553c | 2014-02-11 00:33:37 +0000 | [diff] [blame] | 1283 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1284 | def GetUpstreamBranch(self): |
| 1285 | if self.upstream_branch is None: |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 1286 | remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch()) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1287 | if remote is not '.': |
mmoss@chromium.org | e758545 | 2014-08-24 01:41:11 +0000 | [diff] [blame] | 1288 | upstream_branch = upstream_branch.replace('refs/heads/', |
| 1289 | 'refs/remotes/%s/' % remote) |
| 1290 | upstream_branch = upstream_branch.replace('refs/branch-heads/', |
| 1291 | 'refs/remotes/branch-heads/') |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1292 | self.upstream_branch = upstream_branch |
| 1293 | return self.upstream_branch |
| 1294 | |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 1295 | def GetRemoteBranch(self): |
jmbaker@chromium.org | a2cbbbb | 2012-03-22 20:40:40 +0000 | [diff] [blame] | 1296 | if not self._remote: |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 1297 | remote, branch = None, self.GetBranch() |
| 1298 | seen_branches = set() |
| 1299 | while branch not in seen_branches: |
| 1300 | seen_branches.add(branch) |
| 1301 | remote, branch = self.FetchUpstreamTuple(branch) |
| 1302 | branch = ShortBranchName(branch) |
| 1303 | if remote != '.' or branch.startswith('refs/remotes'): |
| 1304 | break |
| 1305 | else: |
jmbaker@chromium.org | a2cbbbb | 2012-03-22 20:40:40 +0000 | [diff] [blame] | 1306 | remotes = RunGit(['remote'], error_ok=True).split() |
| 1307 | if len(remotes) == 1: |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 1308 | remote, = remotes |
jmbaker@chromium.org | a2cbbbb | 2012-03-22 20:40:40 +0000 | [diff] [blame] | 1309 | elif 'origin' in remotes: |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 1310 | remote = 'origin' |
jmbaker@chromium.org | a2cbbbb | 2012-03-22 20:40:40 +0000 | [diff] [blame] | 1311 | logging.warning('Could not determine which remote this change is ' |
| 1312 | 'associated with, so defaulting to "%s". This may ' |
| 1313 | 'not be what you want. You may prevent this message ' |
| 1314 | 'by running "git svn info" as documented here: %s', |
| 1315 | self._remote, |
| 1316 | GIT_INSTRUCTIONS_URL) |
| 1317 | else: |
| 1318 | logging.warn('Could not determine which remote this change is ' |
| 1319 | 'associated with. You may prevent this message by ' |
| 1320 | 'running "git svn info" as documented here: %s', |
| 1321 | GIT_INSTRUCTIONS_URL) |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 1322 | branch = 'HEAD' |
| 1323 | if branch.startswith('refs/remotes'): |
| 1324 | self._remote = (remote, branch) |
mmoss@chromium.org | e758545 | 2014-08-24 01:41:11 +0000 | [diff] [blame] | 1325 | elif branch.startswith('refs/branch-heads/'): |
| 1326 | self._remote = (remote, branch.replace('refs/', 'refs/remotes/')) |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 1327 | else: |
| 1328 | self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch)) |
jmbaker@chromium.org | a2cbbbb | 2012-03-22 20:40:40 +0000 | [diff] [blame] | 1329 | return self._remote |
| 1330 | |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 1331 | def GitSanityChecks(self, upstream_git_obj): |
| 1332 | """Checks git repo status and ensures diff is from local commits.""" |
| 1333 | |
sbc@chromium.org | 7970606 | 2015-01-14 21:18:12 +0000 | [diff] [blame] | 1334 | if upstream_git_obj is None: |
| 1335 | if self.GetBranch() is None: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 1336 | print('ERROR: unable to determine current branch (detached HEAD?)', |
| 1337 | file=sys.stderr) |
sbc@chromium.org | 7970606 | 2015-01-14 21:18:12 +0000 | [diff] [blame] | 1338 | else: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 1339 | print('ERROR: no upstream branch', file=sys.stderr) |
sbc@chromium.org | 7970606 | 2015-01-14 21:18:12 +0000 | [diff] [blame] | 1340 | return False |
| 1341 | |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 1342 | # Verify the commit we're diffing against is in our current branch. |
| 1343 | upstream_sha = RunGit(['rev-parse', '--verify', upstream_git_obj]).strip() |
| 1344 | common_ancestor = RunGit(['merge-base', upstream_sha, 'HEAD']).strip() |
| 1345 | if upstream_sha != common_ancestor: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 1346 | print('ERROR: %s is not in the current branch. You may need to rebase ' |
| 1347 | 'your tracking branch' % upstream_sha, file=sys.stderr) |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 1348 | return False |
| 1349 | |
| 1350 | # List the commits inside the diff, and verify they are all local. |
| 1351 | commits_in_diff = RunGit( |
| 1352 | ['rev-list', '^%s' % upstream_sha, 'HEAD']).splitlines() |
| 1353 | code, remote_branch = RunGitWithCode(['config', 'gitcl.remotebranch']) |
| 1354 | remote_branch = remote_branch.strip() |
| 1355 | if code != 0: |
| 1356 | _, remote_branch = self.GetRemoteBranch() |
| 1357 | |
| 1358 | commits_in_remote = RunGit( |
| 1359 | ['rev-list', '^%s' % upstream_sha, remote_branch]).splitlines() |
| 1360 | |
| 1361 | common_commits = set(commits_in_diff) & set(commits_in_remote) |
| 1362 | if common_commits: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 1363 | print('ERROR: Your diff contains %d commits already in %s.\n' |
| 1364 | 'Run "git log --oneline %s..HEAD" to get a list of commits in ' |
| 1365 | 'the diff. If you are using a custom git flow, you can override' |
| 1366 | ' the reference used for this check with "git config ' |
| 1367 | 'gitcl.remotebranch <git-ref>".' % ( |
| 1368 | len(common_commits), remote_branch, upstream_git_obj), |
| 1369 | file=sys.stderr) |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 1370 | return False |
| 1371 | return True |
| 1372 | |
kalmard@homejinni.com | 6b0051e | 2012-04-03 15:45:08 +0000 | [diff] [blame] | 1373 | def GetGitBaseUrlFromConfig(self): |
sheyang@chromium.org | a656e70 | 2014-05-15 20:43:05 +0000 | [diff] [blame] | 1374 | """Return the configured base URL from branch.<branchname>.baseurl. |
kalmard@homejinni.com | 6b0051e | 2012-04-03 15:45:08 +0000 | [diff] [blame] | 1375 | |
| 1376 | Returns None if it is not set. |
| 1377 | """ |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1378 | return self._GitGetBranchConfigValue('base-url') |
jmbaker@chromium.org | a2cbbbb | 2012-03-22 20:40:40 +0000 | [diff] [blame] | 1379 | |
kjellander@chromium.org | 6abc652 | 2014-12-02 07:34:49 +0000 | [diff] [blame] | 1380 | def GetGitSvnRemoteUrl(self): |
| 1381 | """Return the configured git-svn remote URL parsed from git svn info. |
| 1382 | |
| 1383 | Returns None if it is not set. |
| 1384 | """ |
| 1385 | # URL is dependent on the current directory. |
| 1386 | data = RunGit(['svn', 'info'], cwd=settings.GetRoot()) |
| 1387 | if data: |
| 1388 | keys = dict(line.split(': ', 1) for line in data.splitlines() |
| 1389 | if ': ' in line) |
| 1390 | return keys.get('URL', None) |
| 1391 | return None |
| 1392 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1393 | def GetRemoteUrl(self): |
| 1394 | """Return the configured remote URL, e.g. 'git://example.org/foo.git/'. |
| 1395 | |
| 1396 | Returns None if there is no remote. |
| 1397 | """ |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 1398 | remote, _ = self.GetRemoteBranch() |
dyen@chromium.org | 2a13d4f | 2014-06-13 00:06:37 +0000 | [diff] [blame] | 1399 | url = RunGit(['config', 'remote.%s.url' % remote], error_ok=True).strip() |
| 1400 | |
| 1401 | # If URL is pointing to a local directory, it is probably a git cache. |
| 1402 | if os.path.isdir(url): |
| 1403 | url = RunGit(['config', 'remote.%s.url' % remote], |
| 1404 | error_ok=True, |
| 1405 | cwd=url).strip() |
| 1406 | return url |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1407 | |
tandrii@chromium.org | 87985d2 | 2016-03-24 17:33:33 +0000 | [diff] [blame] | 1408 | def GetIssue(self): |
maruel@chromium.org | 5242430 | 2012-08-29 15:14:30 +0000 | [diff] [blame] | 1409 | """Returns the issue number as a int or None if not set.""" |
tandrii@chromium.org | 87985d2 | 2016-03-24 17:33:33 +0000 | [diff] [blame] | 1410 | if self.issue is None and not self.lookedup_issue: |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1411 | self.issue = self._GitGetBranchConfigValue( |
| 1412 | self._codereview_impl.IssueConfigKey(), value_type=int) |
maruel@chromium.org | 1033efd | 2013-07-23 23:25:09 +0000 | [diff] [blame] | 1413 | self.lookedup_issue = True |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1414 | return self.issue |
| 1415 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1416 | def GetIssueURL(self): |
| 1417 | """Get the URL for a particular issue.""" |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1418 | issue = self.GetIssue() |
| 1419 | if not issue: |
dbeam@chromium.org | 015fd3d | 2013-06-18 19:02:50 +0000 | [diff] [blame] | 1420 | return None |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1421 | return '%s/%s' % (self._codereview_impl.GetCodereviewServer(), issue) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1422 | |
| 1423 | def GetDescription(self, pretty=False): |
| 1424 | if not self.has_description: |
| 1425 | if self.GetIssue(): |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1426 | self.description = self._codereview_impl.FetchDescription() |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1427 | self.has_description = True |
| 1428 | if pretty: |
| 1429 | wrapper = textwrap.TextWrapper() |
| 1430 | wrapper.initial_indent = wrapper.subsequent_indent = ' ' |
| 1431 | return wrapper.fill(self.description) |
| 1432 | return self.description |
| 1433 | |
| 1434 | def GetPatchset(self): |
maruel@chromium.org | 5242430 | 2012-08-29 15:14:30 +0000 | [diff] [blame] | 1435 | """Returns the patchset number as a int or None if not set.""" |
maruel@chromium.org | 1033efd | 2013-07-23 23:25:09 +0000 | [diff] [blame] | 1436 | if self.patchset is None and not self.lookedup_patchset: |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1437 | self.patchset = self._GitGetBranchConfigValue( |
| 1438 | self._codereview_impl.PatchsetConfigKey(), value_type=int) |
maruel@chromium.org | 1033efd | 2013-07-23 23:25:09 +0000 | [diff] [blame] | 1439 | self.lookedup_patchset = True |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1440 | return self.patchset |
| 1441 | |
| 1442 | def SetPatchset(self, patchset): |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1443 | """Set this branch's patchset. If patchset=0, clears the patchset.""" |
| 1444 | assert self.GetBranch() |
| 1445 | if not patchset: |
maruel@chromium.org | 1033efd | 2013-07-23 23:25:09 +0000 | [diff] [blame] | 1446 | self.patchset = None |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1447 | else: |
| 1448 | self.patchset = int(patchset) |
| 1449 | self._GitSetBranchConfigValue( |
| 1450 | self._codereview_impl.PatchsetConfigKey(), self.patchset) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1451 | |
tandrii@chromium.org | a342c92 | 2016-03-16 07:08:25 +0000 | [diff] [blame] | 1452 | def SetIssue(self, issue=None): |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1453 | """Set this branch's issue. If issue isn't given, clears the issue.""" |
| 1454 | assert self.GetBranch() |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1455 | if issue: |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1456 | issue = int(issue) |
| 1457 | self._GitSetBranchConfigValue( |
| 1458 | self._codereview_impl.IssueConfigKey(), issue) |
maruel@chromium.org | 1033efd | 2013-07-23 23:25:09 +0000 | [diff] [blame] | 1459 | self.issue = issue |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1460 | codereview_server = self._codereview_impl.GetCodereviewServer() |
| 1461 | if codereview_server: |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1462 | self._GitSetBranchConfigValue( |
| 1463 | self._codereview_impl.CodereviewServerConfigKey(), |
| 1464 | codereview_server) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1465 | else: |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1466 | # Reset all of these just to be clean. |
| 1467 | reset_suffixes = [ |
| 1468 | 'last-upload-hash', |
| 1469 | self._codereview_impl.IssueConfigKey(), |
| 1470 | self._codereview_impl.PatchsetConfigKey(), |
| 1471 | self._codereview_impl.CodereviewServerConfigKey(), |
| 1472 | ] + self._PostUnsetIssueProperties() |
| 1473 | for prop in reset_suffixes: |
| 1474 | self._GitSetBranchConfigValue(prop, None, error_ok=True) |
maruel@chromium.org | 1033efd | 2013-07-23 23:25:09 +0000 | [diff] [blame] | 1475 | self.issue = None |
tandrii@chromium.org | 9b7fd71 | 2016-06-01 13:45:20 +0000 | [diff] [blame] | 1476 | self.patchset = None |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1477 | |
dnj | ba1b0f3 | 2016-09-02 12:37:42 -0700 | [diff] [blame] | 1478 | def GetChange(self, upstream_branch, author, local_description=False): |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 1479 | if not self.GitSanityChecks(upstream_branch): |
| 1480 | DieWithError('\nGit sanity check failure') |
| 1481 | |
thestig@chromium.org | 8b0553c | 2014-02-11 00:33:37 +0000 | [diff] [blame] | 1482 | root = settings.GetRelativeRoot() |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 1483 | if not root: |
| 1484 | root = '.' |
bauerb@chromium.org | 512f1ef | 2011-04-20 15:17:57 +0000 | [diff] [blame] | 1485 | absroot = os.path.abspath(root) |
bauerb@chromium.org | 6fb99c6 | 2011-04-18 15:57:28 +0000 | [diff] [blame] | 1486 | |
| 1487 | # We use the sha1 of HEAD as a name of this change. |
thestig@chromium.org | 8b0553c | 2014-02-11 00:33:37 +0000 | [diff] [blame] | 1488 | name = RunGitWithCode(['rev-parse', 'HEAD'])[1].strip() |
bauerb@chromium.org | 512f1ef | 2011-04-20 15:17:57 +0000 | [diff] [blame] | 1489 | # Need to pass a relative path for msysgit. |
maruel@chromium.org | 2b38e9c | 2011-10-19 00:04:35 +0000 | [diff] [blame] | 1490 | try: |
maruel@chromium.org | 80a9ef1 | 2011-12-13 20:44:10 +0000 | [diff] [blame] | 1491 | files = scm.GIT.CaptureStatus([root], '.', upstream_branch) |
maruel@chromium.org | 2b38e9c | 2011-10-19 00:04:35 +0000 | [diff] [blame] | 1492 | except subprocess2.CalledProcessError: |
| 1493 | DieWithError( |
pgervais@chromium.org | d6617f3 | 2013-11-19 00:34:54 +0000 | [diff] [blame] | 1494 | ('\nFailed to diff against upstream branch %s\n\n' |
maruel@chromium.org | 2b38e9c | 2011-10-19 00:04:35 +0000 | [diff] [blame] | 1495 | 'This branch probably doesn\'t exist anymore. To reset the\n' |
| 1496 | 'tracking branch, please run\n' |
stip | 7a3dd35 | 2016-09-22 17:32:28 -0700 | [diff] [blame] | 1497 | ' git branch --set-upstream-to origin/master %s\n' |
| 1498 | 'or replace origin/master with the relevant branch') % |
maruel@chromium.org | 2b38e9c | 2011-10-19 00:04:35 +0000 | [diff] [blame] | 1499 | (upstream_branch, self.GetBranch())) |
bauerb@chromium.org | 6fb99c6 | 2011-04-18 15:57:28 +0000 | [diff] [blame] | 1500 | |
maruel@chromium.org | 5242430 | 2012-08-29 15:14:30 +0000 | [diff] [blame] | 1501 | issue = self.GetIssue() |
| 1502 | patchset = self.GetPatchset() |
dnj | ba1b0f3 | 2016-09-02 12:37:42 -0700 | [diff] [blame] | 1503 | if issue and not local_description: |
bauerb@chromium.org | 6fb99c6 | 2011-04-18 15:57:28 +0000 | [diff] [blame] | 1504 | description = self.GetDescription() |
| 1505 | else: |
| 1506 | # If the change was never uploaded, use the log messages of all commits |
| 1507 | # up to the branch point, as git cl upload will prefill the description |
| 1508 | # with these log messages. |
thestig@chromium.org | 8b0553c | 2014-02-11 00:33:37 +0000 | [diff] [blame] | 1509 | args = ['log', '--pretty=format:%s%n%n%b', '%s...' % (upstream_branch)] |
| 1510 | description = RunGitWithCode(args)[1].strip() |
maruel@chromium.org | 03b3bdc | 2011-06-14 13:04:12 +0000 | [diff] [blame] | 1511 | |
| 1512 | if not author: |
maruel@chromium.org | 13f623c | 2011-07-22 16:02:23 +0000 | [diff] [blame] | 1513 | author = RunGit(['config', 'user.email']).strip() or None |
asvitkine@chromium.org | 1516995 | 2011-09-27 14:30:53 +0000 | [diff] [blame] | 1514 | return presubmit_support.GitChange( |
bauerb@chromium.org | 6fb99c6 | 2011-04-18 15:57:28 +0000 | [diff] [blame] | 1515 | name, |
| 1516 | description, |
| 1517 | absroot, |
| 1518 | files, |
| 1519 | issue, |
| 1520 | patchset, |
agable@chromium.org | ea84ef1 | 2014-04-30 19:55:12 +0000 | [diff] [blame] | 1521 | author, |
| 1522 | upstream=upstream_branch) |
bauerb@chromium.org | 6fb99c6 | 2011-04-18 15:57:28 +0000 | [diff] [blame] | 1523 | |
dsansome | e2d6fd9 | 2016-09-08 00:10:47 -0700 | [diff] [blame] | 1524 | def UpdateDescription(self, description, force=False): |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1525 | self.description = description |
dsansome | e2d6fd9 | 2016-09-08 00:10:47 -0700 | [diff] [blame] | 1526 | return self._codereview_impl.UpdateDescriptionRemote( |
| 1527 | description, force=force) |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1528 | |
| 1529 | def RunHook(self, committing, may_prompt, verbose, change): |
| 1530 | """Calls sys.exit() if the hook fails; returns a HookResults otherwise.""" |
| 1531 | try: |
| 1532 | return presubmit_support.DoPresubmitChecks(change, committing, |
| 1533 | verbose=verbose, output_stream=sys.stdout, input_stream=sys.stdin, |
| 1534 | default_presubmit=None, may_prompt=may_prompt, |
tandrii@chromium.org | 37b07a7 | 2016-04-29 16:42:28 +0000 | [diff] [blame] | 1535 | rietveld_obj=self._codereview_impl.GetRieveldObjForPresubmit(), |
| 1536 | gerrit_obj=self._codereview_impl.GetGerritObjForPresubmit()) |
vapier | fd77ac7 | 2016-06-16 08:33:57 -0700 | [diff] [blame] | 1537 | except presubmit_support.PresubmitFailure as e: |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1538 | DieWithError( |
| 1539 | ('%s\nMaybe your depot_tools is out of date?\n' |
| 1540 | 'If all fails, contact maruel@') % e) |
| 1541 | |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 1542 | def CMDPatchIssue(self, issue_arg, reject, nocommit, directory): |
| 1543 | """Fetches and applies the issue patch from codereview to local branch.""" |
tandrii@chromium.org | ef7c68c | 2016-04-07 09:39:39 +0000 | [diff] [blame] | 1544 | if isinstance(issue_arg, (int, long)) or issue_arg.isdigit(): |
| 1545 | parsed_issue_arg = _ParsedIssueNumberArgument(int(issue_arg)) |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 1546 | else: |
| 1547 | # Assume url. |
| 1548 | parsed_issue_arg = self._codereview_impl.ParseIssueURL( |
| 1549 | urlparse.urlparse(issue_arg)) |
| 1550 | if not parsed_issue_arg or not parsed_issue_arg.valid: |
| 1551 | DieWithError('Failed to parse issue argument "%s". ' |
| 1552 | 'Must be an issue number or a valid URL.' % issue_arg) |
| 1553 | return self._codereview_impl.CMDPatchWithParsedIssue( |
| 1554 | parsed_issue_arg, reject, nocommit, directory) |
| 1555 | |
tandrii@chromium.org | 9e6c3a5 | 2016-04-12 14:13:08 +0000 | [diff] [blame] | 1556 | def CMDUpload(self, options, git_diff_args, orig_args): |
| 1557 | """Uploads a change to codereview.""" |
| 1558 | if git_diff_args: |
| 1559 | # TODO(ukai): is it ok for gerrit case? |
| 1560 | base_branch = git_diff_args[0] |
| 1561 | else: |
| 1562 | if self.GetBranch() is None: |
| 1563 | DieWithError('Can\'t upload from detached HEAD state. Get on a branch!') |
| 1564 | |
| 1565 | # Default to diffing against common ancestor of upstream branch |
| 1566 | base_branch = self.GetCommonAncestorWithUpstream() |
| 1567 | git_diff_args = [base_branch, 'HEAD'] |
| 1568 | |
| 1569 | # Make sure authenticated to codereview before running potentially expensive |
| 1570 | # hooks. It is a fast, best efforts check. Codereview still can reject the |
| 1571 | # authentication during the actual upload. |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 1572 | self._codereview_impl.EnsureAuthenticated(force=options.force) |
tandrii@chromium.org | 9e6c3a5 | 2016-04-12 14:13:08 +0000 | [diff] [blame] | 1573 | |
| 1574 | # Apply watchlists on upload. |
| 1575 | change = self.GetChange(base_branch, None) |
| 1576 | watchlist = watchlists.Watchlists(change.RepositoryRoot()) |
| 1577 | files = [f.LocalPath() for f in change.AffectedFiles()] |
| 1578 | if not options.bypass_watchlists: |
| 1579 | self.SetWatchers(watchlist.GetWatchersForPaths(files)) |
| 1580 | |
| 1581 | if not options.bypass_hooks: |
| 1582 | if options.reviewers or options.tbr_owners: |
| 1583 | # Set the reviewer list now so that presubmit checks can access it. |
| 1584 | change_description = ChangeDescription(change.FullDescriptionText()) |
| 1585 | change_description.update_reviewers(options.reviewers, |
| 1586 | options.tbr_owners, |
| 1587 | change) |
| 1588 | change.SetDescriptionText(change_description.description) |
| 1589 | hook_results = self.RunHook(committing=False, |
| 1590 | may_prompt=not options.force, |
| 1591 | verbose=options.verbose, |
| 1592 | change=change) |
| 1593 | if not hook_results.should_continue(): |
| 1594 | return 1 |
| 1595 | if not options.reviewers and hook_results.reviewers: |
| 1596 | options.reviewers = hook_results.reviewers.split(',') |
| 1597 | |
| 1598 | if self.GetIssue(): |
| 1599 | latest_patchset = self.GetMostRecentPatchset() |
| 1600 | local_patchset = self.GetPatchset() |
| 1601 | if (latest_patchset and local_patchset and |
| 1602 | local_patchset != latest_patchset): |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 1603 | print('The last upload made from this repository was patchset #%d but ' |
| 1604 | 'the most recent patchset on the server is #%d.' |
| 1605 | % (local_patchset, latest_patchset)) |
| 1606 | print('Uploading will still work, but if you\'ve uploaded to this ' |
| 1607 | 'issue from another machine or branch the patch you\'re ' |
| 1608 | 'uploading now might not include those changes.') |
tandrii@chromium.org | 9e6c3a5 | 2016-04-12 14:13:08 +0000 | [diff] [blame] | 1609 | ask_for_data('About to upload; enter to confirm.') |
| 1610 | |
| 1611 | print_stats(options.similarity, options.find_copies, git_diff_args) |
| 1612 | ret = self.CMDUploadChange(options, git_diff_args, change) |
| 1613 | if not ret: |
tandrii | 4d0545a | 2016-07-06 03:56:49 -0700 | [diff] [blame] | 1614 | if options.use_commit_queue: |
| 1615 | self.SetCQState(_CQState.COMMIT) |
| 1616 | elif options.cq_dry_run: |
| 1617 | self.SetCQState(_CQState.DRY_RUN) |
| 1618 | |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1619 | _git_set_branch_config_value('last-upload-hash', |
| 1620 | RunGit(['rev-parse', 'HEAD']).strip()) |
tandrii@chromium.org | 9e6c3a5 | 2016-04-12 14:13:08 +0000 | [diff] [blame] | 1621 | # Run post upload hooks, if specified. |
| 1622 | if settings.GetRunPostUploadHook(): |
| 1623 | presubmit_support.DoPostUploadExecuter( |
| 1624 | change, |
| 1625 | self, |
| 1626 | settings.GetRoot(), |
| 1627 | options.verbose, |
| 1628 | sys.stdout) |
| 1629 | |
| 1630 | # Upload all dependencies if specified. |
| 1631 | if options.dependencies: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 1632 | print() |
| 1633 | print('--dependencies has been specified.') |
| 1634 | print('All dependent local branches will be re-uploaded.') |
| 1635 | print() |
tandrii@chromium.org | 9e6c3a5 | 2016-04-12 14:13:08 +0000 | [diff] [blame] | 1636 | # Remove the dependencies flag from args so that we do not end up in a |
| 1637 | # loop. |
| 1638 | orig_args.remove('--dependencies') |
| 1639 | ret = upload_branch_deps(self, orig_args) |
| 1640 | return ret |
| 1641 | |
tandrii@chromium.org | fa330e8 | 2016-04-13 17:09:52 +0000 | [diff] [blame] | 1642 | def SetCQState(self, new_state): |
| 1643 | """Update the CQ state for latest patchset. |
| 1644 | |
| 1645 | Issue must have been already uploaded and known. |
| 1646 | """ |
| 1647 | assert new_state in _CQState.ALL_STATES |
| 1648 | assert self.GetIssue() |
| 1649 | return self._codereview_impl.SetCQState(new_state) |
| 1650 | |
qyearsley | 1fdfcb6 | 2016-10-24 13:22:03 -0700 | [diff] [blame] | 1651 | def TriggerDryRun(self): |
| 1652 | """Triggers a dry run and prints a warning on failure.""" |
| 1653 | # TODO(qyearsley): Either re-use this method in CMDset_commit |
| 1654 | # and CMDupload, or change CMDtry to trigger dry runs with |
| 1655 | # just SetCQState, and catch keyboard interrupt and other |
| 1656 | # errors in that method. |
| 1657 | try: |
| 1658 | self.SetCQState(_CQState.DRY_RUN) |
| 1659 | print('scheduled CQ Dry Run on %s' % self.GetIssueURL()) |
| 1660 | return 0 |
| 1661 | except KeyboardInterrupt: |
| 1662 | raise |
| 1663 | except: |
| 1664 | print('WARNING: failed to trigger CQ Dry Run.\n' |
| 1665 | 'Either:\n' |
| 1666 | ' * your project has no CQ\n' |
| 1667 | ' * you don\'t have permission to trigger Dry Run\n' |
| 1668 | ' * bug in this code (see stack trace below).\n' |
| 1669 | 'Consider specifying which bots to trigger manually ' |
| 1670 | 'or asking your project owners for permissions ' |
| 1671 | 'or contacting Chrome Infrastructure team at ' |
| 1672 | 'https://www.chromium.org/infra\n\n') |
| 1673 | # Still raise exception so that stack trace is printed. |
| 1674 | raise |
| 1675 | |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1676 | # Forward methods to codereview specific implementation. |
| 1677 | |
| 1678 | def CloseIssue(self): |
| 1679 | return self._codereview_impl.CloseIssue() |
| 1680 | |
| 1681 | def GetStatus(self): |
| 1682 | return self._codereview_impl.GetStatus() |
| 1683 | |
| 1684 | def GetCodereviewServer(self): |
| 1685 | return self._codereview_impl.GetCodereviewServer() |
| 1686 | |
tandrii | de281ae | 2016-10-12 06:02:30 -0700 | [diff] [blame] | 1687 | def GetIssueOwner(self): |
| 1688 | """Get owner from codereview, which may differ from this checkout.""" |
| 1689 | return self._codereview_impl.GetIssueOwner() |
| 1690 | |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1691 | def GetApprovingReviewers(self): |
| 1692 | return self._codereview_impl.GetApprovingReviewers() |
| 1693 | |
| 1694 | def GetMostRecentPatchset(self): |
| 1695 | return self._codereview_impl.GetMostRecentPatchset() |
| 1696 | |
tandrii | de281ae | 2016-10-12 06:02:30 -0700 | [diff] [blame] | 1697 | def CannotTriggerTryJobReason(self): |
| 1698 | """Returns reason (str) if unable trigger tryjobs on this CL or None.""" |
| 1699 | return self._codereview_impl.CannotTriggerTryJobReason() |
| 1700 | |
tandrii | 8c5a353 | 2016-11-04 07:52:02 -0700 | [diff] [blame] | 1701 | def GetTryjobProperties(self, patchset=None): |
| 1702 | """Returns dictionary of properties to launch tryjob.""" |
| 1703 | return self._codereview_impl.GetTryjobProperties(patchset=patchset) |
| 1704 | |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1705 | def __getattr__(self, attr): |
| 1706 | # This is because lots of untested code accesses Rietveld-specific stuff |
| 1707 | # directly, and it's hard to fix for sure. So, just let it work, and fix |
clemensh@chromium.org | cbd7dc3 | 2016-05-31 10:33:50 +0000 | [diff] [blame] | 1708 | # on a case by case basis. |
tandrii | 4d89550 | 2016-08-18 08:26:19 -0700 | [diff] [blame] | 1709 | # Note that child method defines __getattr__ as well, and forwards it here, |
| 1710 | # because _RietveldChangelistImpl is not cleaned up yet, and given |
| 1711 | # deprecation of Rietveld, it should probably be just removed. |
| 1712 | # Until that time, avoid infinite recursion by bypassing __getattr__ |
| 1713 | # of implementation class. |
| 1714 | return self._codereview_impl.__getattribute__(attr) |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1715 | |
| 1716 | |
| 1717 | class _ChangelistCodereviewBase(object): |
| 1718 | """Abstract base class encapsulating codereview specifics of a changelist.""" |
| 1719 | def __init__(self, changelist): |
| 1720 | self._changelist = changelist # instance of Changelist |
| 1721 | |
| 1722 | def __getattr__(self, attr): |
| 1723 | # Forward methods to changelist. |
| 1724 | # TODO(tandrii): maybe clean up _GerritChangelistImpl and |
| 1725 | # _RietveldChangelistImpl to avoid this hack? |
| 1726 | return getattr(self._changelist, attr) |
| 1727 | |
| 1728 | def GetStatus(self): |
| 1729 | """Apply a rough heuristic to give a simple summary of an issue's review |
| 1730 | or CQ status, assuming adherence to a common workflow. |
| 1731 | |
| 1732 | Returns None if no issue for this branch, or specific string keywords. |
| 1733 | """ |
| 1734 | raise NotImplementedError() |
| 1735 | |
| 1736 | def GetCodereviewServer(self): |
| 1737 | """Returns server URL without end slash, like "https://codereview.com".""" |
| 1738 | raise NotImplementedError() |
| 1739 | |
| 1740 | def FetchDescription(self): |
| 1741 | """Fetches and returns description from the codereview server.""" |
| 1742 | raise NotImplementedError() |
| 1743 | |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1744 | @classmethod |
| 1745 | def IssueConfigKey(cls): |
| 1746 | """Returns branch setting storing issue number.""" |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1747 | raise NotImplementedError() |
| 1748 | |
tandrii@chromium.org | 5df290f | 2016-04-11 16:12:29 +0000 | [diff] [blame] | 1749 | @classmethod |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1750 | def PatchsetConfigKey(cls): |
| 1751 | """Returns branch setting storing patchset number.""" |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1752 | raise NotImplementedError() |
| 1753 | |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1754 | @classmethod |
| 1755 | def CodereviewServerConfigKey(cls): |
| 1756 | """Returns branch setting storing codereview server.""" |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1757 | raise NotImplementedError() |
| 1758 | |
tandrii@chromium.org | 9b7fd71 | 2016-06-01 13:45:20 +0000 | [diff] [blame] | 1759 | def _PostUnsetIssueProperties(self): |
| 1760 | """Which branch-specific properties to erase when unsettin issue.""" |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1761 | return [] |
tandrii@chromium.org | 9b7fd71 | 2016-06-01 13:45:20 +0000 | [diff] [blame] | 1762 | |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1763 | def GetRieveldObjForPresubmit(self): |
| 1764 | # This is an unfortunate Rietveld-embeddedness in presubmit. |
| 1765 | # For non-Rietveld codereviews, this probably should return a dummy object. |
| 1766 | raise NotImplementedError() |
| 1767 | |
tandrii@chromium.org | 37b07a7 | 2016-04-29 16:42:28 +0000 | [diff] [blame] | 1768 | def GetGerritObjForPresubmit(self): |
| 1769 | # None is valid return value, otherwise presubmit_support.GerritAccessor. |
| 1770 | return None |
| 1771 | |
dsansome | e2d6fd9 | 2016-09-08 00:10:47 -0700 | [diff] [blame] | 1772 | def UpdateDescriptionRemote(self, description, force=False): |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1773 | """Update the description on codereview site.""" |
| 1774 | raise NotImplementedError() |
| 1775 | |
| 1776 | def CloseIssue(self): |
| 1777 | """Closes the issue.""" |
| 1778 | raise NotImplementedError() |
| 1779 | |
| 1780 | def GetApprovingReviewers(self): |
| 1781 | """Returns a list of reviewers approving the change. |
| 1782 | |
| 1783 | Note: not necessarily committers. |
| 1784 | """ |
| 1785 | raise NotImplementedError() |
| 1786 | |
| 1787 | def GetMostRecentPatchset(self): |
| 1788 | """Returns the most recent patchset number from the codereview site.""" |
| 1789 | raise NotImplementedError() |
| 1790 | |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 1791 | def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit, |
| 1792 | directory): |
| 1793 | """Fetches and applies the issue. |
| 1794 | |
| 1795 | Arguments: |
| 1796 | parsed_issue_arg: instance of _ParsedIssueNumberArgument. |
| 1797 | reject: if True, reject the failed patch instead of switching to 3-way |
| 1798 | merge. Rietveld only. |
| 1799 | nocommit: do not commit the patch, thus leave the tree dirty. Rietveld |
| 1800 | only. |
| 1801 | directory: switch to directory before applying the patch. Rietveld only. |
| 1802 | """ |
| 1803 | raise NotImplementedError() |
| 1804 | |
| 1805 | @staticmethod |
| 1806 | def ParseIssueURL(parsed_url): |
| 1807 | """Parses url and returns instance of _ParsedIssueNumberArgument or None if |
| 1808 | failed.""" |
| 1809 | raise NotImplementedError() |
| 1810 | |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 1811 | def EnsureAuthenticated(self, force): |
| 1812 | """Best effort check that user is authenticated with codereview server. |
| 1813 | |
| 1814 | Arguments: |
| 1815 | force: whether to skip confirmation questions. |
| 1816 | """ |
tandrii@chromium.org | 9e6c3a5 | 2016-04-12 14:13:08 +0000 | [diff] [blame] | 1817 | raise NotImplementedError() |
| 1818 | |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 1819 | def CMDUploadChange(self, options, args, change): |
| 1820 | """Uploads a change to codereview.""" |
| 1821 | raise NotImplementedError() |
| 1822 | |
tandrii@chromium.org | fa330e8 | 2016-04-13 17:09:52 +0000 | [diff] [blame] | 1823 | def SetCQState(self, new_state): |
| 1824 | """Update the CQ state for latest patchset. |
| 1825 | |
| 1826 | Issue must have been already uploaded and known. |
| 1827 | """ |
| 1828 | raise NotImplementedError() |
| 1829 | |
tandrii | e113dfd | 2016-10-11 10:20:12 -0700 | [diff] [blame] | 1830 | def CannotTriggerTryJobReason(self): |
| 1831 | """Returns reason (str) if unable trigger tryjobs on this CL or None.""" |
| 1832 | raise NotImplementedError() |
| 1833 | |
tandrii | de281ae | 2016-10-12 06:02:30 -0700 | [diff] [blame] | 1834 | def GetIssueOwner(self): |
| 1835 | raise NotImplementedError() |
| 1836 | |
tandrii | 8c5a353 | 2016-11-04 07:52:02 -0700 | [diff] [blame] | 1837 | def GetTryjobProperties(self, patchset=None): |
tandrii | de281ae | 2016-10-12 06:02:30 -0700 | [diff] [blame] | 1838 | raise NotImplementedError() |
| 1839 | |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1840 | |
| 1841 | class _RietveldChangelistImpl(_ChangelistCodereviewBase): |
| 1842 | def __init__(self, changelist, auth_config=None, rietveld_server=None): |
| 1843 | super(_RietveldChangelistImpl, self).__init__(changelist) |
| 1844 | assert settings, 'must be initialized in _ChangelistCodereviewBase' |
martiniss | 6eda05f | 2016-06-30 10:18:35 -0700 | [diff] [blame] | 1845 | if not rietveld_server: |
| 1846 | settings.GetDefaultServerUrl() |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1847 | |
| 1848 | self._rietveld_server = rietveld_server |
| 1849 | self._auth_config = auth_config |
| 1850 | self._props = None |
| 1851 | self._rpc_server = None |
| 1852 | |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1853 | def GetCodereviewServer(self): |
| 1854 | if not self._rietveld_server: |
| 1855 | # If we're on a branch then get the server potentially associated |
| 1856 | # with that branch. |
| 1857 | if self.GetIssue(): |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1858 | self._rietveld_server = gclient_utils.UpgradeToHttps( |
| 1859 | self._GitGetBranchConfigValue(self.CodereviewServerConfigKey())) |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1860 | if not self._rietveld_server: |
| 1861 | self._rietveld_server = settings.GetDefaultServerUrl() |
| 1862 | return self._rietveld_server |
| 1863 | |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 1864 | def EnsureAuthenticated(self, force): |
tandrii@chromium.org | 9e6c3a5 | 2016-04-12 14:13:08 +0000 | [diff] [blame] | 1865 | """Best effort check that user is authenticated with Rietveld server.""" |
| 1866 | if self._auth_config.use_oauth2: |
| 1867 | authenticator = auth.get_authenticator_for_host( |
| 1868 | self.GetCodereviewServer(), self._auth_config) |
| 1869 | if not authenticator.has_cached_credentials(): |
| 1870 | raise auth.LoginRequiredError(self.GetCodereviewServer()) |
| 1871 | |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1872 | def FetchDescription(self): |
| 1873 | issue = self.GetIssue() |
| 1874 | assert issue |
| 1875 | try: |
| 1876 | return self.RpcServer().get_description(issue).strip() |
| 1877 | except urllib2.HTTPError as e: |
| 1878 | if e.code == 404: |
| 1879 | DieWithError( |
| 1880 | ('\nWhile fetching the description for issue %d, received a ' |
| 1881 | '404 (not found)\n' |
| 1882 | 'error. It is likely that you deleted this ' |
| 1883 | 'issue on the server. If this is the\n' |
| 1884 | 'case, please run\n\n' |
| 1885 | ' git cl issue 0\n\n' |
| 1886 | 'to clear the association with the deleted issue. Then run ' |
| 1887 | 'this command again.') % issue) |
| 1888 | else: |
| 1889 | DieWithError( |
| 1890 | '\nFailed to fetch issue description. HTTP error %d' % e.code) |
| 1891 | except urllib2.URLError as e: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 1892 | print('Warning: Failed to retrieve CL description due to network ' |
| 1893 | 'failure.', file=sys.stderr) |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1894 | return '' |
| 1895 | |
| 1896 | def GetMostRecentPatchset(self): |
| 1897 | return self.GetIssueProperties()['patchsets'][-1] |
| 1898 | |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1899 | def GetIssueProperties(self): |
| 1900 | if self._props is None: |
| 1901 | issue = self.GetIssue() |
| 1902 | if not issue: |
| 1903 | self._props = {} |
| 1904 | else: |
| 1905 | self._props = self.RpcServer().get_issue_properties(issue, True) |
| 1906 | return self._props |
| 1907 | |
tandrii | e113dfd | 2016-10-11 10:20:12 -0700 | [diff] [blame] | 1908 | def CannotTriggerTryJobReason(self): |
| 1909 | props = self.GetIssueProperties() |
| 1910 | if not props: |
| 1911 | return 'Rietveld doesn\'t know about your issue %s' % self.GetIssue() |
| 1912 | if props.get('closed'): |
| 1913 | return 'CL %s is closed' % self.GetIssue() |
| 1914 | if props.get('private'): |
| 1915 | return 'CL %s is private' % self.GetIssue() |
| 1916 | return None |
| 1917 | |
tandrii | 8c5a353 | 2016-11-04 07:52:02 -0700 | [diff] [blame] | 1918 | def GetTryjobProperties(self, patchset=None): |
| 1919 | """Returns dictionary of properties to launch tryjob.""" |
| 1920 | project = (self.GetIssueProperties() or {}).get('project') |
| 1921 | return { |
| 1922 | 'issue': self.GetIssue(), |
| 1923 | 'patch_project': project, |
| 1924 | 'patch_storage': 'rietveld', |
| 1925 | 'patchset': patchset or self.GetPatchset(), |
| 1926 | 'rietveld': self.GetCodereviewServer(), |
| 1927 | } |
| 1928 | |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1929 | def GetApprovingReviewers(self): |
| 1930 | return get_approving_reviewers(self.GetIssueProperties()) |
| 1931 | |
tandrii | de281ae | 2016-10-12 06:02:30 -0700 | [diff] [blame] | 1932 | def GetIssueOwner(self): |
| 1933 | return (self.GetIssueProperties() or {}).get('owner_email') |
| 1934 | |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1935 | def AddComment(self, message): |
| 1936 | return self.RpcServer().add_comment(self.GetIssue(), message) |
| 1937 | |
jsbell@chromium.org | b99fbd9 | 2014-09-11 17:29:28 +0000 | [diff] [blame] | 1938 | def GetStatus(self): |
| 1939 | """Apply a rough heuristic to give a simple summary of an issue's review |
| 1940 | or CQ status, assuming adherence to a common workflow. |
| 1941 | |
| 1942 | Returns None if no issue for this branch, or one of the following keywords: |
| 1943 | * 'error' - error from review tool (including deleted issues) |
| 1944 | * 'unsent' - not sent for review |
| 1945 | * 'waiting' - waiting for review |
| 1946 | * 'reply' - waiting for owner to reply to review |
| 1947 | * 'lgtm' - LGTM from at least one approved reviewer |
| 1948 | * 'commit' - in the commit queue |
| 1949 | * 'closed' - closed |
| 1950 | """ |
| 1951 | if not self.GetIssue(): |
| 1952 | return None |
| 1953 | |
| 1954 | try: |
| 1955 | props = self.GetIssueProperties() |
| 1956 | except urllib2.HTTPError: |
| 1957 | return 'error' |
| 1958 | |
| 1959 | if props.get('closed'): |
| 1960 | # Issue is closed. |
| 1961 | return 'closed' |
tandrii@chromium.org | b4f6a22 | 2016-03-03 01:11:04 +0000 | [diff] [blame] | 1962 | if props.get('commit') and not props.get('cq_dry_run', False): |
jsbell@chromium.org | b99fbd9 | 2014-09-11 17:29:28 +0000 | [diff] [blame] | 1963 | # Issue is in the commit queue. |
| 1964 | return 'commit' |
| 1965 | |
| 1966 | try: |
| 1967 | reviewers = self.GetApprovingReviewers() |
| 1968 | except urllib2.HTTPError: |
| 1969 | return 'error' |
| 1970 | |
| 1971 | if reviewers: |
| 1972 | # Was LGTM'ed. |
| 1973 | return 'lgtm' |
| 1974 | |
| 1975 | messages = props.get('messages') or [] |
| 1976 | |
tandrii | 9d2c7a3 | 2016-06-22 03:42:45 -0700 | [diff] [blame] | 1977 | # Skip CQ messages that don't require owner's action. |
| 1978 | while messages and messages[-1]['sender'] == COMMIT_BOT_EMAIL: |
| 1979 | if 'Dry run:' in messages[-1]['text']: |
| 1980 | messages.pop() |
| 1981 | elif 'The CQ bit was unchecked' in messages[-1]['text']: |
| 1982 | # This message always follows prior messages from CQ, |
| 1983 | # so skip this too. |
| 1984 | messages.pop() |
| 1985 | else: |
| 1986 | # This is probably a CQ messages warranting user attention. |
| 1987 | break |
| 1988 | |
jsbell@chromium.org | b99fbd9 | 2014-09-11 17:29:28 +0000 | [diff] [blame] | 1989 | if not messages: |
| 1990 | # No message was sent. |
| 1991 | return 'unsent' |
| 1992 | if messages[-1]['sender'] != props.get('owner_email'): |
tandrii | 9d2c7a3 | 2016-06-22 03:42:45 -0700 | [diff] [blame] | 1993 | # Non-LGTM reply from non-owner and not CQ bot. |
jsbell@chromium.org | b99fbd9 | 2014-09-11 17:29:28 +0000 | [diff] [blame] | 1994 | return 'reply' |
| 1995 | return 'waiting' |
| 1996 | |
dsansome | e2d6fd9 | 2016-09-08 00:10:47 -0700 | [diff] [blame] | 1997 | def UpdateDescriptionRemote(self, description, force=False): |
maruel@chromium.org | b021b32 | 2013-04-08 17:57:29 +0000 | [diff] [blame] | 1998 | return self.RpcServer().update_description( |
| 1999 | self.GetIssue(), self.description) |
| 2000 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 2001 | def CloseIssue(self): |
maruel@chromium.org | b021b32 | 2013-04-08 17:57:29 +0000 | [diff] [blame] | 2002 | return self.RpcServer().close_issue(self.GetIssue()) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 2003 | |
maruel@chromium.org | 27bb387 | 2011-05-30 20:33:19 +0000 | [diff] [blame] | 2004 | def SetFlag(self, flag, value): |
tandrii | 4b233bd | 2016-07-06 03:50:29 -0700 | [diff] [blame] | 2005 | return self.SetFlags({flag: value}) |
| 2006 | |
| 2007 | def SetFlags(self, flags): |
| 2008 | """Sets flags on this CL/patchset in Rietveld. |
tandrii | 4b233bd | 2016-07-06 03:50:29 -0700 | [diff] [blame] | 2009 | """ |
phajdan.jr | 6859823 | 2016-08-10 03:28:28 -0700 | [diff] [blame] | 2010 | patchset = self.GetPatchset() or self.GetMostRecentPatchset() |
maruel@chromium.org | 27bb387 | 2011-05-30 20:33:19 +0000 | [diff] [blame] | 2011 | try: |
tandrii | 4b233bd | 2016-07-06 03:50:29 -0700 | [diff] [blame] | 2012 | return self.RpcServer().set_flags( |
phajdan.jr | 6859823 | 2016-08-10 03:28:28 -0700 | [diff] [blame] | 2013 | self.GetIssue(), patchset, flags) |
vapier | fd77ac7 | 2016-06-16 08:33:57 -0700 | [diff] [blame] | 2014 | except urllib2.HTTPError as e: |
maruel@chromium.org | 27bb387 | 2011-05-30 20:33:19 +0000 | [diff] [blame] | 2015 | if e.code == 404: |
| 2016 | DieWithError('The issue %s doesn\'t exist.' % self.GetIssue()) |
| 2017 | if e.code == 403: |
| 2018 | DieWithError( |
| 2019 | ('Access denied to issue %s. Maybe the patchset %s doesn\'t ' |
phajdan.jr | 6859823 | 2016-08-10 03:28:28 -0700 | [diff] [blame] | 2020 | 'match?') % (self.GetIssue(), patchset)) |
maruel@chromium.org | 27bb387 | 2011-05-30 20:33:19 +0000 | [diff] [blame] | 2021 | raise |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 2022 | |
maruel@chromium.org | cab38e9 | 2011-04-09 00:30:51 +0000 | [diff] [blame] | 2023 | def RpcServer(self): |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 2024 | """Returns an upload.RpcServer() to access this review's rietveld instance. |
| 2025 | """ |
maruel@chromium.org | e77ebbf | 2011-03-29 20:35:38 +0000 | [diff] [blame] | 2026 | if not self._rpc_server: |
maruel@chromium.org | 4bac4b5 | 2012-11-27 20:33:52 +0000 | [diff] [blame] | 2027 | self._rpc_server = rietveld.CachingRietveld( |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 2028 | self.GetCodereviewServer(), |
vadimsh@chromium.org | cf6a5d2 | 2015-04-09 22:02:00 +0000 | [diff] [blame] | 2029 | self._auth_config or auth.make_auth_config()) |
maruel@chromium.org | e77ebbf | 2011-03-29 20:35:38 +0000 | [diff] [blame] | 2030 | return self._rpc_server |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 2031 | |
tandrii@chromium.org | 5df290f | 2016-04-11 16:12:29 +0000 | [diff] [blame] | 2032 | @classmethod |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 2033 | def IssueConfigKey(cls): |
tandrii@chromium.org | 5df290f | 2016-04-11 16:12:29 +0000 | [diff] [blame] | 2034 | return 'rietveldissue' |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 2035 | |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 2036 | @classmethod |
| 2037 | def PatchsetConfigKey(cls): |
| 2038 | return 'rietveldpatchset' |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 2039 | |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 2040 | @classmethod |
| 2041 | def CodereviewServerConfigKey(cls): |
| 2042 | return 'rietveldserver' |
tandrii@chromium.org | 9b7fd71 | 2016-06-01 13:45:20 +0000 | [diff] [blame] | 2043 | |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 2044 | def GetRieveldObjForPresubmit(self): |
| 2045 | return self.RpcServer() |
| 2046 | |
tandrii@chromium.org | fa330e8 | 2016-04-13 17:09:52 +0000 | [diff] [blame] | 2047 | def SetCQState(self, new_state): |
| 2048 | props = self.GetIssueProperties() |
| 2049 | if props.get('private'): |
| 2050 | DieWithError('Cannot set-commit on private issue') |
| 2051 | |
| 2052 | if new_state == _CQState.COMMIT: |
tandrii | 4d84359 | 2016-07-27 08:22:56 -0700 | [diff] [blame] | 2053 | self.SetFlags({'commit': '1', 'cq_dry_run': '0'}) |
tandrii@chromium.org | fa330e8 | 2016-04-13 17:09:52 +0000 | [diff] [blame] | 2054 | elif new_state == _CQState.NONE: |
tandrii | 4b233bd | 2016-07-06 03:50:29 -0700 | [diff] [blame] | 2055 | self.SetFlags({'commit': '0', 'cq_dry_run': '0'}) |
tandrii@chromium.org | fa330e8 | 2016-04-13 17:09:52 +0000 | [diff] [blame] | 2056 | else: |
tandrii | 4b233bd | 2016-07-06 03:50:29 -0700 | [diff] [blame] | 2057 | assert new_state == _CQState.DRY_RUN |
| 2058 | self.SetFlags({'commit': '1', 'cq_dry_run': '1'}) |
tandrii@chromium.org | fa330e8 | 2016-04-13 17:09:52 +0000 | [diff] [blame] | 2059 | |
| 2060 | |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 2061 | def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit, |
| 2062 | directory): |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 2063 | # PatchIssue should never be called with a dirty tree. It is up to the |
| 2064 | # caller to check this, but just in case we assert here since the |
| 2065 | # consequences of the caller not checking this could be dire. |
| 2066 | assert(not git_common.is_dirty_git_tree('apply')) |
| 2067 | assert(parsed_issue_arg.valid) |
| 2068 | self._changelist.issue = parsed_issue_arg.issue |
| 2069 | if parsed_issue_arg.hostname: |
| 2070 | self._rietveld_server = 'https://%s' % parsed_issue_arg.hostname |
| 2071 | |
skobes | 6468b90 | 2016-10-24 08:45:10 -0700 | [diff] [blame] | 2072 | patchset = parsed_issue_arg.patchset or self.GetMostRecentPatchset() |
| 2073 | patchset_object = self.RpcServer().get_patch(self.GetIssue(), patchset) |
| 2074 | scm_obj = checkout.GitCheckout(settings.GetRoot(), None, None, None, None) |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 2075 | try: |
skobes | 6468b90 | 2016-10-24 08:45:10 -0700 | [diff] [blame] | 2076 | scm_obj.apply_patch(patchset_object) |
| 2077 | except Exception as e: |
| 2078 | print(str(e)) |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 2079 | return 1 |
| 2080 | |
| 2081 | # If we had an issue, commit the current state and register the issue. |
| 2082 | if not nocommit: |
| 2083 | RunGit(['commit', '-m', (self.GetDescription() + '\n\n' + |
| 2084 | 'patch from issue %(i)s at patchset ' |
| 2085 | '%(p)s (http://crrev.com/%(i)s#ps%(p)s)' |
| 2086 | % {'i': self.GetIssue(), 'p': patchset})]) |
| 2087 | self.SetIssue(self.GetIssue()) |
| 2088 | self.SetPatchset(patchset) |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 2089 | print('Committed patch locally.') |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 2090 | else: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 2091 | print('Patch applied to index.') |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 2092 | return 0 |
| 2093 | |
| 2094 | @staticmethod |
| 2095 | def ParseIssueURL(parsed_url): |
| 2096 | if not parsed_url.scheme or not parsed_url.scheme.startswith('http'): |
| 2097 | return None |
wychen | 3c1c172 | 2016-08-04 11:46:36 -0700 | [diff] [blame] | 2098 | # Rietveld patch: https://domain/<number>/#ps<patchset> |
| 2099 | match = re.match(r'/(\d+)/$', parsed_url.path) |
| 2100 | match2 = re.match(r'ps(\d+)$', parsed_url.fragment) |
| 2101 | if match and match2: |
skobes | 6468b90 | 2016-10-24 08:45:10 -0700 | [diff] [blame] | 2102 | return _ParsedIssueNumberArgument( |
wychen | 3c1c172 | 2016-08-04 11:46:36 -0700 | [diff] [blame] | 2103 | issue=int(match.group(1)), |
| 2104 | patchset=int(match2.group(1)), |
| 2105 | hostname=parsed_url.netloc) |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 2106 | # Typical url: https://domain/<issue_number>[/[other]] |
| 2107 | match = re.match('/(\d+)(/.*)?$', parsed_url.path) |
| 2108 | if match: |
skobes | 6468b90 | 2016-10-24 08:45:10 -0700 | [diff] [blame] | 2109 | return _ParsedIssueNumberArgument( |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 2110 | issue=int(match.group(1)), |
| 2111 | hostname=parsed_url.netloc) |
| 2112 | # Rietveld patch: https://domain/download/issue<number>_<patchset>.diff |
| 2113 | match = re.match(r'/download/issue(\d+)_(\d+).diff$', parsed_url.path) |
| 2114 | if match: |
skobes | 6468b90 | 2016-10-24 08:45:10 -0700 | [diff] [blame] | 2115 | return _ParsedIssueNumberArgument( |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 2116 | issue=int(match.group(1)), |
| 2117 | patchset=int(match.group(2)), |
skobes | 6468b90 | 2016-10-24 08:45:10 -0700 | [diff] [blame] | 2118 | hostname=parsed_url.netloc) |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 2119 | return None |
| 2120 | |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2121 | def CMDUploadChange(self, options, args, change): |
| 2122 | """Upload the patch to Rietveld.""" |
| 2123 | upload_args = ['--assume_yes'] # Don't ask about untracked files. |
| 2124 | upload_args.extend(['--server', self.GetCodereviewServer()]) |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2125 | upload_args.extend(auth.auth_config_to_command_options(self._auth_config)) |
| 2126 | if options.emulate_svn_auto_props: |
| 2127 | upload_args.append('--emulate_svn_auto_props') |
| 2128 | |
| 2129 | change_desc = None |
| 2130 | |
| 2131 | if options.email is not None: |
| 2132 | upload_args.extend(['--email', options.email]) |
| 2133 | |
| 2134 | if self.GetIssue(): |
nodir | ca16600 | 2016-06-27 10:59:51 -0700 | [diff] [blame] | 2135 | if options.title is not None: |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2136 | upload_args.extend(['--title', options.title]) |
| 2137 | if options.message: |
| 2138 | upload_args.extend(['--message', options.message]) |
| 2139 | upload_args.extend(['--issue', str(self.GetIssue())]) |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 2140 | print('This branch is associated with issue %s. ' |
| 2141 | 'Adding patch to that issue.' % self.GetIssue()) |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2142 | else: |
nodir | ca16600 | 2016-06-27 10:59:51 -0700 | [diff] [blame] | 2143 | if options.title is not None: |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2144 | upload_args.extend(['--title', options.title]) |
| 2145 | message = (options.title or options.message or |
| 2146 | CreateDescriptionFromLog(args)) |
| 2147 | change_desc = ChangeDescription(message) |
| 2148 | if options.reviewers or options.tbr_owners: |
| 2149 | change_desc.update_reviewers(options.reviewers, |
| 2150 | options.tbr_owners, |
| 2151 | change) |
| 2152 | if not options.force: |
tandrii | f9aefb7 | 2016-07-01 09:06:51 -0700 | [diff] [blame] | 2153 | change_desc.prompt(bug=options.bug) |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2154 | |
| 2155 | if not change_desc.description: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 2156 | print('Description is empty; aborting.') |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2157 | return 1 |
| 2158 | |
| 2159 | upload_args.extend(['--message', change_desc.description]) |
| 2160 | if change_desc.get_reviewers(): |
| 2161 | upload_args.append('--reviewers=%s' % ','.join( |
| 2162 | change_desc.get_reviewers())) |
| 2163 | if options.send_mail: |
| 2164 | if not change_desc.get_reviewers(): |
| 2165 | DieWithError("Must specify reviewers to send email.") |
| 2166 | upload_args.append('--send_mail') |
| 2167 | |
| 2168 | # We check this before applying rietveld.private assuming that in |
| 2169 | # rietveld.cc only addresses which we can send private CLs to are listed |
| 2170 | # if rietveld.private is set, and so we should ignore rietveld.cc only |
| 2171 | # when --private is specified explicitly on the command line. |
| 2172 | if options.private: |
| 2173 | logging.warn('rietveld.cc is ignored since private flag is specified. ' |
| 2174 | 'You need to review and add them manually if necessary.') |
| 2175 | cc = self.GetCCListWithoutDefault() |
| 2176 | else: |
| 2177 | cc = self.GetCCList() |
| 2178 | cc = ','.join(filter(None, (cc, ','.join(options.cc)))) |
bradnelson | d975b30 | 2016-10-23 12:20:23 -0700 | [diff] [blame] | 2179 | if change_desc.get_cced(): |
| 2180 | cc = ','.join(filter(None, (cc, ','.join(change_desc.get_cced())))) |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2181 | if cc: |
| 2182 | upload_args.extend(['--cc', cc]) |
| 2183 | |
| 2184 | if options.private or settings.GetDefaultPrivateFlag() == "True": |
| 2185 | upload_args.append('--private') |
| 2186 | |
| 2187 | upload_args.extend(['--git_similarity', str(options.similarity)]) |
| 2188 | if not options.find_copies: |
| 2189 | upload_args.extend(['--git_no_find_copies']) |
| 2190 | |
| 2191 | # Include the upstream repo's URL in the change -- this is useful for |
| 2192 | # projects that have their source spread across multiple repos. |
| 2193 | remote_url = self.GetGitBaseUrlFromConfig() |
| 2194 | if not remote_url: |
| 2195 | if settings.GetIsGitSvn(): |
| 2196 | remote_url = self.GetGitSvnRemoteUrl() |
| 2197 | else: |
| 2198 | if self.GetRemoteUrl() and '/' in self.GetUpstreamBranch(): |
| 2199 | remote_url = '%s@%s' % (self.GetRemoteUrl(), |
| 2200 | self.GetUpstreamBranch().split('/')[-1]) |
| 2201 | if remote_url: |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2202 | remote, remote_branch = self.GetRemoteBranch() |
| 2203 | target_ref = GetTargetRef(remote, remote_branch, options.target_branch, |
| 2204 | settings.GetPendingRefPrefix()) |
| 2205 | if target_ref: |
| 2206 | upload_args.extend(['--target_ref', target_ref]) |
| 2207 | |
| 2208 | # Look for dependent patchsets. See crbug.com/480453 for more details. |
| 2209 | remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch()) |
| 2210 | upstream_branch = ShortBranchName(upstream_branch) |
| 2211 | if remote is '.': |
| 2212 | # A local branch is being tracked. |
clemensh@chromium.org | cbd7dc3 | 2016-05-31 10:33:50 +0000 | [diff] [blame] | 2213 | local_branch = upstream_branch |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2214 | if settings.GetIsSkipDependencyUpload(local_branch): |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 2215 | print() |
| 2216 | print('Skipping dependency patchset upload because git config ' |
| 2217 | 'branch.%s.skip-deps-uploads is set to True.' % local_branch) |
| 2218 | print() |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2219 | else: |
| 2220 | auth_config = auth.extract_auth_config_from_options(options) |
clemensh@chromium.org | cbd7dc3 | 2016-05-31 10:33:50 +0000 | [diff] [blame] | 2221 | branch_cl = Changelist(branchref='refs/heads/'+local_branch, |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2222 | auth_config=auth_config) |
| 2223 | branch_cl_issue_url = branch_cl.GetIssueURL() |
| 2224 | branch_cl_issue = branch_cl.GetIssue() |
| 2225 | branch_cl_patchset = branch_cl.GetPatchset() |
| 2226 | if branch_cl_issue_url and branch_cl_issue and branch_cl_patchset: |
| 2227 | upload_args.extend( |
| 2228 | ['--depends_on_patchset', '%s:%s' % ( |
| 2229 | branch_cl_issue, branch_cl_patchset)]) |
tandrii@chromium.org | 9e6c3a5 | 2016-04-12 14:13:08 +0000 | [diff] [blame] | 2230 | print( |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2231 | '\n' |
| 2232 | 'The current branch (%s) is tracking a local branch (%s) with ' |
| 2233 | 'an associated CL.\n' |
| 2234 | 'Adding %s/#ps%s as a dependency patchset.\n' |
| 2235 | '\n' % (self.GetBranch(), local_branch, branch_cl_issue_url, |
| 2236 | branch_cl_patchset)) |
| 2237 | |
| 2238 | project = settings.GetProject() |
| 2239 | if project: |
| 2240 | upload_args.extend(['--project', project]) |
| 2241 | |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2242 | try: |
| 2243 | upload_args = ['upload'] + upload_args + args |
| 2244 | logging.info('upload.RealMain(%s)', upload_args) |
| 2245 | issue, patchset = upload.RealMain(upload_args) |
| 2246 | issue = int(issue) |
| 2247 | patchset = int(patchset) |
| 2248 | except KeyboardInterrupt: |
| 2249 | sys.exit(1) |
| 2250 | except: |
| 2251 | # If we got an exception after the user typed a description for their |
| 2252 | # change, back up the description before re-raising. |
| 2253 | if change_desc: |
| 2254 | backup_path = os.path.expanduser(DESCRIPTION_BACKUP_FILE) |
| 2255 | print('\nGot exception while uploading -- saving description to %s\n' % |
| 2256 | backup_path) |
| 2257 | backup_file = open(backup_path, 'w') |
| 2258 | backup_file.write(change_desc.description) |
| 2259 | backup_file.close() |
| 2260 | raise |
| 2261 | |
| 2262 | if not self.GetIssue(): |
| 2263 | self.SetIssue(issue) |
| 2264 | self.SetPatchset(patchset) |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2265 | return 0 |
| 2266 | |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 2267 | |
| 2268 | class _GerritChangelistImpl(_ChangelistCodereviewBase): |
| 2269 | def __init__(self, changelist, auth_config=None): |
| 2270 | # auth_config is Rietveld thing, kept here to preserve interface only. |
| 2271 | super(_GerritChangelistImpl, self).__init__(changelist) |
| 2272 | self._change_id = None |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 2273 | # Lazily cached values. |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 2274 | self._gerrit_server = None # e.g. https://chromium-review.googlesource.com |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 2275 | self._gerrit_host = None # e.g. chromium-review.googlesource.com |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 2276 | |
| 2277 | def _GetGerritHost(self): |
| 2278 | # Lazy load of configs. |
| 2279 | self.GetCodereviewServer() |
tandrii | e32e3ea | 2016-06-22 02:52:48 -0700 | [diff] [blame] | 2280 | if self._gerrit_host and '.' not in self._gerrit_host: |
| 2281 | # Abbreviated domain like "chromium" instead of chromium.googlesource.com. |
| 2282 | # This happens for internal stuff http://crbug.com/614312. |
| 2283 | parsed = urlparse.urlparse(self.GetRemoteUrl()) |
| 2284 | if parsed.scheme == 'sso': |
| 2285 | print('WARNING: using non https URLs for remote is likely broken\n' |
| 2286 | ' Your current remote is: %s' % self.GetRemoteUrl()) |
| 2287 | self._gerrit_host = '%s.googlesource.com' % self._gerrit_host |
| 2288 | self._gerrit_server = 'https://%s' % self._gerrit_host |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 2289 | return self._gerrit_host |
| 2290 | |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 2291 | def _GetGitHost(self): |
| 2292 | """Returns git host to be used when uploading change to Gerrit.""" |
| 2293 | return urlparse.urlparse(self.GetRemoteUrl()).netloc |
| 2294 | |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 2295 | def GetCodereviewServer(self): |
| 2296 | if not self._gerrit_server: |
| 2297 | # If we're on a branch then get the server potentially associated |
| 2298 | # with that branch. |
| 2299 | if self.GetIssue(): |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 2300 | self._gerrit_server = self._GitGetBranchConfigValue( |
| 2301 | self.CodereviewServerConfigKey()) |
| 2302 | if self._gerrit_server: |
| 2303 | self._gerrit_host = urlparse.urlparse(self._gerrit_server).netloc |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 2304 | if not self._gerrit_server: |
| 2305 | # We assume repo to be hosted on Gerrit, and hence Gerrit server |
| 2306 | # has "-review" suffix for lowest level subdomain. |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 2307 | parts = self._GetGitHost().split('.') |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 2308 | parts[0] = parts[0] + '-review' |
| 2309 | self._gerrit_host = '.'.join(parts) |
| 2310 | self._gerrit_server = 'https://%s' % self._gerrit_host |
| 2311 | return self._gerrit_server |
| 2312 | |
tandrii@chromium.org | 5df290f | 2016-04-11 16:12:29 +0000 | [diff] [blame] | 2313 | @classmethod |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 2314 | def IssueConfigKey(cls): |
tandrii@chromium.org | 5df290f | 2016-04-11 16:12:29 +0000 | [diff] [blame] | 2315 | return 'gerritissue' |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 2316 | |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 2317 | @classmethod |
| 2318 | def PatchsetConfigKey(cls): |
| 2319 | return 'gerritpatchset' |
| 2320 | |
| 2321 | @classmethod |
| 2322 | def CodereviewServerConfigKey(cls): |
| 2323 | return 'gerritserver' |
| 2324 | |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 2325 | def EnsureAuthenticated(self, force): |
tandrii@chromium.org | 9e6c3a5 | 2016-04-12 14:13:08 +0000 | [diff] [blame] | 2326 | """Best effort check that user is authenticated with Gerrit server.""" |
tandrii@chromium.org | 2825353 | 2016-04-14 13:46:56 +0000 | [diff] [blame] | 2327 | if settings.GetGerritSkipEnsureAuthenticated(): |
| 2328 | # For projects with unusual authentication schemes. |
| 2329 | # See http://crbug.com/603378. |
| 2330 | return |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 2331 | # Lazy-loader to identify Gerrit and Git hosts. |
| 2332 | if gerrit_util.GceAuthenticator.is_gce(): |
| 2333 | return |
| 2334 | self.GetCodereviewServer() |
| 2335 | git_host = self._GetGitHost() |
| 2336 | assert self._gerrit_server and self._gerrit_host |
| 2337 | cookie_auth = gerrit_util.CookiesAuthenticator() |
| 2338 | |
| 2339 | gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host) |
| 2340 | git_auth = cookie_auth.get_auth_header(git_host) |
| 2341 | if gerrit_auth and git_auth: |
| 2342 | if gerrit_auth == git_auth: |
| 2343 | return |
| 2344 | print(( |
| 2345 | 'WARNING: you have different credentials for Gerrit and git hosts.\n' |
| 2346 | ' Check your %s or %s file for credentials of hosts:\n' |
| 2347 | ' %s\n' |
| 2348 | ' %s\n' |
| 2349 | ' %s') % |
| 2350 | (cookie_auth.get_gitcookies_path(), cookie_auth.get_netrc_path(), |
| 2351 | git_host, self._gerrit_host, |
| 2352 | cookie_auth.get_new_password_message(git_host))) |
| 2353 | if not force: |
| 2354 | ask_for_data('If you know what you are doing, press Enter to continue, ' |
| 2355 | 'Ctrl+C to abort.') |
| 2356 | return |
| 2357 | else: |
| 2358 | missing = ( |
| 2359 | [] if gerrit_auth else [self._gerrit_host] + |
| 2360 | [] if git_auth else [git_host]) |
| 2361 | DieWithError('Credentials for the following hosts are required:\n' |
| 2362 | ' %s\n' |
| 2363 | 'These are read from %s (or legacy %s)\n' |
| 2364 | '%s' % ( |
| 2365 | '\n '.join(missing), |
| 2366 | cookie_auth.get_gitcookies_path(), |
| 2367 | cookie_auth.get_netrc_path(), |
| 2368 | cookie_auth.get_new_password_message(git_host))) |
| 2369 | |
tandrii@chromium.org | 9b7fd71 | 2016-06-01 13:45:20 +0000 | [diff] [blame] | 2370 | def _PostUnsetIssueProperties(self): |
| 2371 | """Which branch-specific properties to erase when unsetting issue.""" |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 2372 | return ['gerritsquashhash'] |
tandrii@chromium.org | 9b7fd71 | 2016-06-01 13:45:20 +0000 | [diff] [blame] | 2373 | |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 2374 | def GetRieveldObjForPresubmit(self): |
| 2375 | class ThisIsNotRietveldIssue(object): |
| 2376 | def __nonzero__(self): |
| 2377 | # This is a hack to make presubmit_support think that rietveld is not |
| 2378 | # defined, yet still ensure that calls directly result in a decent |
| 2379 | # exception message below. |
| 2380 | return False |
| 2381 | |
| 2382 | def __getattr__(self, attr): |
| 2383 | print( |
| 2384 | 'You aren\'t using Rietveld at the moment, but Gerrit.\n' |
| 2385 | 'Using Rietveld in your PRESUBMIT scripts won\'t work.\n' |
| 2386 | 'Please, either change your PRESUBIT to not use rietveld_obj.%s,\n' |
| 2387 | 'or use Rietveld for codereview.\n' |
| 2388 | 'See also http://crbug.com/579160.' % attr) |
| 2389 | raise NotImplementedError() |
| 2390 | return ThisIsNotRietveldIssue() |
| 2391 | |
tandrii@chromium.org | 37b07a7 | 2016-04-29 16:42:28 +0000 | [diff] [blame] | 2392 | def GetGerritObjForPresubmit(self): |
| 2393 | return presubmit_support.GerritAccessor(self._GetGerritHost()) |
| 2394 | |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 2395 | def GetStatus(self): |
tandrii@chromium.org | 013a280 | 2016-03-29 09:52:33 +0000 | [diff] [blame] | 2396 | """Apply a rough heuristic to give a simple summary of an issue's review |
| 2397 | or CQ status, assuming adherence to a common workflow. |
| 2398 | |
| 2399 | Returns None if no issue for this branch, or one of the following keywords: |
| 2400 | * 'error' - error from review tool (including deleted issues) |
| 2401 | * 'unsent' - no reviewers added |
| 2402 | * 'waiting' - waiting for review |
| 2403 | * 'reply' - waiting for owner to reply to review |
tandrii | c2405f5 | 2016-10-10 08:13:15 -0700 | [diff] [blame] | 2404 | * 'not lgtm' - Code-Review disaproval from at least one valid reviewer |
| 2405 | * 'lgtm' - Code-Review approval from at least one valid reviewer |
tandrii@chromium.org | 013a280 | 2016-03-29 09:52:33 +0000 | [diff] [blame] | 2406 | * 'commit' - in the commit queue |
| 2407 | * 'closed' - abandoned |
| 2408 | """ |
| 2409 | if not self.GetIssue(): |
| 2410 | return None |
| 2411 | |
| 2412 | try: |
| 2413 | data = self._GetChangeDetail(['DETAILED_LABELS', 'CURRENT_REVISION']) |
tandrii | c2405f5 | 2016-10-10 08:13:15 -0700 | [diff] [blame] | 2414 | except (httplib.HTTPException, GerritIssueNotExists): |
tandrii@chromium.org | 013a280 | 2016-03-29 09:52:33 +0000 | [diff] [blame] | 2415 | return 'error' |
| 2416 | |
tandrii@chromium.org | 5e1bf38 | 2016-05-17 08:43:24 +0000 | [diff] [blame] | 2417 | if data['status'] in ('ABANDONED', 'MERGED'): |
tandrii@chromium.org | 013a280 | 2016-03-29 09:52:33 +0000 | [diff] [blame] | 2418 | return 'closed' |
| 2419 | |
| 2420 | cq_label = data['labels'].get('Commit-Queue', {}) |
| 2421 | if cq_label: |
rmistry | c9ebbd2 | 2016-10-14 12:35:54 -0700 | [diff] [blame] | 2422 | votes = cq_label.get('all', []) |
| 2423 | highest_vote = 0 |
| 2424 | for v in votes: |
| 2425 | highest_vote = max(highest_vote, v.get('value', 0)) |
| 2426 | vote_value = str(highest_vote) |
| 2427 | if vote_value != '0': |
| 2428 | # Add a '+' if the value is not 0 to match the values in the label. |
| 2429 | # The cq_label does not have negatives. |
| 2430 | vote_value = '+' + vote_value |
tandrii@chromium.org | 013a280 | 2016-03-29 09:52:33 +0000 | [diff] [blame] | 2431 | vote_text = cq_label.get('values', {}).get(vote_value, '') |
| 2432 | if vote_text.lower() == 'commit': |
| 2433 | return 'commit' |
| 2434 | |
| 2435 | lgtm_label = data['labels'].get('Code-Review', {}) |
| 2436 | if lgtm_label: |
| 2437 | if 'rejected' in lgtm_label: |
| 2438 | return 'not lgtm' |
| 2439 | if 'approved' in lgtm_label: |
| 2440 | return 'lgtm' |
| 2441 | |
| 2442 | if not data.get('reviewers', {}).get('REVIEWER', []): |
| 2443 | return 'unsent' |
| 2444 | |
| 2445 | messages = data.get('messages', []) |
| 2446 | if messages: |
| 2447 | owner = data['owner'].get('_account_id') |
| 2448 | last_message_author = messages[-1].get('author', {}).get('_account_id') |
| 2449 | if owner != last_message_author: |
| 2450 | # Some reply from non-owner. |
| 2451 | return 'reply' |
| 2452 | |
| 2453 | return 'waiting' |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 2454 | |
| 2455 | def GetMostRecentPatchset(self): |
tandrii@chromium.org | 013a280 | 2016-03-29 09:52:33 +0000 | [diff] [blame] | 2456 | data = self._GetChangeDetail(['CURRENT_REVISION']) |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 2457 | return data['revisions'][data['current_revision']]['_number'] |
| 2458 | |
| 2459 | def FetchDescription(self): |
tandrii@chromium.org | 2d3da63 | 2016-04-25 19:23:27 +0000 | [diff] [blame] | 2460 | data = self._GetChangeDetail(['CURRENT_REVISION']) |
| 2461 | current_rev = data['current_revision'] |
| 2462 | url = data['revisions'][current_rev]['fetch']['http']['url'] |
| 2463 | return gerrit_util.GetChangeDescriptionFromGitiles(url, current_rev) |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 2464 | |
dsansome | e2d6fd9 | 2016-09-08 00:10:47 -0700 | [diff] [blame] | 2465 | def UpdateDescriptionRemote(self, description, force=False): |
| 2466 | if gerrit_util.HasPendingChangeEdit(self._GetGerritHost(), self.GetIssue()): |
| 2467 | if not force: |
| 2468 | ask_for_data( |
| 2469 | 'The description cannot be modified while the issue has a pending ' |
| 2470 | 'unpublished edit. Either publish the edit in the Gerrit web UI ' |
| 2471 | 'or delete it.\n\n' |
| 2472 | 'Press Enter to delete the unpublished edit, Ctrl+C to abort.') |
| 2473 | |
| 2474 | gerrit_util.DeletePendingChangeEdit(self._GetGerritHost(), |
| 2475 | self.GetIssue()) |
scottmg@chromium.org | 6d1266e | 2016-04-26 11:12:26 +0000 | [diff] [blame] | 2476 | gerrit_util.SetCommitMessage(self._GetGerritHost(), self.GetIssue(), |
| 2477 | description) |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 2478 | |
| 2479 | def CloseIssue(self): |
| 2480 | gerrit_util.AbandonChange(self._GetGerritHost(), self.GetIssue(), msg='') |
| 2481 | |
tandrii@chromium.org | 600b492 | 2016-04-26 10:57:52 +0000 | [diff] [blame] | 2482 | def GetApprovingReviewers(self): |
| 2483 | """Returns a list of reviewers approving the change. |
| 2484 | |
| 2485 | Note: not necessarily committers. |
| 2486 | """ |
| 2487 | raise NotImplementedError() |
| 2488 | |
tandrii@chromium.org | d68b62b | 2016-03-31 16:09:29 +0000 | [diff] [blame] | 2489 | def SubmitIssue(self, wait_for_merge=True): |
| 2490 | gerrit_util.SubmitChange(self._GetGerritHost(), self.GetIssue(), |
| 2491 | wait_for_merge=wait_for_merge) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 2492 | |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2493 | def _GetChangeDetail(self, options=None, issue=None): |
| 2494 | options = options or [] |
| 2495 | issue = issue or self.GetIssue() |
tandrii | c2405f5 | 2016-10-10 08:13:15 -0700 | [diff] [blame] | 2496 | assert issue, 'issue is required to query Gerrit' |
Andrii Shyshkalov | c6c8b4c | 2016-11-09 20:51:20 +0100 | [diff] [blame] | 2497 | try: |
| 2498 | data = gerrit_util.GetChangeDetail(self._GetGerritHost(), str(issue), |
| 2499 | options, ignore_404=False) |
| 2500 | except gerrit_util.GerritError as e: |
| 2501 | if e.http_status == 404: |
| 2502 | raise GerritIssueNotExists(issue, self.GetCodereviewServer()) |
| 2503 | raise |
tandrii | c2405f5 | 2016-10-10 08:13:15 -0700 | [diff] [blame] | 2504 | return data |
tandrii@chromium.org | 013a280 | 2016-03-29 09:52:33 +0000 | [diff] [blame] | 2505 | |
agable | 32978d9 | 2016-11-01 12:55:02 -0700 | [diff] [blame] | 2506 | def _GetChangeCommit(self, issue=None): |
| 2507 | issue = issue or self.GetIssue() |
| 2508 | assert issue, 'issue is required to query Gerrit' |
| 2509 | data = gerrit_util.GetChangeCommit(self._GetGerritHost(), str(issue)) |
| 2510 | if not data: |
| 2511 | raise GerritIssueNotExists(issue, self.GetCodereviewServer()) |
| 2512 | return data |
| 2513 | |
tandrii@chromium.org | d68b62b | 2016-03-31 16:09:29 +0000 | [diff] [blame] | 2514 | def CMDLand(self, force, bypass_hooks, verbose): |
| 2515 | if git_common.is_dirty_git_tree('land'): |
| 2516 | return 1 |
tandrii | d60367b | 2016-06-22 05:25:12 -0700 | [diff] [blame] | 2517 | detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS']) |
| 2518 | if u'Commit-Queue' in detail.get('labels', {}): |
| 2519 | if not force: |
| 2520 | ask_for_data('\nIt seems this repository has a Commit Queue, ' |
| 2521 | 'which can test and land changes for you. ' |
| 2522 | 'Are you sure you wish to bypass it?\n' |
| 2523 | 'Press Enter to continue, Ctrl+C to abort.') |
| 2524 | |
tandrii@chromium.org | d68b62b | 2016-03-31 16:09:29 +0000 | [diff] [blame] | 2525 | differs = True |
tandrii | c4344b5 | 2016-08-29 06:04:54 -0700 | [diff] [blame] | 2526 | last_upload = self._GitGetBranchConfigValue('gerritsquashhash') |
tandrii@chromium.org | d68b62b | 2016-03-31 16:09:29 +0000 | [diff] [blame] | 2527 | # Note: git diff outputs nothing if there is no diff. |
| 2528 | if not last_upload or RunGit(['diff', last_upload]).strip(): |
| 2529 | print('WARNING: some changes from local branch haven\'t been uploaded') |
| 2530 | else: |
tandrii@chromium.org | d68b62b | 2016-03-31 16:09:29 +0000 | [diff] [blame] | 2531 | if detail['current_revision'] == last_upload: |
| 2532 | differs = False |
| 2533 | else: |
| 2534 | print('WARNING: local branch contents differ from latest uploaded ' |
| 2535 | 'patchset') |
| 2536 | if differs: |
| 2537 | if not force: |
| 2538 | ask_for_data( |
| 2539 | 'Do you want to submit latest Gerrit patchset and bypass hooks?') |
| 2540 | print('WARNING: bypassing hooks and submitting latest uploaded patchset') |
| 2541 | elif not bypass_hooks: |
| 2542 | hook_results = self.RunHook( |
| 2543 | committing=True, |
| 2544 | may_prompt=not force, |
| 2545 | verbose=verbose, |
| 2546 | change=self.GetChange(self.GetCommonAncestorWithUpstream(), None)) |
| 2547 | if not hook_results.should_continue(): |
| 2548 | return 1 |
| 2549 | |
| 2550 | self.SubmitIssue(wait_for_merge=True) |
| 2551 | print('Issue %s has been submitted.' % self.GetIssueURL()) |
agable | 32978d9 | 2016-11-01 12:55:02 -0700 | [diff] [blame] | 2552 | links = self._GetChangeCommit().get('web_links', []) |
| 2553 | for link in links: |
| 2554 | if link.get('name') == 'gerrit' and link.get('url'): |
| 2555 | print('Landed as %s' % link.get('url')) |
| 2556 | break |
tandrii@chromium.org | d68b62b | 2016-03-31 16:09:29 +0000 | [diff] [blame] | 2557 | return 0 |
| 2558 | |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 2559 | def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit, |
| 2560 | directory): |
| 2561 | assert not reject |
| 2562 | assert not nocommit |
| 2563 | assert not directory |
| 2564 | assert parsed_issue_arg.valid |
| 2565 | |
| 2566 | self._changelist.issue = parsed_issue_arg.issue |
| 2567 | |
| 2568 | if parsed_issue_arg.hostname: |
| 2569 | self._gerrit_host = parsed_issue_arg.hostname |
| 2570 | self._gerrit_server = 'https://%s' % self._gerrit_host |
| 2571 | |
tandrii | c2405f5 | 2016-10-10 08:13:15 -0700 | [diff] [blame] | 2572 | try: |
| 2573 | detail = self._GetChangeDetail(['ALL_REVISIONS']) |
| 2574 | except GerritIssueNotExists as e: |
| 2575 | DieWithError(str(e)) |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 2576 | |
| 2577 | if not parsed_issue_arg.patchset: |
| 2578 | # Use current revision by default. |
| 2579 | revision_info = detail['revisions'][detail['current_revision']] |
| 2580 | patchset = int(revision_info['_number']) |
| 2581 | else: |
| 2582 | patchset = parsed_issue_arg.patchset |
| 2583 | for revision_info in detail['revisions'].itervalues(): |
| 2584 | if int(revision_info['_number']) == parsed_issue_arg.patchset: |
| 2585 | break |
| 2586 | else: |
| 2587 | DieWithError('Couldn\'t find patchset %i in issue %i' % |
| 2588 | (parsed_issue_arg.patchset, self.GetIssue())) |
| 2589 | |
| 2590 | fetch_info = revision_info['fetch']['http'] |
| 2591 | RunGit(['fetch', fetch_info['url'], fetch_info['ref']]) |
| 2592 | RunGit(['cherry-pick', 'FETCH_HEAD']) |
| 2593 | self.SetIssue(self.GetIssue()) |
| 2594 | self.SetPatchset(patchset) |
| 2595 | print('Committed patch for issue %i pathset %i locally' % |
| 2596 | (self.GetIssue(), self.GetPatchset())) |
| 2597 | return 0 |
| 2598 | |
| 2599 | @staticmethod |
| 2600 | def ParseIssueURL(parsed_url): |
| 2601 | if not parsed_url.scheme or not parsed_url.scheme.startswith('http'): |
| 2602 | return None |
| 2603 | # Gerrit's new UI is https://domain/c/<issue_number>[/[patchset]] |
| 2604 | # But current GWT UI is https://domain/#/c/<issue_number>[/[patchset]] |
| 2605 | # Short urls like https://domain/<issue_number> can be used, but don't allow |
| 2606 | # specifying the patchset (you'd 404), but we allow that here. |
| 2607 | if parsed_url.path == '/': |
| 2608 | part = parsed_url.fragment |
| 2609 | else: |
| 2610 | part = parsed_url.path |
| 2611 | match = re.match('(/c)?/(\d+)(/(\d+)?/?)?$', part) |
| 2612 | if match: |
| 2613 | return _ParsedIssueNumberArgument( |
| 2614 | issue=int(match.group(2)), |
| 2615 | patchset=int(match.group(4)) if match.group(4) else None, |
| 2616 | hostname=parsed_url.netloc) |
| 2617 | return None |
| 2618 | |
tandrii | 16e0b4e | 2016-06-07 10:34:28 -0700 | [diff] [blame] | 2619 | def _GerritCommitMsgHookCheck(self, offer_removal): |
| 2620 | hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg') |
| 2621 | if not os.path.exists(hook): |
| 2622 | return |
| 2623 | # Crude attempt to distinguish Gerrit Codereview hook from potentially |
| 2624 | # custom developer made one. |
| 2625 | data = gclient_utils.FileRead(hook) |
| 2626 | if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data): |
| 2627 | return |
| 2628 | print('Warning: you have Gerrit commit-msg hook installed.\n' |
qyearsley | 12fa6ff | 2016-08-24 09:18:40 -0700 | [diff] [blame] | 2629 | 'It is not necessary for uploading with git cl in squash mode, ' |
tandrii | 16e0b4e | 2016-06-07 10:34:28 -0700 | [diff] [blame] | 2630 | 'and may interfere with it in subtle ways.\n' |
| 2631 | 'We recommend you remove the commit-msg hook.') |
| 2632 | if offer_removal: |
| 2633 | reply = ask_for_data('Do you want to remove it now? [Yes/No]') |
| 2634 | if reply.lower().startswith('y'): |
| 2635 | gclient_utils.rm_file_or_tree(hook) |
| 2636 | print('Gerrit commit-msg hook removed.') |
| 2637 | else: |
| 2638 | print('OK, will keep Gerrit commit-msg hook in place.') |
| 2639 | |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2640 | def CMDUploadChange(self, options, args, change): |
| 2641 | """Upload the current branch to Gerrit.""" |
tandrii@chromium.org | 9e6c3a5 | 2016-04-12 14:13:08 +0000 | [diff] [blame] | 2642 | if options.squash and options.no_squash: |
| 2643 | DieWithError('Can only use one of --squash or --no-squash') |
tandrii | a60502f | 2016-06-20 02:01:53 -0700 | [diff] [blame] | 2644 | |
| 2645 | if not options.squash and not options.no_squash: |
| 2646 | # Load default for user, repo, squash=true, in this order. |
| 2647 | options.squash = settings.GetSquashGerritUploads() |
| 2648 | elif options.no_squash: |
| 2649 | options.squash = False |
tandrii | 26f3e4e | 2016-06-10 08:37:04 -0700 | [diff] [blame] | 2650 | |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2651 | # We assume the remote called "origin" is the one we want. |
| 2652 | # It is probably not worthwhile to support different workflows. |
| 2653 | gerrit_remote = 'origin' |
| 2654 | |
| 2655 | remote, remote_branch = self.GetRemoteBranch() |
| 2656 | branch = GetTargetRef(remote, remote_branch, options.target_branch, |
| 2657 | pending_prefix='') |
| 2658 | |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2659 | if options.squash: |
tandrii | 16e0b4e | 2016-06-07 10:34:28 -0700 | [diff] [blame] | 2660 | self._GerritCommitMsgHookCheck(offer_removal=not options.force) |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2661 | if self.GetIssue(): |
| 2662 | # Try to get the message from a previous upload. |
| 2663 | message = self.GetDescription() |
| 2664 | if not message: |
| 2665 | DieWithError( |
| 2666 | 'failed to fetch description from current Gerrit issue %d\n' |
| 2667 | '%s' % (self.GetIssue(), self.GetIssueURL())) |
| 2668 | change_id = self._GetChangeDetail()['change_id'] |
| 2669 | while True: |
| 2670 | footer_change_ids = git_footers.get_footer_change_id(message) |
| 2671 | if footer_change_ids == [change_id]: |
| 2672 | break |
| 2673 | if not footer_change_ids: |
| 2674 | message = git_footers.add_footer_change_id(message, change_id) |
| 2675 | print('WARNING: appended missing Change-Id to issue description') |
| 2676 | continue |
| 2677 | # There is already a valid footer but with different or several ids. |
| 2678 | # Doing this automatically is non-trivial as we don't want to lose |
| 2679 | # existing other footers, yet we want to append just 1 desired |
| 2680 | # Change-Id. Thus, just create a new footer, but let user verify the |
| 2681 | # new description. |
| 2682 | message = '%s\n\nChange-Id: %s' % (message, change_id) |
| 2683 | print( |
| 2684 | 'WARNING: issue %s has Change-Id footer(s):\n' |
| 2685 | ' %s\n' |
| 2686 | 'but issue has Change-Id %s, according to Gerrit.\n' |
| 2687 | 'Please, check the proposed correction to the description, ' |
| 2688 | 'and edit it if necessary but keep the "Change-Id: %s" footer\n' |
| 2689 | % (self.GetIssue(), '\n '.join(footer_change_ids), change_id, |
| 2690 | change_id)) |
| 2691 | ask_for_data('Press enter to edit now, Ctrl+C to abort') |
| 2692 | if not options.force: |
| 2693 | change_desc = ChangeDescription(message) |
tandrii | f9aefb7 | 2016-07-01 09:06:51 -0700 | [diff] [blame] | 2694 | change_desc.prompt(bug=options.bug) |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2695 | message = change_desc.description |
| 2696 | if not message: |
| 2697 | DieWithError("Description is empty. Aborting...") |
| 2698 | # Continue the while loop. |
| 2699 | # Sanity check of this code - we should end up with proper message |
| 2700 | # footer. |
| 2701 | assert [change_id] == git_footers.get_footer_change_id(message) |
| 2702 | change_desc = ChangeDescription(message) |
| 2703 | else: |
| 2704 | change_desc = ChangeDescription( |
| 2705 | options.message or CreateDescriptionFromLog(args)) |
| 2706 | if not options.force: |
tandrii | f9aefb7 | 2016-07-01 09:06:51 -0700 | [diff] [blame] | 2707 | change_desc.prompt(bug=options.bug) |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2708 | if not change_desc.description: |
| 2709 | DieWithError("Description is empty. Aborting...") |
| 2710 | message = change_desc.description |
| 2711 | change_ids = git_footers.get_footer_change_id(message) |
| 2712 | if len(change_ids) > 1: |
| 2713 | DieWithError('too many Change-Id footers, at most 1 allowed.') |
| 2714 | if not change_ids: |
| 2715 | # Generate the Change-Id automatically. |
| 2716 | message = git_footers.add_footer_change_id( |
| 2717 | message, GenerateGerritChangeId(message)) |
| 2718 | change_desc.set_description(message) |
| 2719 | change_ids = git_footers.get_footer_change_id(message) |
| 2720 | assert len(change_ids) == 1 |
| 2721 | change_id = change_ids[0] |
| 2722 | |
| 2723 | remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch()) |
| 2724 | if remote is '.': |
| 2725 | # If our upstream branch is local, we base our squashed commit on its |
| 2726 | # squashed version. |
| 2727 | upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch) |
| 2728 | # Check the squashed hash of the parent. |
| 2729 | parent = RunGit(['config', |
| 2730 | 'branch.%s.gerritsquashhash' % upstream_branch_name], |
| 2731 | error_ok=True).strip() |
| 2732 | # Verify that the upstream branch has been uploaded too, otherwise |
| 2733 | # Gerrit will create additional CLs when uploading. |
| 2734 | if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) != |
| 2735 | RunGitSilent(['rev-parse', parent + ':'])): |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2736 | DieWithError( |
| 2737 | 'Upload upstream branch %s first.\n' |
tandrii | 2bdadf1 | 2016-07-12 12:27:54 -0700 | [diff] [blame] | 2738 | 'Note: maybe you\'ve uploaded it with --no-squash. ' |
| 2739 | 'If so, then re-upload it with:\n' |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2740 | ' git cl upload --squash\n' % upstream_branch_name) |
| 2741 | else: |
| 2742 | parent = self.GetCommonAncestorWithUpstream() |
| 2743 | |
| 2744 | tree = RunGit(['rev-parse', 'HEAD:']).strip() |
| 2745 | ref_to_push = RunGit(['commit-tree', tree, '-p', parent, |
| 2746 | '-m', message]).strip() |
| 2747 | else: |
| 2748 | change_desc = ChangeDescription( |
| 2749 | options.message or CreateDescriptionFromLog(args)) |
| 2750 | if not change_desc.description: |
| 2751 | DieWithError("Description is empty. Aborting...") |
| 2752 | |
| 2753 | if not git_footers.get_footer_change_id(change_desc.description): |
| 2754 | DownloadGerritHook(False) |
tandrii@chromium.org | 8930b3d | 2016-04-13 14:47:02 +0000 | [diff] [blame] | 2755 | change_desc.set_description(self._AddChangeIdToCommitMessage(options, |
| 2756 | args)) |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2757 | ref_to_push = 'HEAD' |
| 2758 | parent = '%s/%s' % (gerrit_remote, branch) |
| 2759 | change_id = git_footers.get_footer_change_id(change_desc.description)[0] |
| 2760 | |
| 2761 | assert change_desc |
| 2762 | commits = RunGitSilent(['rev-list', '%s..%s' % (parent, |
| 2763 | ref_to_push)]).splitlines() |
| 2764 | if len(commits) > 1: |
| 2765 | print('WARNING: This will upload %d commits. Run the following command ' |
| 2766 | 'to see which commits will be uploaded: ' % len(commits)) |
| 2767 | print('git log %s..%s' % (parent, ref_to_push)) |
| 2768 | print('You can also use `git squash-branch` to squash these into a ' |
| 2769 | 'single commit.') |
| 2770 | ask_for_data('About to upload; enter to confirm.') |
| 2771 | |
| 2772 | if options.reviewers or options.tbr_owners: |
| 2773 | change_desc.update_reviewers(options.reviewers, options.tbr_owners, |
| 2774 | change) |
| 2775 | |
tandrii@chromium.org | bf766ba | 2016-04-13 12:51:23 +0000 | [diff] [blame] | 2776 | # Extra options that can be specified at push time. Doc: |
| 2777 | # https://gerrit-review.googlesource.com/Documentation/user-upload.html |
| 2778 | refspec_opts = [] |
tandrii | 99a72f2 | 2016-08-17 14:33:24 -0700 | [diff] [blame] | 2779 | if change_desc.get_reviewers(tbr_only=True): |
| 2780 | print('Adding self-LGTM (Code-Review +1) because of TBRs') |
| 2781 | refspec_opts.append('l=Code-Review+1') |
| 2782 | |
tandrii@chromium.org | bf766ba | 2016-04-13 12:51:23 +0000 | [diff] [blame] | 2783 | if options.title: |
tandrii | eefe832 | 2016-08-17 10:12:24 -0700 | [diff] [blame] | 2784 | if not re.match(r'^[\w ]+$', options.title): |
| 2785 | options.title = re.sub(r'[^\w ]', '', options.title) |
| 2786 | print('WARNING: Patchset title may only contain alphanumeric chars ' |
| 2787 | 'and spaces. Cleaned up title:\n%s' % options.title) |
| 2788 | if not options.force: |
| 2789 | ask_for_data('Press enter to continue, Ctrl+C to abort') |
tandrii@chromium.org | bf766ba | 2016-04-13 12:51:23 +0000 | [diff] [blame] | 2790 | # Per doc, spaces must be converted to underscores, and Gerrit will do the |
| 2791 | # reverse on its side. |
tandrii@chromium.org | bf766ba | 2016-04-13 12:51:23 +0000 | [diff] [blame] | 2792 | refspec_opts.append('m=' + options.title.replace(' ', '_')) |
| 2793 | |
tandrii@chromium.org | 8da4540 | 2016-05-24 23:11:03 +0000 | [diff] [blame] | 2794 | if options.send_mail: |
| 2795 | if not change_desc.get_reviewers(): |
| 2796 | DieWithError('Must specify reviewers to send email.') |
| 2797 | refspec_opts.append('notify=ALL') |
| 2798 | else: |
| 2799 | refspec_opts.append('notify=NONE') |
| 2800 | |
tandrii | 99a72f2 | 2016-08-17 14:33:24 -0700 | [diff] [blame] | 2801 | reviewers = change_desc.get_reviewers() |
| 2802 | if reviewers: |
| 2803 | refspec_opts.extend('r=' + email.strip() for email in reviewers) |
tandrii@chromium.org | 8acd833 | 2016-04-13 12:56:03 +0000 | [diff] [blame] | 2804 | |
agable | c678797 | 2016-09-09 16:13:34 -0700 | [diff] [blame] | 2805 | if options.private: |
| 2806 | refspec_opts.append('draft') |
| 2807 | |
rmistry | 9eadede | 2016-09-19 11:22:43 -0700 | [diff] [blame] | 2808 | if options.topic: |
| 2809 | # Documentation on Gerrit topics is here: |
| 2810 | # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic |
| 2811 | refspec_opts.append('topic=%s' % options.topic) |
| 2812 | |
tandrii@chromium.org | bf766ba | 2016-04-13 12:51:23 +0000 | [diff] [blame] | 2813 | refspec_suffix = '' |
| 2814 | if refspec_opts: |
| 2815 | refspec_suffix = '%' + ','.join(refspec_opts) |
| 2816 | assert ' ' not in refspec_suffix, ( |
| 2817 | 'spaces not allowed in refspec: "%s"' % refspec_suffix) |
tandrii@chromium.org | bf766ba | 2016-04-13 12:51:23 +0000 | [diff] [blame] | 2818 | refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix) |
tandrii@chromium.org | bf766ba | 2016-04-13 12:51:23 +0000 | [diff] [blame] | 2819 | |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2820 | push_stdout = gclient_utils.CheckCallAndFilter( |
tandrii@chromium.org | 8acd833 | 2016-04-13 12:56:03 +0000 | [diff] [blame] | 2821 | ['git', 'push', gerrit_remote, refspec], |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2822 | print_stdout=True, |
| 2823 | # Flush after every line: useful for seeing progress when running as |
| 2824 | # recipe. |
| 2825 | filter_fn=lambda _: sys.stdout.flush()) |
| 2826 | |
| 2827 | if options.squash: |
| 2828 | regex = re.compile(r'remote:\s+https?://[\w\-\.\/]*/(\d+)\s.*') |
| 2829 | change_numbers = [m.group(1) |
| 2830 | for m in map(regex.match, push_stdout.splitlines()) |
| 2831 | if m] |
| 2832 | if len(change_numbers) != 1: |
| 2833 | DieWithError( |
| 2834 | ('Created|Updated %d issues on Gerrit, but only 1 expected.\n' |
| 2835 | 'Change-Id: %s') % (len(change_numbers), change_id)) |
| 2836 | self.SetIssue(change_numbers[0]) |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 2837 | self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push) |
tandrii | 8818977 | 2016-09-29 04:29:57 -0700 | [diff] [blame] | 2838 | |
| 2839 | # Add cc's from the CC_LIST and --cc flag (if any). |
| 2840 | cc = self.GetCCList().split(',') |
| 2841 | if options.cc: |
| 2842 | cc.extend(options.cc) |
| 2843 | cc = filter(None, [email.strip() for email in cc]) |
bradnelson | d975b30 | 2016-10-23 12:20:23 -0700 | [diff] [blame] | 2844 | if change_desc.get_cced(): |
| 2845 | cc.extend(change_desc.get_cced()) |
tandrii | 8818977 | 2016-09-29 04:29:57 -0700 | [diff] [blame] | 2846 | if cc: |
Aaron Gable | df86e30 | 2016-11-08 10:48:03 -0800 | [diff] [blame] | 2847 | errors = gerrit_util.AddReviewers( |
tandrii | 8818977 | 2016-09-29 04:29:57 -0700 | [diff] [blame] | 2848 | self._GetGerritHost(), self.GetIssue(), cc, is_reviewer=False) |
Aaron Gable | df86e30 | 2016-11-08 10:48:03 -0800 | [diff] [blame] | 2849 | if errors: |
| 2850 | return 1 |
tandrii | 8818977 | 2016-09-29 04:29:57 -0700 | [diff] [blame] | 2851 | |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2852 | return 0 |
| 2853 | |
tandrii@chromium.org | 8930b3d | 2016-04-13 14:47:02 +0000 | [diff] [blame] | 2854 | def _AddChangeIdToCommitMessage(self, options, args): |
| 2855 | """Re-commits using the current message, assumes the commit hook is in |
| 2856 | place. |
| 2857 | """ |
| 2858 | log_desc = options.message or CreateDescriptionFromLog(args) |
| 2859 | git_command = ['commit', '--amend', '-m', log_desc] |
| 2860 | RunGit(git_command) |
| 2861 | new_log_desc = CreateDescriptionFromLog(args) |
| 2862 | if git_footers.get_footer_change_id(new_log_desc): |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 2863 | print('git-cl: Added Change-Id to commit message.') |
tandrii@chromium.org | 8930b3d | 2016-04-13 14:47:02 +0000 | [diff] [blame] | 2864 | return new_log_desc |
| 2865 | else: |
tandrii@chromium.org | b067ec5 | 2016-05-31 15:24:44 +0000 | [diff] [blame] | 2866 | DieWithError('ERROR: Gerrit commit-msg hook not installed.') |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2867 | |
tandrii@chromium.org | fa330e8 | 2016-04-13 17:09:52 +0000 | [diff] [blame] | 2868 | def SetCQState(self, new_state): |
| 2869 | """Sets the Commit-Queue label assuming canonical CQ config for Gerrit.""" |
tandrii@chromium.org | fa330e8 | 2016-04-13 17:09:52 +0000 | [diff] [blame] | 2870 | vote_map = { |
| 2871 | _CQState.NONE: 0, |
| 2872 | _CQState.DRY_RUN: 1, |
| 2873 | _CQState.COMMIT : 2, |
| 2874 | } |
| 2875 | gerrit_util.SetReview(self._GetGerritHost(), self.GetIssue(), |
| 2876 | labels={'Commit-Queue': vote_map[new_state]}) |
| 2877 | |
tandrii | e113dfd | 2016-10-11 10:20:12 -0700 | [diff] [blame] | 2878 | def CannotTriggerTryJobReason(self): |
tandrii | 8c5a353 | 2016-11-04 07:52:02 -0700 | [diff] [blame] | 2879 | try: |
| 2880 | data = self._GetChangeDetail() |
| 2881 | except GerritIssueNotExists: |
| 2882 | return 'Gerrit doesn\'t know about your issue %s' % self.GetIssue() |
| 2883 | |
| 2884 | if data['status'] in ('ABANDONED', 'MERGED'): |
| 2885 | return 'CL %s is closed' % self.GetIssue() |
| 2886 | |
| 2887 | def GetTryjobProperties(self, patchset=None): |
| 2888 | """Returns dictionary of properties to launch tryjob.""" |
| 2889 | data = self._GetChangeDetail(['ALL_REVISIONS']) |
| 2890 | patchset = int(patchset or self.GetPatchset()) |
| 2891 | assert patchset |
| 2892 | revision_data = None # Pylint wants it to be defined. |
| 2893 | for revision_data in data['revisions'].itervalues(): |
| 2894 | if int(revision_data['_number']) == patchset: |
| 2895 | break |
| 2896 | else: |
| 2897 | raise Exception('Patchset %d is not known in Gerrit issue %d' % |
| 2898 | (patchset, self.GetIssue())) |
| 2899 | return { |
| 2900 | 'patch_issue': self.GetIssue(), |
| 2901 | 'patch_set': patchset or self.GetPatchset(), |
| 2902 | 'patch_project': data['project'], |
| 2903 | 'patch_storage': 'gerrit', |
| 2904 | 'patch_ref': revision_data['fetch']['http']['ref'], |
| 2905 | 'patch_repository_url': revision_data['fetch']['http']['url'], |
| 2906 | 'patch_gerrit_url': self.GetCodereviewServer(), |
| 2907 | } |
tandrii | e113dfd | 2016-10-11 10:20:12 -0700 | [diff] [blame] | 2908 | |
tandrii | de281ae | 2016-10-12 06:02:30 -0700 | [diff] [blame] | 2909 | def GetIssueOwner(self): |
tandrii | 8c5a353 | 2016-11-04 07:52:02 -0700 | [diff] [blame] | 2910 | return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email'] |
tandrii | de281ae | 2016-10-12 06:02:30 -0700 | [diff] [blame] | 2911 | |
tandrii@chromium.org | d68b62b | 2016-03-31 16:09:29 +0000 | [diff] [blame] | 2912 | |
| 2913 | _CODEREVIEW_IMPLEMENTATIONS = { |
| 2914 | 'rietveld': _RietveldChangelistImpl, |
| 2915 | 'gerrit': _GerritChangelistImpl, |
| 2916 | } |
| 2917 | |
tandrii@chromium.org | 013a280 | 2016-03-29 09:52:33 +0000 | [diff] [blame] | 2918 | |
iannucci | e53c935 | 2016-08-17 14:40:40 -0700 | [diff] [blame] | 2919 | def _add_codereview_issue_select_options(parser, extra=""): |
| 2920 | _add_codereview_select_options(parser) |
| 2921 | |
| 2922 | text = ('Operate on this issue number instead of the current branch\'s ' |
| 2923 | 'implicit issue.') |
| 2924 | if extra: |
| 2925 | text += ' '+extra |
| 2926 | parser.add_option('-i', '--issue', type=int, help=text) |
| 2927 | |
| 2928 | |
| 2929 | def _process_codereview_issue_select_options(parser, options): |
| 2930 | _process_codereview_select_options(parser, options) |
| 2931 | if options.issue is not None and not options.forced_codereview: |
| 2932 | parser.error('--issue must be specified with either --rietveld or --gerrit') |
| 2933 | |
| 2934 | |
tandrii@chromium.org | dde6462 | 2016-04-13 17:11:21 +0000 | [diff] [blame] | 2935 | def _add_codereview_select_options(parser): |
| 2936 | """Appends --gerrit and --rietveld options to force specific codereview.""" |
| 2937 | parser.codereview_group = optparse.OptionGroup( |
| 2938 | parser, 'EXPERIMENTAL! Codereview override options') |
| 2939 | parser.add_option_group(parser.codereview_group) |
| 2940 | parser.codereview_group.add_option( |
| 2941 | '--gerrit', action='store_true', |
| 2942 | help='Force the use of Gerrit for codereview') |
| 2943 | parser.codereview_group.add_option( |
| 2944 | '--rietveld', action='store_true', |
| 2945 | help='Force the use of Rietveld for codereview') |
| 2946 | |
| 2947 | |
| 2948 | def _process_codereview_select_options(parser, options): |
| 2949 | if options.gerrit and options.rietveld: |
| 2950 | parser.error('Options --gerrit and --rietveld are mutually exclusive') |
| 2951 | options.forced_codereview = None |
| 2952 | if options.gerrit: |
| 2953 | options.forced_codereview = 'gerrit' |
| 2954 | elif options.rietveld: |
| 2955 | options.forced_codereview = 'rietveld' |
| 2956 | |
| 2957 | |
tandrii | f9aefb7 | 2016-07-01 09:06:51 -0700 | [diff] [blame] | 2958 | def _get_bug_line_values(default_project, bugs): |
| 2959 | """Given default_project and comma separated list of bugs, yields bug line |
| 2960 | values. |
| 2961 | |
| 2962 | Each bug can be either: |
| 2963 | * a number, which is combined with default_project |
| 2964 | * string, which is left as is. |
| 2965 | |
| 2966 | This function may produce more than one line, because bugdroid expects one |
| 2967 | project per line. |
| 2968 | |
| 2969 | >>> list(_get_bug_line_values('v8', '123,chromium:789')) |
| 2970 | ['v8:123', 'chromium:789'] |
| 2971 | """ |
| 2972 | default_bugs = [] |
| 2973 | others = [] |
| 2974 | for bug in bugs.split(','): |
| 2975 | bug = bug.strip() |
| 2976 | if bug: |
| 2977 | try: |
| 2978 | default_bugs.append(int(bug)) |
| 2979 | except ValueError: |
| 2980 | others.append(bug) |
| 2981 | |
| 2982 | if default_bugs: |
| 2983 | default_bugs = ','.join(map(str, default_bugs)) |
| 2984 | if default_project: |
| 2985 | yield '%s:%s' % (default_project, default_bugs) |
| 2986 | else: |
| 2987 | yield default_bugs |
| 2988 | for other in sorted(others): |
| 2989 | # Don't bother finding common prefixes, CLs with >2 bugs are very very rare. |
| 2990 | yield other |
| 2991 | |
| 2992 | |
dpranke@chromium.org | 20254fc | 2011-03-22 18:28:59 +0000 | [diff] [blame] | 2993 | class ChangeDescription(object): |
| 2994 | """Contains a parsed form of the change description.""" |
maruel@chromium.org | c6f60e8 | 2013-04-19 17:01:57 +0000 | [diff] [blame] | 2995 | R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$' |
bradnelson | d975b30 | 2016-10-23 12:20:23 -0700 | [diff] [blame] | 2996 | CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$' |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 2997 | BUG_LINE = r'^[ \t]*(BUG)[ \t]*=[ \t]*(.*?)[ \t]*$' |
dpranke@chromium.org | 20254fc | 2011-03-22 18:28:59 +0000 | [diff] [blame] | 2998 | |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 2999 | def __init__(self, description): |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 3000 | self._description_lines = (description or '').strip().splitlines() |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 3001 | |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 3002 | @property # www.logilab.org/ticket/89786 |
| 3003 | def description(self): # pylint: disable=E0202 |
| 3004 | return '\n'.join(self._description_lines) |
| 3005 | |
| 3006 | def set_description(self, desc): |
| 3007 | if isinstance(desc, basestring): |
| 3008 | lines = desc.splitlines() |
| 3009 | else: |
| 3010 | lines = [line.rstrip() for line in desc] |
| 3011 | while lines and not lines[0]: |
| 3012 | lines.pop(0) |
| 3013 | while lines and not lines[-1]: |
| 3014 | lines.pop(-1) |
| 3015 | self._description_lines = lines |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 3016 | |
piman@chromium.org | 336f912 | 2014-09-04 02:16:55 +0000 | [diff] [blame] | 3017 | def update_reviewers(self, reviewers, add_owners_tbr=False, change=None): |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 3018 | """Rewrites the R=/TBR= line(s) as a single line each.""" |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 3019 | assert isinstance(reviewers, list), reviewers |
piman@chromium.org | 336f912 | 2014-09-04 02:16:55 +0000 | [diff] [blame] | 3020 | if not reviewers and not add_owners_tbr: |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 3021 | return |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 3022 | reviewers = reviewers[:] |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 3023 | |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 3024 | # Get the set of R= and TBR= lines and remove them from the desciption. |
| 3025 | regexp = re.compile(self.R_LINE) |
| 3026 | matches = [regexp.match(line) for line in self._description_lines] |
| 3027 | new_desc = [l for i, l in enumerate(self._description_lines) |
| 3028 | if not matches[i]] |
| 3029 | self.set_description(new_desc) |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 3030 | |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 3031 | # Construct new unified R= and TBR= lines. |
| 3032 | r_names = [] |
| 3033 | tbr_names = [] |
| 3034 | for match in matches: |
| 3035 | if not match: |
| 3036 | continue |
| 3037 | people = cleanup_list([match.group(2).strip()]) |
| 3038 | if match.group(1) == 'TBR': |
| 3039 | tbr_names.extend(people) |
| 3040 | else: |
| 3041 | r_names.extend(people) |
| 3042 | for name in r_names: |
| 3043 | if name not in reviewers: |
| 3044 | reviewers.append(name) |
piman@chromium.org | 336f912 | 2014-09-04 02:16:55 +0000 | [diff] [blame] | 3045 | if add_owners_tbr: |
| 3046 | owners_db = owners.Database(change.RepositoryRoot(), |
dtu | 944b605 | 2016-07-14 14:48:21 -0700 | [diff] [blame] | 3047 | fopen=file, os_path=os.path) |
piman@chromium.org | 336f912 | 2014-09-04 02:16:55 +0000 | [diff] [blame] | 3048 | all_reviewers = set(tbr_names + reviewers) |
| 3049 | missing_files = owners_db.files_not_covered_by(change.LocalPaths(), |
| 3050 | all_reviewers) |
| 3051 | tbr_names.extend(owners_db.reviewers_for(missing_files, |
| 3052 | change.author_email)) |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 3053 | new_r_line = 'R=' + ', '.join(reviewers) if reviewers else None |
| 3054 | new_tbr_line = 'TBR=' + ', '.join(tbr_names) if tbr_names else None |
| 3055 | |
| 3056 | # Put the new lines in the description where the old first R= line was. |
| 3057 | line_loc = next((i for i, match in enumerate(matches) if match), -1) |
| 3058 | if 0 <= line_loc < len(self._description_lines): |
| 3059 | if new_tbr_line: |
| 3060 | self._description_lines.insert(line_loc, new_tbr_line) |
| 3061 | if new_r_line: |
| 3062 | self._description_lines.insert(line_loc, new_r_line) |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 3063 | else: |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 3064 | if new_r_line: |
| 3065 | self.append_footer(new_r_line) |
| 3066 | if new_tbr_line: |
| 3067 | self.append_footer(new_tbr_line) |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 3068 | |
tandrii | f9aefb7 | 2016-07-01 09:06:51 -0700 | [diff] [blame] | 3069 | def prompt(self, bug=None): |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 3070 | """Asks the user to update the description.""" |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 3071 | self.set_description([ |
| 3072 | '# Enter a description of the change.', |
| 3073 | '# This will be displayed on the codereview site.', |
| 3074 | '# The first line will also be used as the subject of the review.', |
alancutter@chromium.org | bd1073e | 2013-06-01 00:34:38 +0000 | [diff] [blame] | 3075 | '#--------------------This line is 72 characters long' |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 3076 | '--------------------', |
| 3077 | ] + self._description_lines) |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 3078 | |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 3079 | regexp = re.compile(self.BUG_LINE) |
| 3080 | if not any((regexp.match(line) for line in self._description_lines)): |
tandrii | f9aefb7 | 2016-07-01 09:06:51 -0700 | [diff] [blame] | 3081 | prefix = settings.GetBugPrefix() |
| 3082 | values = list(_get_bug_line_values(prefix, bug or '')) or [prefix] |
| 3083 | for value in values: |
| 3084 | # TODO(tandrii): change this to 'Bug: xxx' to be a proper Gerrit footer. |
| 3085 | self.append_footer('BUG=%s' % value) |
| 3086 | |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 3087 | content = gclient_utils.RunEditor(self.description, True, |
jbroman@chromium.org | 615a262 | 2013-05-03 13:20:14 +0000 | [diff] [blame] | 3088 | git_editor=settings.GetGitEditor()) |
maruel@chromium.org | 0e0436a | 2011-10-25 13:32:41 +0000 | [diff] [blame] | 3089 | if not content: |
| 3090 | DieWithError('Running editor failed') |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 3091 | lines = content.splitlines() |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 3092 | |
| 3093 | # Strip off comments. |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 3094 | clean_lines = [line.rstrip() for line in lines if not line.startswith('#')] |
| 3095 | if not clean_lines: |
maruel@chromium.org | 0e0436a | 2011-10-25 13:32:41 +0000 | [diff] [blame] | 3096 | DieWithError('No CL description, aborting') |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 3097 | self.set_description(clean_lines) |
dpranke@chromium.org | 20254fc | 2011-03-22 18:28:59 +0000 | [diff] [blame] | 3098 | |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 3099 | def append_footer(self, line): |
tandrii@chromium.org | 601e1d1 | 2016-06-03 13:03:54 +0000 | [diff] [blame] | 3100 | """Adds a footer line to the description. |
| 3101 | |
| 3102 | Differentiates legacy "KEY=xxx" footers (used to be called tags) and |
| 3103 | Gerrit's footers in the form of "Footer-Key: footer any value" and ensures |
| 3104 | that Gerrit footers are always at the end. |
| 3105 | """ |
| 3106 | parsed_footer_line = git_footers.parse_footer(line) |
| 3107 | if parsed_footer_line: |
| 3108 | # Line is a gerrit footer in the form: Footer-Key: any value. |
| 3109 | # Thus, must be appended observing Gerrit footer rules. |
| 3110 | self.set_description( |
| 3111 | git_footers.add_footer(self.description, |
| 3112 | key=parsed_footer_line[0], |
| 3113 | value=parsed_footer_line[1])) |
| 3114 | return |
| 3115 | |
| 3116 | if not self._description_lines: |
| 3117 | self._description_lines.append(line) |
| 3118 | return |
| 3119 | |
| 3120 | top_lines, gerrit_footers, _ = git_footers.split_footers(self.description) |
| 3121 | if gerrit_footers: |
| 3122 | # git_footers.split_footers ensures that there is an empty line before |
| 3123 | # actual (gerrit) footers, if any. We have to keep it that way. |
| 3124 | assert top_lines and top_lines[-1] == '' |
| 3125 | top_lines, separator = top_lines[:-1], top_lines[-1:] |
| 3126 | else: |
| 3127 | separator = [] # No need for separator if there are no gerrit_footers. |
| 3128 | |
| 3129 | prev_line = top_lines[-1] if top_lines else '' |
| 3130 | if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or |
| 3131 | not presubmit_support.Change.TAG_LINE_RE.match(line)): |
| 3132 | top_lines.append('') |
| 3133 | top_lines.append(line) |
| 3134 | self._description_lines = top_lines + separator + gerrit_footers |
dpranke@chromium.org | 20254fc | 2011-03-22 18:28:59 +0000 | [diff] [blame] | 3135 | |
tandrii | 99a72f2 | 2016-08-17 14:33:24 -0700 | [diff] [blame] | 3136 | def get_reviewers(self, tbr_only=False): |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 3137 | """Retrieves the list of reviewers.""" |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 3138 | matches = [re.match(self.R_LINE, line) for line in self._description_lines] |
tandrii | 99a72f2 | 2016-08-17 14:33:24 -0700 | [diff] [blame] | 3139 | reviewers = [match.group(2).strip() |
| 3140 | for match in matches |
| 3141 | if match and (not tbr_only or match.group(1).upper() == 'TBR')] |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 3142 | return cleanup_list(reviewers) |
dpranke@chromium.org | 20254fc | 2011-03-22 18:28:59 +0000 | [diff] [blame] | 3143 | |
bradnelson | d975b30 | 2016-10-23 12:20:23 -0700 | [diff] [blame] | 3144 | def get_cced(self): |
| 3145 | """Retrieves the list of reviewers.""" |
| 3146 | matches = [re.match(self.CC_LINE, line) for line in self._description_lines] |
| 3147 | cced = [match.group(2).strip() for match in matches if match] |
| 3148 | return cleanup_list(cced) |
| 3149 | |
dpranke@chromium.org | 20254fc | 2011-03-22 18:28:59 +0000 | [diff] [blame] | 3150 | |
maruel@chromium.org | e52678e | 2013-04-26 18:34:44 +0000 | [diff] [blame] | 3151 | def get_approving_reviewers(props): |
| 3152 | """Retrieves the reviewers that approved a CL from the issue properties with |
| 3153 | messages. |
| 3154 | |
| 3155 | Note that the list may contain reviewers that are not committer, thus are not |
| 3156 | considered by the CQ. |
| 3157 | """ |
| 3158 | return sorted( |
| 3159 | set( |
| 3160 | message['sender'] |
| 3161 | for message in props['messages'] |
| 3162 | if message['approval'] and message['sender'] in props['reviewers'] |
| 3163 | ) |
| 3164 | ) |
| 3165 | |
| 3166 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3167 | def FindCodereviewSettingsFile(filename='codereview.settings'): |
| 3168 | """Finds the given file starting in the cwd and going up. |
| 3169 | |
| 3170 | Only looks up to the top of the repository unless an |
| 3171 | 'inherit-review-settings-ok' file exists in the root of the repository. |
| 3172 | """ |
| 3173 | inherit_ok_file = 'inherit-review-settings-ok' |
| 3174 | cwd = os.getcwd() |
thestig@chromium.org | 8b0553c | 2014-02-11 00:33:37 +0000 | [diff] [blame] | 3175 | root = settings.GetRoot() |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3176 | if os.path.isfile(os.path.join(root, inherit_ok_file)): |
| 3177 | root = '/' |
| 3178 | while True: |
| 3179 | if filename in os.listdir(cwd): |
| 3180 | if os.path.isfile(os.path.join(cwd, filename)): |
| 3181 | return open(os.path.join(cwd, filename)) |
| 3182 | if cwd == root: |
| 3183 | break |
| 3184 | cwd = os.path.dirname(cwd) |
| 3185 | |
| 3186 | |
| 3187 | def LoadCodereviewSettingsFromFile(fileobj): |
| 3188 | """Parse a codereview.settings file and updates hooks.""" |
maruel@chromium.org | 99ac1c5 | 2012-01-16 14:52:12 +0000 | [diff] [blame] | 3189 | keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read()) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3190 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3191 | def SetProperty(name, setting, unset_error_ok=False): |
| 3192 | fullname = 'rietveld.' + name |
| 3193 | if setting in keyvals: |
| 3194 | RunGit(['config', fullname, keyvals[setting]]) |
| 3195 | else: |
| 3196 | RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok) |
| 3197 | |
tandrii | 48df581 | 2016-10-17 03:55:37 -0700 | [diff] [blame] | 3198 | if not keyvals.get('GERRIT_HOST', False): |
| 3199 | SetProperty('server', 'CODE_REVIEW_SERVER') |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3200 | # Only server setting is required. Other settings can be absent. |
| 3201 | # In that case, we ignore errors raised during option deletion attempt. |
| 3202 | SetProperty('cc', 'CC_LIST', unset_error_ok=True) |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 3203 | SetProperty('private', 'PRIVATE', unset_error_ok=True) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3204 | SetProperty('tree-status-url', 'STATUS', unset_error_ok=True) |
| 3205 | SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True) |
rmistry@google.com | 9075258 | 2014-01-14 21:04:50 +0000 | [diff] [blame] | 3206 | SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True) |
thestig@chromium.org | 44202a2 | 2014-03-11 19:22:18 +0000 | [diff] [blame] | 3207 | SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True) |
kjellander@chromium.org | 6abc652 | 2014-12-02 07:34:49 +0000 | [diff] [blame] | 3208 | SetProperty('force-https-commit-url', 'FORCE_HTTPS_COMMIT_URL', |
| 3209 | unset_error_ok=True) |
thestig@chromium.org | 44202a2 | 2014-03-11 19:22:18 +0000 | [diff] [blame] | 3210 | SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True) |
sheyang@chromium.org | 152cf83 | 2014-06-11 21:37:49 +0000 | [diff] [blame] | 3211 | SetProperty('project', 'PROJECT', unset_error_ok=True) |
vadimsh@chromium.org | 566a02a | 2014-08-22 01:34:13 +0000 | [diff] [blame] | 3212 | SetProperty('pending-ref-prefix', 'PENDING_REF_PREFIX', unset_error_ok=True) |
tandrii | f46c20f | 2016-09-14 06:17:05 -0700 | [diff] [blame] | 3213 | SetProperty('git-number-footer', 'GIT_NUMBER_FOOTER', unset_error_ok=True) |
rmistry@google.com | 5626a92 | 2015-02-26 14:03:30 +0000 | [diff] [blame] | 3214 | SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK', |
| 3215 | unset_error_ok=True) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3216 | |
ukai@chromium.org | 7044efc | 2013-11-28 01:51:21 +0000 | [diff] [blame] | 3217 | if 'GERRIT_HOST' in keyvals: |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 3218 | RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']]) |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 3219 | |
bauerb@chromium.org | 54b400c | 2016-01-14 10:08:25 +0000 | [diff] [blame] | 3220 | if 'GERRIT_SQUASH_UPLOADS' in keyvals: |
tandrii | 8dd81ea | 2016-06-16 13:24:23 -0700 | [diff] [blame] | 3221 | RunGit(['config', 'gerrit.squash-uploads', |
| 3222 | keyvals['GERRIT_SQUASH_UPLOADS']]) |
bauerb@chromium.org | 54b400c | 2016-01-14 10:08:25 +0000 | [diff] [blame] | 3223 | |
tandrii@chromium.org | 2825353 | 2016-04-14 13:46:56 +0000 | [diff] [blame] | 3224 | if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals: |
shinyak@chromium.org | 00dbccd | 2016-04-15 07:24:43 +0000 | [diff] [blame] | 3225 | RunGit(['config', 'gerrit.skip-ensure-authenticated', |
tandrii@chromium.org | 2825353 | 2016-04-14 13:46:56 +0000 | [diff] [blame] | 3226 | keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']]) |
| 3227 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3228 | if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals: |
| 3229 | #should be of the form |
| 3230 | #PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof |
| 3231 | #ORIGIN_URL_CONFIG: http://src.chromium.org/git |
| 3232 | RunGit(['config', keyvals['PUSH_URL_CONFIG'], |
| 3233 | keyvals['ORIGIN_URL_CONFIG']]) |
| 3234 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3235 | |
joshua.lock@intel.com | 426f69b | 2012-08-02 23:41:49 +0000 | [diff] [blame] | 3236 | def urlretrieve(source, destination): |
| 3237 | """urllib is broken for SSL connections via a proxy therefore we |
| 3238 | can't use urllib.urlretrieve().""" |
| 3239 | with open(destination, 'w') as f: |
| 3240 | f.write(urllib2.urlopen(source).read()) |
| 3241 | |
| 3242 | |
ukai@chromium.org | 712d610 | 2013-11-27 00:52:58 +0000 | [diff] [blame] | 3243 | def hasSheBang(fname): |
| 3244 | """Checks fname is a #! script.""" |
| 3245 | with open(fname) as f: |
| 3246 | return f.read(2).startswith('#!') |
| 3247 | |
| 3248 | |
bpastene@chromium.org | 917f0ff | 2016-04-05 00:45:30 +0000 | [diff] [blame] | 3249 | # TODO(bpastene) Remove once a cleaner fix to crbug.com/600473 presents itself. |
| 3250 | def DownloadHooks(*args, **kwargs): |
| 3251 | pass |
| 3252 | |
| 3253 | |
tandrii@chromium.org | 18630d6 | 2016-03-04 12:06:02 +0000 | [diff] [blame] | 3254 | def DownloadGerritHook(force): |
| 3255 | """Download and install Gerrit commit-msg hook. |
ukai@chromium.org | 78c4b98 | 2012-02-14 02:20:26 +0000 | [diff] [blame] | 3256 | |
| 3257 | Args: |
| 3258 | force: True to update hooks. False to install hooks if not present. |
| 3259 | """ |
| 3260 | if not settings.GetIsGerrit(): |
| 3261 | return |
ukai@chromium.org | 712d610 | 2013-11-27 00:52:58 +0000 | [diff] [blame] | 3262 | src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg' |
ukai@chromium.org | 78c4b98 | 2012-02-14 02:20:26 +0000 | [diff] [blame] | 3263 | dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg') |
| 3264 | if not os.access(dst, os.X_OK): |
| 3265 | if os.path.exists(dst): |
| 3266 | if not force: |
| 3267 | return |
ukai@chromium.org | 78c4b98 | 2012-02-14 02:20:26 +0000 | [diff] [blame] | 3268 | try: |
joshua.lock@intel.com | 426f69b | 2012-08-02 23:41:49 +0000 | [diff] [blame] | 3269 | urlretrieve(src, dst) |
ukai@chromium.org | 712d610 | 2013-11-27 00:52:58 +0000 | [diff] [blame] | 3270 | if not hasSheBang(dst): |
| 3271 | DieWithError('Not a script: %s\n' |
| 3272 | 'You need to download from\n%s\n' |
| 3273 | 'into .git/hooks/commit-msg and ' |
| 3274 | 'chmod +x .git/hooks/commit-msg' % (dst, src)) |
ukai@chromium.org | 78c4b98 | 2012-02-14 02:20:26 +0000 | [diff] [blame] | 3275 | os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR) |
| 3276 | except Exception: |
| 3277 | if os.path.exists(dst): |
| 3278 | os.remove(dst) |
ukai@chromium.org | 712d610 | 2013-11-27 00:52:58 +0000 | [diff] [blame] | 3279 | DieWithError('\nFailed to download hooks.\n' |
| 3280 | 'You need to download from\n%s\n' |
| 3281 | 'into .git/hooks/commit-msg and ' |
| 3282 | 'chmod +x .git/hooks/commit-msg' % src) |
ukai@chromium.org | 78c4b98 | 2012-02-14 02:20:26 +0000 | [diff] [blame] | 3283 | |
| 3284 | |
tandrii@chromium.org | e7d3d16 | 2016-03-15 14:15:57 +0000 | [diff] [blame] | 3285 | |
| 3286 | def GetRietveldCodereviewSettingsInteractively(): |
| 3287 | """Prompt the user for settings.""" |
| 3288 | server = settings.GetDefaultServerUrl(error_ok=True) |
| 3289 | prompt = 'Rietveld server (host[:port])' |
| 3290 | prompt += ' [%s]' % (server or DEFAULT_SERVER) |
| 3291 | newserver = ask_for_data(prompt + ':') |
| 3292 | if not server and not newserver: |
| 3293 | newserver = DEFAULT_SERVER |
| 3294 | if newserver: |
| 3295 | newserver = gclient_utils.UpgradeToHttps(newserver) |
| 3296 | if newserver != server: |
| 3297 | RunGit(['config', 'rietveld.server', newserver]) |
| 3298 | |
| 3299 | def SetProperty(initial, caption, name, is_url): |
| 3300 | prompt = caption |
| 3301 | if initial: |
| 3302 | prompt += ' ("x" to clear) [%s]' % initial |
| 3303 | new_val = ask_for_data(prompt + ':') |
| 3304 | if new_val == 'x': |
| 3305 | RunGit(['config', '--unset-all', 'rietveld.' + name], error_ok=True) |
| 3306 | elif new_val: |
| 3307 | if is_url: |
| 3308 | new_val = gclient_utils.UpgradeToHttps(new_val) |
| 3309 | if new_val != initial: |
| 3310 | RunGit(['config', 'rietveld.' + name, new_val]) |
| 3311 | |
| 3312 | SetProperty(settings.GetDefaultCCList(), 'CC list', 'cc', False) |
| 3313 | SetProperty(settings.GetDefaultPrivateFlag(), |
| 3314 | 'Private flag (rietveld only)', 'private', False) |
| 3315 | SetProperty(settings.GetTreeStatusUrl(error_ok=True), 'Tree status URL', |
| 3316 | 'tree-status-url', False) |
| 3317 | SetProperty(settings.GetViewVCUrl(), 'ViewVC URL', 'viewvc-url', True) |
| 3318 | SetProperty(settings.GetBugPrefix(), 'Bug Prefix', 'bug-prefix', False) |
| 3319 | SetProperty(settings.GetRunPostUploadHook(), 'Run Post Upload Hook', |
| 3320 | 'run-post-upload-hook', False) |
| 3321 | |
maruel@chromium.org | 0633fb4 | 2013-08-16 20:06:14 +0000 | [diff] [blame] | 3322 | @subcommand.usage('[repo root containing codereview.settings]') |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3323 | def CMDconfig(parser, args): |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 3324 | """Edits configuration for this tree.""" |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3325 | |
tandrii | 5d0a042 | 2016-09-14 06:24:35 -0700 | [diff] [blame] | 3326 | print('WARNING: git cl config works for Rietveld only') |
| 3327 | # TODO(tandrii): remove this once we switch to Gerrit. |
| 3328 | # See bugs http://crbug.com/637561 and http://crbug.com/600469. |
pgervais@chromium.org | 87884cc | 2014-01-03 22:23:41 +0000 | [diff] [blame] | 3329 | parser.add_option('--activate-update', action='store_true', |
| 3330 | help='activate auto-updating [rietveld] section in ' |
| 3331 | '.git/config') |
| 3332 | parser.add_option('--deactivate-update', action='store_true', |
| 3333 | help='deactivate auto-updating [rietveld] section in ' |
| 3334 | '.git/config') |
| 3335 | options, args = parser.parse_args(args) |
| 3336 | |
| 3337 | if options.deactivate_update: |
| 3338 | RunGit(['config', 'rietveld.autoupdate', 'false']) |
| 3339 | return |
| 3340 | |
| 3341 | if options.activate_update: |
| 3342 | RunGit(['config', '--unset', 'rietveld.autoupdate']) |
| 3343 | return |
| 3344 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3345 | if len(args) == 0: |
tandrii@chromium.org | e7d3d16 | 2016-03-15 14:15:57 +0000 | [diff] [blame] | 3346 | GetRietveldCodereviewSettingsInteractively() |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3347 | return 0 |
| 3348 | |
| 3349 | url = args[0] |
| 3350 | if not url.endswith('codereview.settings'): |
| 3351 | url = os.path.join(url, 'codereview.settings') |
| 3352 | |
| 3353 | # Load code review settings and download hooks (if available). |
| 3354 | LoadCodereviewSettingsFromFile(urllib2.urlopen(url)) |
| 3355 | return 0 |
| 3356 | |
| 3357 | |
kalmard@homejinni.com | 6b0051e | 2012-04-03 15:45:08 +0000 | [diff] [blame] | 3358 | def CMDbaseurl(parser, args): |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 3359 | """Gets or sets base-url for this branch.""" |
kalmard@homejinni.com | 6b0051e | 2012-04-03 15:45:08 +0000 | [diff] [blame] | 3360 | branchref = RunGit(['symbolic-ref', 'HEAD']).strip() |
| 3361 | branch = ShortBranchName(branchref) |
| 3362 | _, args = parser.parse_args(args) |
| 3363 | if not args: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3364 | print('Current base-url:') |
kalmard@homejinni.com | 6b0051e | 2012-04-03 15:45:08 +0000 | [diff] [blame] | 3365 | return RunGit(['config', 'branch.%s.base-url' % branch], |
| 3366 | error_ok=False).strip() |
| 3367 | else: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3368 | print('Setting base-url to %s' % args[0]) |
kalmard@homejinni.com | 6b0051e | 2012-04-03 15:45:08 +0000 | [diff] [blame] | 3369 | return RunGit(['config', 'branch.%s.base-url' % branch, args[0]], |
| 3370 | error_ok=False).strip() |
| 3371 | |
| 3372 | |
jsbell@chromium.org | b99fbd9 | 2014-09-11 17:29:28 +0000 | [diff] [blame] | 3373 | def color_for_status(status): |
| 3374 | """Maps a Changelist status to color, for CMDstatus and other tools.""" |
| 3375 | return { |
| 3376 | 'unsent': Fore.RED, |
| 3377 | 'waiting': Fore.BLUE, |
| 3378 | 'reply': Fore.YELLOW, |
| 3379 | 'lgtm': Fore.GREEN, |
| 3380 | 'commit': Fore.MAGENTA, |
| 3381 | 'closed': Fore.CYAN, |
| 3382 | 'error': Fore.WHITE, |
| 3383 | }.get(status, Fore.WHITE) |
| 3384 | |
tandrii@chromium.org | 04ea846 | 2016-04-25 19:51:21 +0000 | [diff] [blame] | 3385 | |
clemensh@chromium.org | cbd7dc3 | 2016-05-31 10:33:50 +0000 | [diff] [blame] | 3386 | def get_cl_statuses(changes, fine_grained, max_processes=None): |
| 3387 | """Returns a blocking iterable of (cl, status) for given branches. |
calamity@chromium.org | ffde55c | 2015-03-12 00:44:17 +0000 | [diff] [blame] | 3388 | |
| 3389 | If fine_grained is true, this will fetch CL statuses from the server. |
| 3390 | Otherwise, simply indicate if there's a matching url for the given branches. |
| 3391 | |
| 3392 | If max_processes is specified, it is used as the maximum number of processes |
| 3393 | to spawn to fetch CL status from the server. Otherwise 1 process per branch is |
| 3394 | spawned. |
calamity@chromium.org | cf19748 | 2016-04-29 20:15:53 +0000 | [diff] [blame] | 3395 | |
| 3396 | See GetStatus() for a list of possible statuses. |
calamity@chromium.org | ffde55c | 2015-03-12 00:44:17 +0000 | [diff] [blame] | 3397 | """ |
qyearsley | 12fa6ff | 2016-08-24 09:18:40 -0700 | [diff] [blame] | 3398 | # Silence upload.py otherwise it becomes unwieldy. |
calamity@chromium.org | ffde55c | 2015-03-12 00:44:17 +0000 | [diff] [blame] | 3399 | upload.verbosity = 0 |
| 3400 | |
| 3401 | if fine_grained: |
| 3402 | # Process one branch synchronously to work through authentication, then |
| 3403 | # spawn processes to process all the other branches in parallel. |
clemensh@chromium.org | cbd7dc3 | 2016-05-31 10:33:50 +0000 | [diff] [blame] | 3404 | if changes: |
tandrii | ea9514a | 2016-08-17 12:32:37 -0700 | [diff] [blame] | 3405 | def fetch(cl): |
| 3406 | try: |
| 3407 | return (cl, cl.GetStatus()) |
| 3408 | except: |
| 3409 | # See http://crbug.com/629863. |
| 3410 | logging.exception('failed to fetch status for %s:', cl) |
| 3411 | raise |
clemensh@chromium.org | cbd7dc3 | 2016-05-31 10:33:50 +0000 | [diff] [blame] | 3412 | yield fetch(changes[0]) |
calamity@chromium.org | cf19748 | 2016-04-29 20:15:53 +0000 | [diff] [blame] | 3413 | |
tandrii | ea9514a | 2016-08-17 12:32:37 -0700 | [diff] [blame] | 3414 | changes_to_fetch = changes[1:] |
| 3415 | if not changes_to_fetch: |
kmarshall | 3bff56b | 2016-06-06 18:31:47 -0700 | [diff] [blame] | 3416 | # Exit early if there was only one branch to fetch. |
| 3417 | return |
| 3418 | |
calamity@chromium.org | ffde55c | 2015-03-12 00:44:17 +0000 | [diff] [blame] | 3419 | pool = ThreadPool( |
clemensh@chromium.org | cbd7dc3 | 2016-05-31 10:33:50 +0000 | [diff] [blame] | 3420 | min(max_processes, len(changes_to_fetch)) |
calamity@chromium.org | ffde55c | 2015-03-12 00:44:17 +0000 | [diff] [blame] | 3421 | if max_processes is not None |
dsinclair | 99d3017 | 2016-08-09 10:48:58 -0700 | [diff] [blame] | 3422 | else max(len(changes_to_fetch), 1)) |
calamity@chromium.org | cf19748 | 2016-04-29 20:15:53 +0000 | [diff] [blame] | 3423 | |
clemensh@chromium.org | cbd7dc3 | 2016-05-31 10:33:50 +0000 | [diff] [blame] | 3424 | fetched_cls = set() |
| 3425 | it = pool.imap_unordered(fetch, changes_to_fetch).__iter__() |
calamity@chromium.org | cf19748 | 2016-04-29 20:15:53 +0000 | [diff] [blame] | 3426 | while True: |
| 3427 | try: |
| 3428 | row = it.next(timeout=5) |
| 3429 | except multiprocessing.TimeoutError: |
| 3430 | break |
| 3431 | |
clemensh@chromium.org | cbd7dc3 | 2016-05-31 10:33:50 +0000 | [diff] [blame] | 3432 | fetched_cls.add(row[0]) |
calamity@chromium.org | cf19748 | 2016-04-29 20:15:53 +0000 | [diff] [blame] | 3433 | yield row |
| 3434 | |
| 3435 | # Add any branches that failed to fetch. |
clemensh@chromium.org | cbd7dc3 | 2016-05-31 10:33:50 +0000 | [diff] [blame] | 3436 | for cl in set(changes_to_fetch) - fetched_cls: |
| 3437 | yield (cl, 'error') |
calamity@chromium.org | cf19748 | 2016-04-29 20:15:53 +0000 | [diff] [blame] | 3438 | |
calamity@chromium.org | ffde55c | 2015-03-12 00:44:17 +0000 | [diff] [blame] | 3439 | else: |
| 3440 | # Do not use GetApprovingReviewers(), since it requires an HTTP request. |
clemensh@chromium.org | cbd7dc3 | 2016-05-31 10:33:50 +0000 | [diff] [blame] | 3441 | for cl in changes: |
| 3442 | yield (cl, 'waiting' if cl.GetIssueURL() else 'error') |
jsbell@chromium.org | b99fbd9 | 2014-09-11 17:29:28 +0000 | [diff] [blame] | 3443 | |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 3444 | |
| 3445 | def upload_branch_deps(cl, args): |
| 3446 | """Uploads CLs of local branches that are dependents of the current branch. |
| 3447 | |
| 3448 | If the local branch dependency tree looks like: |
| 3449 | test1 -> test2.1 -> test3.1 |
| 3450 | -> test3.2 |
| 3451 | -> test2.2 -> test3.3 |
| 3452 | |
| 3453 | and you run "git cl upload --dependencies" from test1 then "git cl upload" is |
| 3454 | run on the dependent branches in this order: |
| 3455 | test2.1, test3.1, test3.2, test2.2, test3.3 |
| 3456 | |
| 3457 | Note: This function does not rebase your local dependent branches. Use it when |
| 3458 | you make a change to the parent branch that will not conflict with its |
| 3459 | dependent branches, and you would like their dependencies updated in |
| 3460 | Rietveld. |
| 3461 | """ |
| 3462 | if git_common.is_dirty_git_tree('upload-branch-deps'): |
| 3463 | return 1 |
| 3464 | |
| 3465 | root_branch = cl.GetBranch() |
| 3466 | if root_branch is None: |
| 3467 | DieWithError('Can\'t find dependent branches from detached HEAD state. ' |
| 3468 | 'Get on a branch!') |
| 3469 | if not cl.GetIssue() or not cl.GetPatchset(): |
| 3470 | DieWithError('Current branch does not have an uploaded CL. We cannot set ' |
| 3471 | 'patchset dependencies without an uploaded CL.') |
| 3472 | |
| 3473 | branches = RunGit(['for-each-ref', |
| 3474 | '--format=%(refname:short) %(upstream:short)', |
| 3475 | 'refs/heads']) |
| 3476 | if not branches: |
| 3477 | print('No local branches found.') |
| 3478 | return 0 |
| 3479 | |
| 3480 | # Create a dictionary of all local branches to the branches that are dependent |
| 3481 | # on it. |
| 3482 | tracked_to_dependents = collections.defaultdict(list) |
| 3483 | for b in branches.splitlines(): |
| 3484 | tokens = b.split() |
| 3485 | if len(tokens) == 2: |
| 3486 | branch_name, tracked = tokens |
| 3487 | tracked_to_dependents[tracked].append(branch_name) |
| 3488 | |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3489 | print() |
| 3490 | print('The dependent local branches of %s are:' % root_branch) |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 3491 | dependents = [] |
| 3492 | def traverse_dependents_preorder(branch, padding=''): |
| 3493 | dependents_to_process = tracked_to_dependents.get(branch, []) |
| 3494 | padding += ' ' |
| 3495 | for dependent in dependents_to_process: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3496 | print('%s%s' % (padding, dependent)) |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 3497 | dependents.append(dependent) |
| 3498 | traverse_dependents_preorder(dependent, padding) |
| 3499 | traverse_dependents_preorder(root_branch) |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3500 | print() |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 3501 | |
| 3502 | if not dependents: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3503 | print('There are no dependent local branches for %s' % root_branch) |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 3504 | return 0 |
| 3505 | |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3506 | print('This command will checkout all dependent branches and run ' |
| 3507 | '"git cl upload".') |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 3508 | ask_for_data('[Press enter to continue or ctrl-C to quit]') |
| 3509 | |
andybons@chromium.org | 962f946 | 2016-02-03 20:00:42 +0000 | [diff] [blame] | 3510 | # Add a default patchset title to all upload calls in Rietveld. |
tandrii@chromium.org | 4c72b08 | 2016-03-31 22:26:35 +0000 | [diff] [blame] | 3511 | if not cl.IsGerrit(): |
andybons@chromium.org | 962f946 | 2016-02-03 20:00:42 +0000 | [diff] [blame] | 3512 | args.extend(['-t', 'Updated patchset dependency']) |
| 3513 | |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 3514 | # Record all dependents that failed to upload. |
| 3515 | failures = {} |
| 3516 | # Go through all dependents, checkout the branch and upload. |
| 3517 | try: |
| 3518 | for dependent_branch in dependents: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3519 | print() |
| 3520 | print('--------------------------------------') |
| 3521 | print('Running "git cl upload" from %s:' % dependent_branch) |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 3522 | RunGit(['checkout', '-q', dependent_branch]) |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3523 | print() |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 3524 | try: |
| 3525 | if CMDupload(OptionParser(), args) != 0: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3526 | print('Upload failed for %s!' % dependent_branch) |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 3527 | failures[dependent_branch] = 1 |
| 3528 | except: # pylint: disable=W0702 |
| 3529 | failures[dependent_branch] = 1 |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3530 | print() |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 3531 | finally: |
| 3532 | # Swap back to the original root branch. |
| 3533 | RunGit(['checkout', '-q', root_branch]) |
| 3534 | |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3535 | print() |
| 3536 | print('Upload complete for dependent branches!') |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 3537 | for dependent_branch in dependents: |
| 3538 | upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded' |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3539 | print(' %s : %s' % (dependent_branch, upload_status)) |
| 3540 | print() |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 3541 | |
| 3542 | return 0 |
| 3543 | |
| 3544 | |
kmarshall | 3bff56b | 2016-06-06 18:31:47 -0700 | [diff] [blame] | 3545 | def CMDarchive(parser, args): |
| 3546 | """Archives and deletes branches associated with closed changelists.""" |
| 3547 | parser.add_option( |
| 3548 | '-j', '--maxjobs', action='store', type=int, |
kmarshall | 9249e01 | 2016-08-23 12:02:16 -0700 | [diff] [blame] | 3549 | help='The maximum number of jobs to use when retrieving review status.') |
kmarshall | 3bff56b | 2016-06-06 18:31:47 -0700 | [diff] [blame] | 3550 | parser.add_option( |
| 3551 | '-f', '--force', action='store_true', |
| 3552 | help='Bypasses the confirmation prompt.') |
kmarshall | 9249e01 | 2016-08-23 12:02:16 -0700 | [diff] [blame] | 3553 | parser.add_option( |
| 3554 | '-d', '--dry-run', action='store_true', |
| 3555 | help='Skip the branch tagging and removal steps.') |
| 3556 | parser.add_option( |
| 3557 | '-t', '--notags', action='store_true', |
| 3558 | help='Do not tag archived branches. ' |
| 3559 | 'Note: local commit history may be lost.') |
kmarshall | 3bff56b | 2016-06-06 18:31:47 -0700 | [diff] [blame] | 3560 | |
| 3561 | auth.add_auth_options(parser) |
| 3562 | options, args = parser.parse_args(args) |
| 3563 | if args: |
| 3564 | parser.error('Unsupported args: %s' % ' '.join(args)) |
| 3565 | auth_config = auth.extract_auth_config_from_options(options) |
| 3566 | |
| 3567 | branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads']) |
| 3568 | if not branches: |
| 3569 | return 0 |
| 3570 | |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3571 | print('Finding all branches associated with closed issues...') |
kmarshall | 3bff56b | 2016-06-06 18:31:47 -0700 | [diff] [blame] | 3572 | changes = [Changelist(branchref=b, auth_config=auth_config) |
| 3573 | for b in branches.splitlines()] |
| 3574 | alignment = max(5, max(len(c.GetBranch()) for c in changes)) |
| 3575 | statuses = get_cl_statuses(changes, |
| 3576 | fine_grained=True, |
| 3577 | max_processes=options.maxjobs) |
| 3578 | proposal = [(cl.GetBranch(), |
| 3579 | 'git-cl-archived-%s-%s' % (cl.GetIssue(), cl.GetBranch())) |
| 3580 | for cl, status in statuses |
| 3581 | if status == 'closed'] |
| 3582 | proposal.sort() |
| 3583 | |
| 3584 | if not proposal: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3585 | print('No branches with closed codereview issues found.') |
kmarshall | 3bff56b | 2016-06-06 18:31:47 -0700 | [diff] [blame] | 3586 | return 0 |
| 3587 | |
| 3588 | current_branch = GetCurrentBranch() |
| 3589 | |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3590 | print('\nBranches with closed issues that will be archived:\n') |
kmarshall | 9249e01 | 2016-08-23 12:02:16 -0700 | [diff] [blame] | 3591 | if options.notags: |
| 3592 | for next_item in proposal: |
| 3593 | print(' ' + next_item[0]) |
| 3594 | else: |
| 3595 | print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name')) |
| 3596 | for next_item in proposal: |
| 3597 | print('%*s %s' % (alignment, next_item[0], next_item[1])) |
kmarshall | 3bff56b | 2016-06-06 18:31:47 -0700 | [diff] [blame] | 3598 | |
kmarshall | 9249e01 | 2016-08-23 12:02:16 -0700 | [diff] [blame] | 3599 | # Quit now on precondition failure or if instructed by the user, either |
| 3600 | # via an interactive prompt or by command line flags. |
| 3601 | if options.dry_run: |
| 3602 | print('\nNo changes were made (dry run).\n') |
| 3603 | return 0 |
| 3604 | elif any(branch == current_branch for branch, _ in proposal): |
kmarshall | 3bff56b | 2016-06-06 18:31:47 -0700 | [diff] [blame] | 3605 | print('You are currently on a branch \'%s\' which is associated with a ' |
| 3606 | 'closed codereview issue, so archive cannot proceed. Please ' |
| 3607 | 'checkout another branch and run this command again.' % |
| 3608 | current_branch) |
| 3609 | return 1 |
kmarshall | 9249e01 | 2016-08-23 12:02:16 -0700 | [diff] [blame] | 3610 | elif not options.force: |
sergiyb | 4a5ecbe | 2016-06-20 09:46:00 -0700 | [diff] [blame] | 3611 | answer = ask_for_data('\nProceed with deletion (Y/n)? ').lower() |
| 3612 | if answer not in ('y', ''): |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3613 | print('Aborted.') |
kmarshall | 3bff56b | 2016-06-06 18:31:47 -0700 | [diff] [blame] | 3614 | return 1 |
| 3615 | |
| 3616 | for branch, tagname in proposal: |
kmarshall | 9249e01 | 2016-08-23 12:02:16 -0700 | [diff] [blame] | 3617 | if not options.notags: |
| 3618 | RunGit(['tag', tagname, branch]) |
kmarshall | 3bff56b | 2016-06-06 18:31:47 -0700 | [diff] [blame] | 3619 | RunGit(['branch', '-D', branch]) |
kmarshall | 9249e01 | 2016-08-23 12:02:16 -0700 | [diff] [blame] | 3620 | |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3621 | print('\nJob\'s done!') |
kmarshall | 3bff56b | 2016-06-06 18:31:47 -0700 | [diff] [blame] | 3622 | |
| 3623 | return 0 |
| 3624 | |
| 3625 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3626 | def CMDstatus(parser, args): |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 3627 | """Show status of changelists. |
| 3628 | |
| 3629 | Colors are used to tell the state of the CL unless --fast is used: |
jsbell@chromium.org | aeab41a | 2013-12-10 20:01:22 +0000 | [diff] [blame] | 3630 | - Red not sent for review or broken |
| 3631 | - Blue waiting for review |
| 3632 | - Yellow waiting for you to reply to review |
| 3633 | - Green LGTM'ed |
| 3634 | - Magenta in the commit queue |
| 3635 | - Cyan was committed, branch can be deleted |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 3636 | |
| 3637 | Also see 'git cl comments'. |
| 3638 | """ |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3639 | parser.add_option('--field', |
phajdan.jr | 289d03e | 2016-08-16 08:21:06 -0700 | [diff] [blame] | 3640 | help='print only specific field (desc|id|patch|status|url)') |
maruel@chromium.org | 1033efd | 2013-07-23 23:25:09 +0000 | [diff] [blame] | 3641 | parser.add_option('-f', '--fast', action='store_true', |
| 3642 | help='Do not retrieve review status') |
calamity@chromium.org | ffde55c | 2015-03-12 00:44:17 +0000 | [diff] [blame] | 3643 | parser.add_option( |
| 3644 | '-j', '--maxjobs', action='store', type=int, |
| 3645 | help='The maximum number of jobs to use when retrieving review status') |
vadimsh@chromium.org | cf6a5d2 | 2015-04-09 22:02:00 +0000 | [diff] [blame] | 3646 | |
| 3647 | auth.add_auth_options(parser) |
iannucci | e53c935 | 2016-08-17 14:40:40 -0700 | [diff] [blame] | 3648 | _add_codereview_issue_select_options( |
| 3649 | parser, 'Must be in conjunction with --field.') |
vadimsh@chromium.org | cf6a5d2 | 2015-04-09 22:02:00 +0000 | [diff] [blame] | 3650 | options, args = parser.parse_args(args) |
iannucci | e53c935 | 2016-08-17 14:40:40 -0700 | [diff] [blame] | 3651 | _process_codereview_issue_select_options(parser, options) |
maruel@chromium.org | 39c0b22 | 2013-08-17 16:57:01 +0000 | [diff] [blame] | 3652 | if args: |
| 3653 | parser.error('Unsupported args: %s' % args) |
vadimsh@chromium.org | cf6a5d2 | 2015-04-09 22:02:00 +0000 | [diff] [blame] | 3654 | auth_config = auth.extract_auth_config_from_options(options) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3655 | |
iannucci | e53c935 | 2016-08-17 14:40:40 -0700 | [diff] [blame] | 3656 | if options.issue is not None and not options.field: |
| 3657 | parser.error('--field must be specified with --issue') |
iannucci | 3c972b9 | 2016-08-17 13:24:10 -0700 | [diff] [blame] | 3658 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3659 | if options.field: |
iannucci | 3c972b9 | 2016-08-17 13:24:10 -0700 | [diff] [blame] | 3660 | cl = Changelist(auth_config=auth_config, issue=options.issue, |
| 3661 | codereview=options.forced_codereview) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3662 | if options.field.startswith('desc'): |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3663 | print(cl.GetDescription()) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3664 | elif options.field == 'id': |
| 3665 | issueid = cl.GetIssue() |
| 3666 | if issueid: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3667 | print(issueid) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3668 | elif options.field == 'patch': |
| 3669 | patchset = cl.GetPatchset() |
| 3670 | if patchset: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3671 | print(patchset) |
phajdan.jr | 289d03e | 2016-08-16 08:21:06 -0700 | [diff] [blame] | 3672 | elif options.field == 'status': |
| 3673 | print(cl.GetStatus()) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3674 | elif options.field == 'url': |
| 3675 | url = cl.GetIssueURL() |
| 3676 | if url: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3677 | print(url) |
maruel@chromium.org | e25c75b | 2013-07-23 18:30:56 +0000 | [diff] [blame] | 3678 | return 0 |
| 3679 | |
| 3680 | branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads']) |
| 3681 | if not branches: |
| 3682 | print('No local branch found.') |
| 3683 | return 0 |
| 3684 | |
clemensh@chromium.org | cbd7dc3 | 2016-05-31 10:33:50 +0000 | [diff] [blame] | 3685 | changes = [ |
vadimsh@chromium.org | cf6a5d2 | 2015-04-09 22:02:00 +0000 | [diff] [blame] | 3686 | Changelist(branchref=b, auth_config=auth_config) |
clemensh@chromium.org | cbd7dc3 | 2016-05-31 10:33:50 +0000 | [diff] [blame] | 3687 | for b in branches.splitlines()] |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3688 | print('Branches associated with reviews:') |
clemensh@chromium.org | cbd7dc3 | 2016-05-31 10:33:50 +0000 | [diff] [blame] | 3689 | output = get_cl_statuses(changes, |
calamity@chromium.org | ffde55c | 2015-03-12 00:44:17 +0000 | [diff] [blame] | 3690 | fine_grained=not options.fast, |
clemensh@chromium.org | cbd7dc3 | 2016-05-31 10:33:50 +0000 | [diff] [blame] | 3691 | max_processes=options.maxjobs) |
maruel@chromium.org | 1033efd | 2013-07-23 23:25:09 +0000 | [diff] [blame] | 3692 | |
calamity@chromium.org | ffde55c | 2015-03-12 00:44:17 +0000 | [diff] [blame] | 3693 | branch_statuses = {} |
clemensh@chromium.org | cbd7dc3 | 2016-05-31 10:33:50 +0000 | [diff] [blame] | 3694 | alignment = max(5, max(len(ShortBranchName(c.GetBranch())) for c in changes)) |
| 3695 | for cl in sorted(changes, key=lambda c: c.GetBranch()): |
| 3696 | branch = cl.GetBranch() |
calamity@chromium.org | ffde55c | 2015-03-12 00:44:17 +0000 | [diff] [blame] | 3697 | while branch not in branch_statuses: |
clemensh@chromium.org | cbd7dc3 | 2016-05-31 10:33:50 +0000 | [diff] [blame] | 3698 | c, status = output.next() |
| 3699 | branch_statuses[c.GetBranch()] = status |
| 3700 | status = branch_statuses.pop(branch) |
| 3701 | url = cl.GetIssueURL() |
| 3702 | if url and (not status or status == 'error'): |
| 3703 | # The issue probably doesn't exist anymore. |
| 3704 | url += ' (broken)' |
| 3705 | |
nodir@chromium.org | a6de1f4 | 2015-06-10 04:23:17 +0000 | [diff] [blame] | 3706 | color = color_for_status(status) |
maruel@chromium.org | 885f651 | 2013-07-27 02:17:26 +0000 | [diff] [blame] | 3707 | reset = Fore.RESET |
iannucci@chromium.org | 596cd5c | 2016-04-04 21:34:39 +0000 | [diff] [blame] | 3708 | if not setup_color.IS_TTY: |
maruel@chromium.org | 885f651 | 2013-07-27 02:17:26 +0000 | [diff] [blame] | 3709 | color = '' |
| 3710 | reset = '' |
nodir@chromium.org | a6de1f4 | 2015-06-10 04:23:17 +0000 | [diff] [blame] | 3711 | status_str = '(%s)' % status if status else '' |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3712 | print(' %*s : %s%s %s%s' % ( |
clemensh@chromium.org | cbd7dc3 | 2016-05-31 10:33:50 +0000 | [diff] [blame] | 3713 | alignment, ShortBranchName(branch), color, url, |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3714 | status_str, reset)) |
maruel@chromium.org | 1033efd | 2013-07-23 23:25:09 +0000 | [diff] [blame] | 3715 | |
vadimsh@chromium.org | cf6a5d2 | 2015-04-09 22:02:00 +0000 | [diff] [blame] | 3716 | cl = Changelist(auth_config=auth_config) |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3717 | print() |
| 3718 | print('Current branch:',) |
| 3719 | print(cl.GetBranch()) |
dpranke@chromium.org | ee87f58 | 2015-07-31 18:46:25 +0000 | [diff] [blame] | 3720 | if not cl.GetIssue(): |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3721 | print('No issue assigned.') |
dpranke@chromium.org | ee87f58 | 2015-07-31 18:46:25 +0000 | [diff] [blame] | 3722 | return 0 |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3723 | print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL())) |
maruel@chromium.org | 85616e0 | 2014-07-28 15:37:55 +0000 | [diff] [blame] | 3724 | if not options.fast: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3725 | print('Issue description:') |
| 3726 | print(cl.GetDescription(pretty=True)) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3727 | return 0 |
| 3728 | |
| 3729 | |
maruel@chromium.org | 39c0b22 | 2013-08-17 16:57:01 +0000 | [diff] [blame] | 3730 | def colorize_CMDstatus_doc(): |
| 3731 | """To be called once in main() to add colors to git cl status help.""" |
| 3732 | colors = [i for i in dir(Fore) if i[0].isupper()] |
| 3733 | |
| 3734 | def colorize_line(line): |
| 3735 | for color in colors: |
| 3736 | if color in line.upper(): |
| 3737 | # Extract whitespaces first and the leading '-'. |
| 3738 | indent = len(line) - len(line.lstrip(' ')) + 1 |
| 3739 | return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET |
| 3740 | return line |
| 3741 | |
| 3742 | lines = CMDstatus.__doc__.splitlines() |
| 3743 | CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines) |
| 3744 | |
| 3745 | |
phajdan.jr | e328cf9 | 2016-08-22 04:12:17 -0700 | [diff] [blame] | 3746 | def write_json(path, contents): |
| 3747 | with open(path, 'w') as f: |
| 3748 | json.dump(contents, f) |
| 3749 | |
| 3750 | |
maruel@chromium.org | 0633fb4 | 2013-08-16 20:06:14 +0000 | [diff] [blame] | 3751 | @subcommand.usage('[issue_number]') |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3752 | def CMDissue(parser, args): |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 3753 | """Sets or displays the current code review issue number. |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3754 | |
| 3755 | Pass issue number 0 to clear the current issue. |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 3756 | """ |
dnj@chromium.org | 406c440 | 2015-03-03 17:22:28 +0000 | [diff] [blame] | 3757 | parser.add_option('-r', '--reverse', action='store_true', |
| 3758 | help='Lookup the branch(es) for the specified issues. If ' |
| 3759 | 'no issues are specified, all branches with mapped ' |
| 3760 | 'issues will be listed.') |
phajdan.jr | e328cf9 | 2016-08-22 04:12:17 -0700 | [diff] [blame] | 3761 | parser.add_option('--json', help='Path to JSON output file.') |
tandrii@chromium.org | dde6462 | 2016-04-13 17:11:21 +0000 | [diff] [blame] | 3762 | _add_codereview_select_options(parser) |
dnj@chromium.org | 406c440 | 2015-03-03 17:22:28 +0000 | [diff] [blame] | 3763 | options, args = parser.parse_args(args) |
tandrii@chromium.org | dde6462 | 2016-04-13 17:11:21 +0000 | [diff] [blame] | 3764 | _process_codereview_select_options(parser, options) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3765 | |
dnj@chromium.org | 406c440 | 2015-03-03 17:22:28 +0000 | [diff] [blame] | 3766 | if options.reverse: |
| 3767 | branches = RunGit(['for-each-ref', 'refs/heads', |
| 3768 | '--format=%(refname:short)']).splitlines() |
| 3769 | |
| 3770 | # Reverse issue lookup. |
| 3771 | issue_branch_map = {} |
| 3772 | for branch in branches: |
| 3773 | cl = Changelist(branchref=branch) |
| 3774 | issue_branch_map.setdefault(cl.GetIssue(), []).append(branch) |
| 3775 | if not args: |
| 3776 | args = sorted(issue_branch_map.iterkeys()) |
phajdan.jr | e328cf9 | 2016-08-22 04:12:17 -0700 | [diff] [blame] | 3777 | result = {} |
dnj@chromium.org | 406c440 | 2015-03-03 17:22:28 +0000 | [diff] [blame] | 3778 | for issue in args: |
| 3779 | if not issue: |
| 3780 | continue |
phajdan.jr | e328cf9 | 2016-08-22 04:12:17 -0700 | [diff] [blame] | 3781 | result[int(issue)] = issue_branch_map.get(int(issue)) |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3782 | print('Branch for issue number %s: %s' % ( |
| 3783 | issue, ', '.join(issue_branch_map.get(int(issue)) or ('None',)))) |
phajdan.jr | e328cf9 | 2016-08-22 04:12:17 -0700 | [diff] [blame] | 3784 | if options.json: |
| 3785 | write_json(options.json, result) |
dnj@chromium.org | 406c440 | 2015-03-03 17:22:28 +0000 | [diff] [blame] | 3786 | else: |
tandrii@chromium.org | dde6462 | 2016-04-13 17:11:21 +0000 | [diff] [blame] | 3787 | cl = Changelist(codereview=options.forced_codereview) |
dnj@chromium.org | 406c440 | 2015-03-03 17:22:28 +0000 | [diff] [blame] | 3788 | if len(args) > 0: |
| 3789 | try: |
| 3790 | issue = int(args[0]) |
| 3791 | except ValueError: |
| 3792 | DieWithError('Pass a number to set the issue or none to list it.\n' |
tandrii@chromium.org | 8930b3d | 2016-04-13 14:47:02 +0000 | [diff] [blame] | 3793 | 'Maybe you want to run git cl status?') |
dnj@chromium.org | 406c440 | 2015-03-03 17:22:28 +0000 | [diff] [blame] | 3794 | cl.SetIssue(issue) |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3795 | print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL())) |
phajdan.jr | e328cf9 | 2016-08-22 04:12:17 -0700 | [diff] [blame] | 3796 | if options.json: |
| 3797 | write_json(options.json, { |
| 3798 | 'issue': cl.GetIssue(), |
| 3799 | 'issue_url': cl.GetIssueURL(), |
| 3800 | }) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3801 | return 0 |
| 3802 | |
| 3803 | |
maruel@chromium.org | 9977a2e | 2012-06-06 22:30:56 +0000 | [diff] [blame] | 3804 | def CMDcomments(parser, args): |
apavlov@chromium.org | e4efd51 | 2014-11-05 09:05:29 +0000 | [diff] [blame] | 3805 | """Shows or posts review comments for any changelist.""" |
| 3806 | parser.add_option('-a', '--add-comment', dest='comment', |
| 3807 | help='comment to add to an issue') |
| 3808 | parser.add_option('-i', dest='issue', |
| 3809 | help="review issue id (defaults to current issue)") |
smut@google.com | c85ac94 | 2015-09-15 16:34:43 +0000 | [diff] [blame] | 3810 | parser.add_option('-j', '--json-file', |
| 3811 | help='File to write JSON summary to') |
vadimsh@chromium.org | cf6a5d2 | 2015-04-09 22:02:00 +0000 | [diff] [blame] | 3812 | auth.add_auth_options(parser) |
apavlov@chromium.org | e4efd51 | 2014-11-05 09:05:29 +0000 | [diff] [blame] | 3813 | options, args = parser.parse_args(args) |
vadimsh@chromium.org | cf6a5d2 | 2015-04-09 22:02:00 +0000 | [diff] [blame] | 3814 | auth_config = auth.extract_auth_config_from_options(options) |
maruel@chromium.org | 9977a2e | 2012-06-06 22:30:56 +0000 | [diff] [blame] | 3815 | |
apavlov@chromium.org | e4efd51 | 2014-11-05 09:05:29 +0000 | [diff] [blame] | 3816 | issue = None |
| 3817 | if options.issue: |
| 3818 | try: |
| 3819 | issue = int(options.issue) |
| 3820 | except ValueError: |
| 3821 | DieWithError('A review issue id is expected to be a number') |
| 3822 | |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 3823 | cl = Changelist(issue=issue, codereview='rietveld', auth_config=auth_config) |
apavlov@chromium.org | e4efd51 | 2014-11-05 09:05:29 +0000 | [diff] [blame] | 3824 | |
| 3825 | if options.comment: |
| 3826 | cl.AddComment(options.comment) |
| 3827 | return 0 |
| 3828 | |
| 3829 | data = cl.GetIssueProperties() |
smut@google.com | c85ac94 | 2015-09-15 16:34:43 +0000 | [diff] [blame] | 3830 | summary = [] |
maruel@chromium.org | 5cab2d3 | 2014-11-11 18:32:41 +0000 | [diff] [blame] | 3831 | for message in sorted(data.get('messages', []), key=lambda x: x['date']): |
smut@google.com | c85ac94 | 2015-09-15 16:34:43 +0000 | [diff] [blame] | 3832 | summary.append({ |
| 3833 | 'date': message['date'], |
| 3834 | 'lgtm': False, |
| 3835 | 'message': message['text'], |
| 3836 | 'not_lgtm': False, |
| 3837 | 'sender': message['sender'], |
| 3838 | }) |
apavlov@chromium.org | e4efd51 | 2014-11-05 09:05:29 +0000 | [diff] [blame] | 3839 | if message['disapproval']: |
| 3840 | color = Fore.RED |
smut@google.com | c85ac94 | 2015-09-15 16:34:43 +0000 | [diff] [blame] | 3841 | summary[-1]['not lgtm'] = True |
apavlov@chromium.org | e4efd51 | 2014-11-05 09:05:29 +0000 | [diff] [blame] | 3842 | elif message['approval']: |
| 3843 | color = Fore.GREEN |
smut@google.com | c85ac94 | 2015-09-15 16:34:43 +0000 | [diff] [blame] | 3844 | summary[-1]['lgtm'] = True |
apavlov@chromium.org | e4efd51 | 2014-11-05 09:05:29 +0000 | [diff] [blame] | 3845 | elif message['sender'] == data['owner_email']: |
| 3846 | color = Fore.MAGENTA |
| 3847 | else: |
| 3848 | color = Fore.BLUE |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3849 | print('\n%s%s %s%s' % ( |
apavlov@chromium.org | e4efd51 | 2014-11-05 09:05:29 +0000 | [diff] [blame] | 3850 | color, message['date'].split('.', 1)[0], message['sender'], |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3851 | Fore.RESET)) |
apavlov@chromium.org | e4efd51 | 2014-11-05 09:05:29 +0000 | [diff] [blame] | 3852 | if message['text'].strip(): |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3853 | print('\n'.join(' ' + l for l in message['text'].splitlines())) |
smut@google.com | c85ac94 | 2015-09-15 16:34:43 +0000 | [diff] [blame] | 3854 | if options.json_file: |
| 3855 | with open(options.json_file, 'wb') as f: |
| 3856 | json.dump(summary, f) |
maruel@chromium.org | 9977a2e | 2012-06-06 22:30:56 +0000 | [diff] [blame] | 3857 | return 0 |
| 3858 | |
| 3859 | |
martiniss@chromium.org | 2b55fe3 | 2016-04-26 20:28:54 +0000 | [diff] [blame] | 3860 | @subcommand.usage('[codereview url or issue id]') |
rsesek@chromium.org | eec7659 | 2013-05-20 16:27:57 +0000 | [diff] [blame] | 3861 | def CMDdescription(parser, args): |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 3862 | """Brings up the editor for the current CL's description.""" |
smut@google.com | 34fb6b1 | 2015-07-13 20:03:26 +0000 | [diff] [blame] | 3863 | parser.add_option('-d', '--display', action='store_true', |
| 3864 | help='Display the description instead of opening an editor') |
martiniss@chromium.org | d6648e2 | 2016-04-29 19:22:16 +0000 | [diff] [blame] | 3865 | parser.add_option('-n', '--new-description', |
dnj | ba1b0f3 | 2016-09-02 12:37:42 -0700 | [diff] [blame] | 3866 | help='New description to set for this issue (- for stdin, ' |
| 3867 | '+ to load from local commit HEAD)') |
dsansome | e2d6fd9 | 2016-09-08 00:10:47 -0700 | [diff] [blame] | 3868 | parser.add_option('-f', '--force', action='store_true', |
| 3869 | help='Delete any unpublished Gerrit edits for this issue ' |
| 3870 | 'without prompting') |
martiniss@chromium.org | 2b55fe3 | 2016-04-26 20:28:54 +0000 | [diff] [blame] | 3871 | |
| 3872 | _add_codereview_select_options(parser) |
vadimsh@chromium.org | cf6a5d2 | 2015-04-09 22:02:00 +0000 | [diff] [blame] | 3873 | auth.add_auth_options(parser) |
martiniss@chromium.org | 2b55fe3 | 2016-04-26 20:28:54 +0000 | [diff] [blame] | 3874 | options, args = parser.parse_args(args) |
| 3875 | _process_codereview_select_options(parser, options) |
| 3876 | |
| 3877 | target_issue = None |
| 3878 | if len(args) > 0: |
martiniss | 6eda05f | 2016-06-30 10:18:35 -0700 | [diff] [blame] | 3879 | target_issue = ParseIssueNumberArgument(args[0]) |
| 3880 | if not target_issue.valid: |
martiniss@chromium.org | 2b55fe3 | 2016-04-26 20:28:54 +0000 | [diff] [blame] | 3881 | parser.print_help() |
| 3882 | return 1 |
martiniss@chromium.org | 2b55fe3 | 2016-04-26 20:28:54 +0000 | [diff] [blame] | 3883 | |
vadimsh@chromium.org | cf6a5d2 | 2015-04-09 22:02:00 +0000 | [diff] [blame] | 3884 | auth_config = auth.extract_auth_config_from_options(options) |
martiniss@chromium.org | 2b55fe3 | 2016-04-26 20:28:54 +0000 | [diff] [blame] | 3885 | |
martiniss | 6eda05f | 2016-06-30 10:18:35 -0700 | [diff] [blame] | 3886 | kwargs = { |
| 3887 | 'auth_config': auth_config, |
| 3888 | 'codereview': options.forced_codereview, |
| 3889 | } |
| 3890 | if target_issue: |
| 3891 | kwargs['issue'] = target_issue.issue |
| 3892 | if options.forced_codereview == 'rietveld': |
| 3893 | kwargs['rietveld_server'] = target_issue.hostname |
| 3894 | |
| 3895 | cl = Changelist(**kwargs) |
martiniss@chromium.org | 2b55fe3 | 2016-04-26 20:28:54 +0000 | [diff] [blame] | 3896 | |
rsesek@chromium.org | eec7659 | 2013-05-20 16:27:57 +0000 | [diff] [blame] | 3897 | if not cl.GetIssue(): |
| 3898 | DieWithError('This branch has no associated changelist.') |
| 3899 | description = ChangeDescription(cl.GetDescription()) |
martiniss@chromium.org | d6648e2 | 2016-04-29 19:22:16 +0000 | [diff] [blame] | 3900 | |
smut@google.com | 34fb6b1 | 2015-07-13 20:03:26 +0000 | [diff] [blame] | 3901 | if options.display: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3902 | print(description.description) |
smut@google.com | 34fb6b1 | 2015-07-13 20:03:26 +0000 | [diff] [blame] | 3903 | return 0 |
martiniss@chromium.org | d6648e2 | 2016-04-29 19:22:16 +0000 | [diff] [blame] | 3904 | |
| 3905 | if options.new_description: |
| 3906 | text = options.new_description |
| 3907 | if text == '-': |
| 3908 | text = '\n'.join(l.rstrip() for l in sys.stdin) |
dnj | ba1b0f3 | 2016-09-02 12:37:42 -0700 | [diff] [blame] | 3909 | elif text == '+': |
| 3910 | base_branch = cl.GetCommonAncestorWithUpstream() |
| 3911 | change = cl.GetChange(base_branch, None, local_description=True) |
| 3912 | text = change.FullDescriptionText() |
martiniss@chromium.org | d6648e2 | 2016-04-29 19:22:16 +0000 | [diff] [blame] | 3913 | |
| 3914 | description.set_description(text) |
| 3915 | else: |
| 3916 | description.prompt() |
| 3917 | |
wychen@chromium.org | 063e4e5 | 2015-04-03 06:51:44 +0000 | [diff] [blame] | 3918 | if cl.GetDescription() != description.description: |
dsansome | e2d6fd9 | 2016-09-08 00:10:47 -0700 | [diff] [blame] | 3919 | cl.UpdateDescription(description.description, force=options.force) |
rsesek@chromium.org | eec7659 | 2013-05-20 16:27:57 +0000 | [diff] [blame] | 3920 | return 0 |
| 3921 | |
| 3922 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3923 | def CreateDescriptionFromLog(args): |
| 3924 | """Pulls out the commit log to use as a base for the CL description.""" |
| 3925 | log_args = [] |
| 3926 | if len(args) == 1 and not args[0].endswith('.'): |
| 3927 | log_args = [args[0] + '..'] |
| 3928 | elif len(args) == 1 and args[0].endswith('...'): |
| 3929 | log_args = [args[0][:-1]] |
| 3930 | elif len(args) == 2: |
| 3931 | log_args = [args[0] + '..' + args[1]] |
| 3932 | else: |
| 3933 | log_args = args[:] # Hope for the best! |
maruel@chromium.org | 373af80 | 2012-05-25 21:07:33 +0000 | [diff] [blame] | 3934 | return RunGit(['log', '--pretty=format:%s\n\n%b'] + log_args) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3935 | |
| 3936 | |
thestig@chromium.org | 44202a2 | 2014-03-11 19:22:18 +0000 | [diff] [blame] | 3937 | def CMDlint(parser, args): |
| 3938 | """Runs cpplint on the current changelist.""" |
tzik@chromium.org | f204d4b | 2014-03-13 07:40:55 +0000 | [diff] [blame] | 3939 | parser.add_option('--filter', action='append', metavar='-x,+y', |
| 3940 | help='Comma-separated list of cpplint\'s category-filters') |
vadimsh@chromium.org | cf6a5d2 | 2015-04-09 22:02:00 +0000 | [diff] [blame] | 3941 | auth.add_auth_options(parser) |
| 3942 | options, args = parser.parse_args(args) |
| 3943 | auth_config = auth.extract_auth_config_from_options(options) |
thestig@chromium.org | 44202a2 | 2014-03-11 19:22:18 +0000 | [diff] [blame] | 3944 | |
| 3945 | # Access to a protected member _XX of a client class |
| 3946 | # pylint: disable=W0212 |
| 3947 | try: |
| 3948 | import cpplint |
| 3949 | import cpplint_chromium |
| 3950 | except ImportError: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3951 | print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.') |
thestig@chromium.org | 44202a2 | 2014-03-11 19:22:18 +0000 | [diff] [blame] | 3952 | return 1 |
| 3953 | |
| 3954 | # Change the current working directory before calling lint so that it |
| 3955 | # shows the correct base. |
| 3956 | previous_cwd = os.getcwd() |
| 3957 | os.chdir(settings.GetRoot()) |
| 3958 | try: |
vadimsh@chromium.org | cf6a5d2 | 2015-04-09 22:02:00 +0000 | [diff] [blame] | 3959 | cl = Changelist(auth_config=auth_config) |
thestig@chromium.org | 44202a2 | 2014-03-11 19:22:18 +0000 | [diff] [blame] | 3960 | change = cl.GetChange(cl.GetCommonAncestorWithUpstream(), None) |
| 3961 | files = [f.LocalPath() for f in change.AffectedFiles()] |
thestig@chromium.org | 5839eb5 | 2014-05-30 16:20:51 +0000 | [diff] [blame] | 3962 | if not files: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3963 | print('Cannot lint an empty CL') |
thestig@chromium.org | 5839eb5 | 2014-05-30 16:20:51 +0000 | [diff] [blame] | 3964 | return 1 |
thestig@chromium.org | 44202a2 | 2014-03-11 19:22:18 +0000 | [diff] [blame] | 3965 | |
| 3966 | # Process cpplints arguments if any. |
tzik@chromium.org | f204d4b | 2014-03-13 07:40:55 +0000 | [diff] [blame] | 3967 | command = args + files |
| 3968 | if options.filter: |
| 3969 | command = ['--filter=' + ','.join(options.filter)] + command |
| 3970 | filenames = cpplint.ParseArguments(command) |
thestig@chromium.org | 44202a2 | 2014-03-11 19:22:18 +0000 | [diff] [blame] | 3971 | |
| 3972 | white_regex = re.compile(settings.GetLintRegex()) |
| 3973 | black_regex = re.compile(settings.GetLintIgnoreRegex()) |
| 3974 | extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace] |
| 3975 | for filename in filenames: |
| 3976 | if white_regex.match(filename): |
| 3977 | if black_regex.match(filename): |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3978 | print('Ignoring file %s' % filename) |
thestig@chromium.org | 44202a2 | 2014-03-11 19:22:18 +0000 | [diff] [blame] | 3979 | else: |
| 3980 | cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level, |
| 3981 | extra_check_functions) |
| 3982 | else: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3983 | print('Skipping file %s' % filename) |
thestig@chromium.org | 44202a2 | 2014-03-11 19:22:18 +0000 | [diff] [blame] | 3984 | finally: |
| 3985 | os.chdir(previous_cwd) |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3986 | print('Total errors found: %d\n' % cpplint._cpplint_state.error_count) |
thestig@chromium.org | 44202a2 | 2014-03-11 19:22:18 +0000 | [diff] [blame] | 3987 | if cpplint._cpplint_state.error_count != 0: |
| 3988 | return 1 |
| 3989 | return 0 |
| 3990 | |
| 3991 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3992 | def CMDpresubmit(parser, args): |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 3993 | """Runs presubmit tests on the current changelist.""" |
ilevy@chromium.org | 375a902 | 2013-01-07 01:12:05 +0000 | [diff] [blame] | 3994 | parser.add_option('-u', '--upload', action='store_true', |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3995 | help='Run upload hook instead of the push/dcommit hook') |
ilevy@chromium.org | 375a902 | 2013-01-07 01:12:05 +0000 | [diff] [blame] | 3996 | parser.add_option('-f', '--force', action='store_true', |
sbc@chromium.org | 495ad15 | 2012-09-04 23:07:42 +0000 | [diff] [blame] | 3997 | help='Run checks even if tree is dirty') |
vadimsh@chromium.org | cf6a5d2 | 2015-04-09 22:02:00 +0000 | [diff] [blame] | 3998 | auth.add_auth_options(parser) |
| 3999 | options, args = parser.parse_args(args) |
| 4000 | auth_config = auth.extract_auth_config_from_options(options) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4001 | |
sbc@chromium.org | 71437c0 | 2015-04-09 19:29:40 +0000 | [diff] [blame] | 4002 | if not options.force and git_common.is_dirty_git_tree('presubmit'): |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 4003 | print('use --force to check even if tree is dirty.') |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4004 | return 1 |
| 4005 | |
vadimsh@chromium.org | cf6a5d2 | 2015-04-09 22:02:00 +0000 | [diff] [blame] | 4006 | cl = Changelist(auth_config=auth_config) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4007 | if args: |
| 4008 | base_branch = args[0] |
| 4009 | else: |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 4010 | # Default to diffing against the common ancestor of the upstream branch. |
thestig@chromium.org | 8b0553c | 2014-02-11 00:33:37 +0000 | [diff] [blame] | 4011 | base_branch = cl.GetCommonAncestorWithUpstream() |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4012 | |
ilevy@chromium.org | 051ad0e | 2013-03-04 21:57:34 +0000 | [diff] [blame] | 4013 | cl.RunHook( |
| 4014 | committing=not options.upload, |
| 4015 | may_prompt=False, |
| 4016 | verbose=options.verbose, |
| 4017 | change=cl.GetChange(base_branch, None)) |
dpranke@chromium.org | 0a2bb37 | 2011-03-25 01:16:22 +0000 | [diff] [blame] | 4018 | return 0 |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4019 | |
| 4020 | |
tandrii@chromium.org | 65874e1 | 2016-03-04 12:03:02 +0000 | [diff] [blame] | 4021 | def GenerateGerritChangeId(message): |
| 4022 | """Returns Ixxxxxx...xxx change id. |
| 4023 | |
| 4024 | Works the same way as |
| 4025 | https://gerrit-review.googlesource.com/tools/hooks/commit-msg |
| 4026 | but can be called on demand on all platforms. |
| 4027 | |
| 4028 | The basic idea is to generate git hash of a state of the tree, original commit |
| 4029 | message, author/committer info and timestamps. |
| 4030 | """ |
| 4031 | lines = [] |
| 4032 | tree_hash = RunGitSilent(['write-tree']) |
| 4033 | lines.append('tree %s' % tree_hash.strip()) |
| 4034 | code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False) |
| 4035 | if code == 0: |
| 4036 | lines.append('parent %s' % parent.strip()) |
| 4037 | author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT']) |
| 4038 | lines.append('author %s' % author.strip()) |
| 4039 | committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT']) |
| 4040 | lines.append('committer %s' % committer.strip()) |
| 4041 | lines.append('') |
| 4042 | # Note: Gerrit's commit-hook actually cleans message of some lines and |
| 4043 | # whitespace. This code is not doing this, but it clearly won't decrease |
| 4044 | # entropy. |
| 4045 | lines.append(message) |
| 4046 | change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'], |
| 4047 | stdin='\n'.join(lines)) |
| 4048 | return 'I%s' % change_hash.strip() |
| 4049 | |
| 4050 | |
wittman@chromium.org | 455dc92 | 2015-01-26 20:15:50 +0000 | [diff] [blame] | 4051 | def GetTargetRef(remote, remote_branch, target_branch, pending_prefix): |
| 4052 | """Computes the remote branch ref to use for the CL. |
| 4053 | |
| 4054 | Args: |
| 4055 | remote (str): The git remote for the CL. |
| 4056 | remote_branch (str): The git remote branch for the CL. |
| 4057 | target_branch (str): The target branch specified by the user. |
| 4058 | pending_prefix (str): The pending prefix from the settings. |
| 4059 | """ |
| 4060 | if not (remote and remote_branch): |
| 4061 | return None |
bauerb@chromium.org | 27386dd | 2015-02-16 10:45:39 +0000 | [diff] [blame] | 4062 | |
wittman@chromium.org | 455dc92 | 2015-01-26 20:15:50 +0000 | [diff] [blame] | 4063 | if target_branch: |
| 4064 | # Cannonicalize branch references to the equivalent local full symbolic |
| 4065 | # refs, which are then translated into the remote full symbolic refs |
| 4066 | # below. |
| 4067 | if '/' not in target_branch: |
| 4068 | remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch) |
| 4069 | else: |
| 4070 | prefix_replacements = ( |
| 4071 | ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'), |
| 4072 | ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote), |
| 4073 | ('^(refs/)?heads/', 'refs/remotes/%s/' % remote), |
| 4074 | ) |
| 4075 | match = None |
| 4076 | for regex, replacement in prefix_replacements: |
| 4077 | match = re.search(regex, target_branch) |
| 4078 | if match: |
| 4079 | remote_branch = target_branch.replace(match.group(0), replacement) |
| 4080 | break |
| 4081 | if not match: |
| 4082 | # This is a branch path but not one we recognize; use as-is. |
| 4083 | remote_branch = target_branch |
rmistry@google.com | c68112d | 2015-03-03 12:48:06 +0000 | [diff] [blame] | 4084 | elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS: |
| 4085 | # Handle the refs that need to land in different refs. |
| 4086 | remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch] |
bauerb@chromium.org | 27386dd | 2015-02-16 10:45:39 +0000 | [diff] [blame] | 4087 | |
wittman@chromium.org | 455dc92 | 2015-01-26 20:15:50 +0000 | [diff] [blame] | 4088 | # Create the true path to the remote branch. |
| 4089 | # Does the following translation: |
| 4090 | # * refs/remotes/origin/refs/diff/test -> refs/diff/test |
| 4091 | # * refs/remotes/origin/master -> refs/heads/master |
| 4092 | # * refs/remotes/branch-heads/test -> refs/branch-heads/test |
| 4093 | if remote_branch.startswith('refs/remotes/%s/refs/' % remote): |
| 4094 | remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '') |
| 4095 | elif remote_branch.startswith('refs/remotes/%s/' % remote): |
| 4096 | remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, |
| 4097 | 'refs/heads/') |
| 4098 | elif remote_branch.startswith('refs/remotes/branch-heads'): |
| 4099 | remote_branch = remote_branch.replace('refs/remotes/', 'refs/') |
| 4100 | # If a pending prefix exists then replace refs/ with it. |
| 4101 | if pending_prefix: |
| 4102 | remote_branch = remote_branch.replace('refs/', pending_prefix) |
| 4103 | return remote_branch |
| 4104 | |
| 4105 | |
maruel@chromium.org | eb52a5c | 2013-04-10 23:17:09 +0000 | [diff] [blame] | 4106 | def cleanup_list(l): |
| 4107 | """Fixes a list so that comma separated items are put as individual items. |
| 4108 | |
| 4109 | So that "--reviewers joe@c,john@c --reviewers joa@c" results in |
| 4110 | options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']). |
| 4111 | """ |
| 4112 | items = sum((i.split(',') for i in l), []) |
| 4113 | stripped_items = (i.strip() for i in items) |
| 4114 | return sorted(filter(None, stripped_items)) |
| 4115 | |
| 4116 | |
maruel@chromium.org | 0633fb4 | 2013-08-16 20:06:14 +0000 | [diff] [blame] | 4117 | @subcommand.usage('[args to "git diff"]') |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 4118 | def CMDupload(parser, args): |
rmistry@google.com | 78948ed | 2015-07-08 23:09:57 +0000 | [diff] [blame] | 4119 | """Uploads the current changelist to codereview. |
| 4120 | |
| 4121 | Can skip dependency patchset uploads for a branch by running: |
| 4122 | git config branch.branch_name.skip-deps-uploads True |
| 4123 | To unset run: |
| 4124 | git config --unset branch.branch_name.skip-deps-uploads |
| 4125 | Can also set the above globally by using the --global flag. |
| 4126 | """ |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 4127 | parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks', |
| 4128 | help='bypass upload presubmit hook') |
brettw@chromium.org | b65c43c | 2013-06-10 22:04:49 +0000 | [diff] [blame] | 4129 | parser.add_option('--bypass-watchlists', action='store_true', |
| 4130 | dest='bypass_watchlists', |
| 4131 | help='bypass watchlists auto CC-ing reviewers') |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 4132 | parser.add_option('-f', action='store_true', dest='force', |
| 4133 | help="force yes to questions (don't prompt)") |
rogerta@chromium.org | 420d3b8 | 2012-05-14 18:41:38 +0000 | [diff] [blame] | 4134 | parser.add_option('-m', dest='message', help='message for patchset') |
tandrii | f9aefb7 | 2016-07-01 09:06:51 -0700 | [diff] [blame] | 4135 | parser.add_option('-b', '--bug', |
| 4136 | help='pre-populate the bug number(s) for this issue. ' |
| 4137 | 'If several, separate with commas') |
tandrii | b80458a | 2016-06-23 12:20:07 -0700 | [diff] [blame] | 4138 | parser.add_option('--message-file', dest='message_file', |
| 4139 | help='file which contains message for patchset') |
andybons@chromium.org | 962f946 | 2016-02-03 20:00:42 +0000 | [diff] [blame] | 4140 | parser.add_option('-t', dest='title', |
| 4141 | help='title for patchset (Rietveld only)') |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 4142 | parser.add_option('-r', '--reviewers', |
maruel@chromium.org | eb52a5c | 2013-04-10 23:17:09 +0000 | [diff] [blame] | 4143 | action='append', default=[], |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 4144 | help='reviewer email addresses') |
| 4145 | parser.add_option('--cc', |
maruel@chromium.org | eb52a5c | 2013-04-10 23:17:09 +0000 | [diff] [blame] | 4146 | action='append', default=[], |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 4147 | help='cc email addresses') |
adamk@chromium.org | 36f4730 | 2013-04-05 01:08:31 +0000 | [diff] [blame] | 4148 | parser.add_option('-s', '--send-mail', action='store_true', |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 4149 | help='send email to reviewer immediately') |
pgervais@chromium.org | b9f2751 | 2014-08-08 15:52:33 +0000 | [diff] [blame] | 4150 | parser.add_option('--emulate_svn_auto_props', |
| 4151 | '--emulate-svn-auto-props', |
| 4152 | action="store_true", |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 4153 | dest="emulate_svn_auto_props", |
| 4154 | help="Emulate Subversion's auto properties feature.") |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 4155 | parser.add_option('-c', '--use-commit-queue', action='store_true', |
| 4156 | help='tell the commit queue to commit this patchset') |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 4157 | parser.add_option('--private', action='store_true', |
| 4158 | help='set the review private (rietveld only)') |
ukai@chromium.org | 8ef7ab2 | 2012-11-28 04:24:52 +0000 | [diff] [blame] | 4159 | parser.add_option('--target_branch', |
pgervais@chromium.org | b9f2751 | 2014-08-08 15:52:33 +0000 | [diff] [blame] | 4160 | '--target-branch', |
wittman@chromium.org | 455dc92 | 2015-01-26 20:15:50 +0000 | [diff] [blame] | 4161 | metavar='TARGET', |
| 4162 | help='Apply CL to remote ref TARGET. ' + |
| 4163 | 'Default: remote branch head, or master') |
bauerb@chromium.org | 27386dd | 2015-02-16 10:45:39 +0000 | [diff] [blame] | 4164 | parser.add_option('--squash', action='store_true', |
| 4165 | help='Squash multiple commits into one (Gerrit only)') |
bauerb@chromium.org | 54b400c | 2016-01-14 10:08:25 +0000 | [diff] [blame] | 4166 | parser.add_option('--no-squash', action='store_true', |
| 4167 | help='Don\'t squash multiple commits into one ' + |
| 4168 | '(Gerrit only)') |
rmistry | 9eadede | 2016-09-19 11:22:43 -0700 | [diff] [blame] | 4169 | parser.add_option('--topic', default=None, |
| 4170 | help='Topic to specify when uploading (Gerrit only)') |
pgervais@chromium.org | 9114137 | 2014-01-09 23:27:20 +0000 | [diff] [blame] | 4171 | parser.add_option('--email', default=None, |
| 4172 | help='email address to use to connect to Rietveld') |
piman@chromium.org | 336f912 | 2014-09-04 02:16:55 +0000 | [diff] [blame] | 4173 | parser.add_option('--tbr-owners', dest='tbr_owners', action='store_true', |
| 4174 | help='add a set of OWNERS to TBR') |
tandrii@chromium.org | d50452a | 2015-11-23 16:38:15 +0000 | [diff] [blame] | 4175 | parser.add_option('-d', '--cq-dry-run', dest='cq_dry_run', |
| 4176 | action='store_true', |
rmistry@google.com | ef96622 | 2015-04-07 11:15:01 +0000 | [diff] [blame] | 4177 | help='Send the patchset to do a CQ dry run right after ' |
| 4178 | 'upload.') |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 4179 | parser.add_option('--dependencies', action='store_true', |
| 4180 | help='Uploads CLs of all the local branches that depend on ' |
| 4181 | 'the current branch') |
pgervais@chromium.org | 9114137 | 2014-01-09 23:27:20 +0000 | [diff] [blame] | 4182 | |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 4183 | orig_args = args |
iannucci@chromium.org | 53937ba | 2012-10-02 18:20:43 +0000 | [diff] [blame] | 4184 | add_git_similarity(parser) |
vadimsh@chromium.org | cf6a5d2 | 2015-04-09 22:02:00 +0000 | [diff] [blame] | 4185 | auth.add_auth_options(parser) |
tandrii@chromium.org | dde6462 | 2016-04-13 17:11:21 +0000 | [diff] [blame] | 4186 | _add_codereview_select_options(parser) |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 4187 | (options, args) = parser.parse_args(args) |
tandrii@chromium.org | dde6462 | 2016-04-13 17:11:21 +0000 | [diff] [blame] | 4188 | _process_codereview_select_options(parser, options) |
vadimsh@chromium.org | cf6a5d2 | 2015-04-09 22:02:00 +0000 | [diff] [blame] | 4189 | auth_config = auth.extract_auth_config_from_options(options) |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 4190 | |
sbc@chromium.org | 71437c0 | 2015-04-09 19:29:40 +0000 | [diff] [blame] | 4191 | if git_common.is_dirty_git_tree('upload'): |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 4192 | return 1 |
| 4193 | |
maruel@chromium.org | eb52a5c | 2013-04-10 23:17:09 +0000 | [diff] [blame] | 4194 | options.reviewers = cleanup_list(options.reviewers) |
| 4195 | options.cc = cleanup_list(options.cc) |
| 4196 | |
tandrii | b80458a | 2016-06-23 12:20:07 -0700 | [diff] [blame] | 4197 | if options.message_file: |
| 4198 | if options.message: |
| 4199 | parser.error('only one of --message and --message-file allowed.') |
| 4200 | options.message = gclient_utils.FileRead(options.message_file) |
| 4201 | options.message_file = None |
| 4202 | |
tandrii | 4d0545a | 2016-07-06 03:56:49 -0700 | [diff] [blame] | 4203 | if options.cq_dry_run and options.use_commit_queue: |
| 4204 | parser.error('only one of --use-commit-queue and --cq-dry-run allowed.') |
| 4205 | |
tandrii@chromium.org | 512d79c | 2016-03-31 12:55:28 +0000 | [diff] [blame] | 4206 | # For sanity of test expectations, do this otherwise lazy-loading *now*. |
| 4207 | settings.GetIsGerrit() |
| 4208 | |
tandrii@chromium.org | dde6462 | 2016-04-13 17:11:21 +0000 | [diff] [blame] | 4209 | cl = Changelist(auth_config=auth_config, codereview=options.forced_codereview) |
tandrii@chromium.org | 9e6c3a5 | 2016-04-12 14:13:08 +0000 | [diff] [blame] | 4210 | return cl.CMDUpload(options, args, orig_args) |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 4211 | |
| 4212 | |
szager@chromium.org | 9bb85e2 | 2012-06-13 20:28:23 +0000 | [diff] [blame] | 4213 | def IsSubmoduleMergeCommit(ref): |
| 4214 | # When submodules are added to the repo, we expect there to be a single |
| 4215 | # non-git-svn merge commit at remote HEAD with a signature comment. |
| 4216 | pattern = '^SVN changes up to revision [0-9]*$' |
szager@chromium.org | e84b754 | 2012-06-15 21:26:58 +0000 | [diff] [blame] | 4217 | cmd = ['rev-list', '--merges', '--grep=%s' % pattern, '%s^!' % ref] |
szager@chromium.org | 9bb85e2 | 2012-06-13 20:28:23 +0000 | [diff] [blame] | 4218 | return RunGit(cmd) != '' |
| 4219 | |
| 4220 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4221 | def SendUpstream(parser, args, cmd): |
pgervais@chromium.org | cee6dc4 | 2014-05-07 17:04:03 +0000 | [diff] [blame] | 4222 | """Common code for CMDland and CmdDCommit |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4223 | |
tandrii@chromium.org | d68b62b | 2016-03-31 16:09:29 +0000 | [diff] [blame] | 4224 | In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes |
| 4225 | upstream and closes the issue automatically and atomically. |
| 4226 | |
| 4227 | Otherwise (in case of Rietveld): |
| 4228 | Squashes branch into a single commit. |
| 4229 | Updates changelog with metadata (e.g. pointer to review). |
| 4230 | Pushes/dcommits the code upstream. |
| 4231 | Updates review and closes. |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4232 | """ |
| 4233 | parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks', |
| 4234 | help='bypass upload presubmit hook') |
| 4235 | parser.add_option('-m', dest='message', |
| 4236 | help="override review description") |
| 4237 | parser.add_option('-f', action='store_true', dest='force', |
| 4238 | help="force yes to questions (don't prompt)") |
| 4239 | parser.add_option('-c', dest='contributor', |
| 4240 | help="external contributor for patch (appended to " + |
| 4241 | "description and used as author for git). Should be " + |
| 4242 | "formatted as 'First Last <email@example.com>'") |
iannucci@chromium.org | 53937ba | 2012-10-02 18:20:43 +0000 | [diff] [blame] | 4243 | add_git_similarity(parser) |
vadimsh@chromium.org | cf6a5d2 | 2015-04-09 22:02:00 +0000 | [diff] [blame] | 4244 | auth.add_auth_options(parser) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4245 | (options, args) = parser.parse_args(args) |
vadimsh@chromium.org | cf6a5d2 | 2015-04-09 22:02:00 +0000 | [diff] [blame] | 4246 | auth_config = auth.extract_auth_config_from_options(options) |
| 4247 | |
| 4248 | cl = Changelist(auth_config=auth_config) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4249 | |
tandrii@chromium.org | d68b62b | 2016-03-31 16:09:29 +0000 | [diff] [blame] | 4250 | # TODO(tandrii): refactor this into _RietveldChangelistImpl method. |
| 4251 | if cl.IsGerrit(): |
| 4252 | if options.message: |
| 4253 | # This could be implemented, but it requires sending a new patch to |
| 4254 | # Gerrit, as Gerrit unlike Rietveld versions messages with patchsets. |
| 4255 | # Besides, Gerrit has the ability to change the commit message on submit |
| 4256 | # automatically, thus there is no need to support this option (so far?). |
| 4257 | parser.error('-m MESSAGE option is not supported for Gerrit.') |
| 4258 | if options.contributor: |
| 4259 | parser.error( |
| 4260 | '-c CONTRIBUTOR option is not supported for Gerrit.\n' |
| 4261 | 'Before uploading a commit to Gerrit, ensure it\'s author field is ' |
| 4262 | 'the contributor\'s "name <email>". If you can\'t upload such a ' |
| 4263 | 'commit for review, contact your repository admin and request' |
| 4264 | '"Forge-Author" permission.') |
tandrii | 73449b0 | 2016-09-14 06:27:24 -0700 | [diff] [blame] | 4265 | if not cl.GetIssue(): |
| 4266 | DieWithError('You must upload the issue first to Gerrit.\n' |
| 4267 | ' If you would rather have `git cl land` upload ' |
| 4268 | 'automatically for you, see http://crbug.com/642759') |
tandrii@chromium.org | d68b62b | 2016-03-31 16:09:29 +0000 | [diff] [blame] | 4269 | return cl._codereview_impl.CMDLand(options.force, options.bypass_hooks, |
| 4270 | options.verbose) |
| 4271 | |
iannucci@chromium.org | 5724c96 | 2014-04-11 09:32:56 +0000 | [diff] [blame] | 4272 | current = cl.GetBranch() |
| 4273 | remote, upstream_branch = cl.FetchUpstreamTuple(cl.GetBranch()) |
| 4274 | if not settings.GetIsGitSvn() and remote == '.': |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 4275 | print() |
| 4276 | print('Attempting to push branch %r into another local branch!' % current) |
| 4277 | print() |
| 4278 | print('Either reparent this branch on top of origin/master:') |
| 4279 | print(' git reparent-branch --root') |
| 4280 | print() |
| 4281 | print('OR run `git rebase-update` if you think the parent branch is ') |
| 4282 | print('already committed.') |
| 4283 | print() |
| 4284 | print(' Current parent: %r' % upstream_branch) |
iannucci@chromium.org | 5724c96 | 2014-04-11 09:32:56 +0000 | [diff] [blame] | 4285 | return 1 |
| 4286 | |
vadimsh@chromium.org | 566a02a | 2014-08-22 01:34:13 +0000 | [diff] [blame] | 4287 | if not args or cmd == 'land': |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4288 | # Default to merging against our best guess of the upstream branch. |
| 4289 | args = [cl.GetUpstreamBranch()] |
| 4290 | |
maruel@chromium.org | 13f623c | 2011-07-22 16:02:23 +0000 | [diff] [blame] | 4291 | if options.contributor: |
| 4292 | if not re.match('^.*\s<\S+@\S+>$', options.contributor): |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 4293 | print("Please provide contibutor as 'First Last <email@example.com>'") |
maruel@chromium.org | 13f623c | 2011-07-22 16:02:23 +0000 | [diff] [blame] | 4294 | return 1 |
| 4295 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4296 | base_branch = args[0] |
szager@chromium.org | 9bb85e2 | 2012-06-13 20:28:23 +0000 | [diff] [blame] | 4297 | base_has_submodules = IsSubmoduleMergeCommit(base_branch) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4298 | |
sbc@chromium.org | 71437c0 | 2015-04-09 19:29:40 +0000 | [diff] [blame] | 4299 | if git_common.is_dirty_git_tree(cmd): |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4300 | return 1 |
| 4301 | |
| 4302 | # This rev-list syntax means "show all commits not in my branch that |
| 4303 | # are in base_branch". |
| 4304 | upstream_commits = RunGit(['rev-list', '^' + cl.GetBranchRef(), |
| 4305 | base_branch]).splitlines() |
| 4306 | if upstream_commits: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 4307 | print('Base branch "%s" has %d commits ' |
| 4308 | 'not in this branch.' % (base_branch, len(upstream_commits))) |
| 4309 | print('Run "git merge %s" before attempting to %s.' % (base_branch, cmd)) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4310 | return 1 |
| 4311 | |
szager@chromium.org | 9bb85e2 | 2012-06-13 20:28:23 +0000 | [diff] [blame] | 4312 | # This is the revision `svn dcommit` will commit on top of. |
vadimsh@chromium.org | 566a02a | 2014-08-22 01:34:13 +0000 | [diff] [blame] | 4313 | svn_head = None |
| 4314 | if cmd == 'dcommit' or base_has_submodules: |
| 4315 | svn_head = RunGit(['log', '--grep=^git-svn-id:', '-1', |
| 4316 | '--pretty=format:%H']) |
szager@chromium.org | 9bb85e2 | 2012-06-13 20:28:23 +0000 | [diff] [blame] | 4317 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4318 | if cmd == 'dcommit': |
szager@chromium.org | 9bb85e2 | 2012-06-13 20:28:23 +0000 | [diff] [blame] | 4319 | # If the base_head is a submodule merge commit, the first parent of the |
| 4320 | # base_head should be a git-svn commit, which is what we're interested in. |
| 4321 | base_svn_head = base_branch |
| 4322 | if base_has_submodules: |
| 4323 | base_svn_head += '^1' |
| 4324 | |
| 4325 | extra_commits = RunGit(['rev-list', '^' + svn_head, base_svn_head]) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4326 | if extra_commits: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 4327 | print('This branch has %d additional commits not upstreamed yet.' |
| 4328 | % len(extra_commits.splitlines())) |
| 4329 | print('Upstream "%s" or rebase this branch on top of the upstream trunk ' |
| 4330 | 'before attempting to %s.' % (base_branch, cmd)) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4331 | return 1 |
| 4332 | |
iannucci@chromium.org | e6896b5 | 2014-08-29 01:38:03 +0000 | [diff] [blame] | 4333 | merge_base = RunGit(['merge-base', base_branch, 'HEAD']).strip() |
maruel@chromium.org | b0a6391 | 2012-01-17 18:10:16 +0000 | [diff] [blame] | 4334 | if not options.bypass_hooks: |
maruel@chromium.org | 13f623c | 2011-07-22 16:02:23 +0000 | [diff] [blame] | 4335 | author = None |
| 4336 | if options.contributor: |
| 4337 | author = re.search(r'\<(.*)\>', options.contributor).group(1) |
maruel@chromium.org | b0a6391 | 2012-01-17 18:10:16 +0000 | [diff] [blame] | 4338 | hook_results = cl.RunHook( |
| 4339 | committing=True, |
maruel@chromium.org | b0a6391 | 2012-01-17 18:10:16 +0000 | [diff] [blame] | 4340 | may_prompt=not options.force, |
| 4341 | verbose=options.verbose, |
iannucci@chromium.org | e6896b5 | 2014-08-29 01:38:03 +0000 | [diff] [blame] | 4342 | change=cl.GetChange(merge_base, author)) |
maruel@chromium.org | b0a6391 | 2012-01-17 18:10:16 +0000 | [diff] [blame] | 4343 | if not hook_results.should_continue(): |
| 4344 | return 1 |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4345 | |
vadimsh@chromium.org | 566a02a | 2014-08-22 01:34:13 +0000 | [diff] [blame] | 4346 | # Check the tree status if the tree status URL is set. |
| 4347 | status = GetTreeStatus() |
| 4348 | if 'closed' == status: |
| 4349 | print('The tree is closed. Please wait for it to reopen. Use ' |
| 4350 | '"git cl %s --bypass-hooks" to commit on a closed tree.' % cmd) |
| 4351 | return 1 |
| 4352 | elif 'unknown' == status: |
| 4353 | print('Unable to determine tree status. Please verify manually and ' |
| 4354 | 'use "git cl %s --bypass-hooks" to commit on a closed tree.' % cmd) |
| 4355 | return 1 |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4356 | |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 4357 | change_desc = ChangeDescription(options.message) |
| 4358 | if not change_desc.description and cl.GetIssue(): |
| 4359 | change_desc = ChangeDescription(cl.GetDescription()) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4360 | |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 4361 | if not change_desc.description: |
erg@chromium.org | 1a17398 | 2012-08-29 20:43:05 +0000 | [diff] [blame] | 4362 | if not cl.GetIssue() and options.bypass_hooks: |
iannucci@chromium.org | e6896b5 | 2014-08-29 01:38:03 +0000 | [diff] [blame] | 4363 | change_desc = ChangeDescription(CreateDescriptionFromLog([merge_base])) |
erg@chromium.org | 1a17398 | 2012-08-29 20:43:05 +0000 | [diff] [blame] | 4364 | else: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 4365 | print('No description set.') |
| 4366 | print('Visit %s/edit to set it.' % (cl.GetIssueURL())) |
erg@chromium.org | 1a17398 | 2012-08-29 20:43:05 +0000 | [diff] [blame] | 4367 | return 1 |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4368 | |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 4369 | # Keep a separate copy for the commit message, because the commit message |
| 4370 | # contains the link to the Rietveld issue, while the Rietveld message contains |
| 4371 | # the commit viewvc url. |
maruel@chromium.org | e52678e | 2013-04-26 18:34:44 +0000 | [diff] [blame] | 4372 | # Keep a separate copy for the commit message. |
| 4373 | if cl.GetIssue(): |
maruel@chromium.org | cf08778 | 2013-07-23 13:08:48 +0000 | [diff] [blame] | 4374 | change_desc.update_reviewers(cl.GetApprovingReviewers()) |
maruel@chromium.org | e52678e | 2013-04-26 18:34:44 +0000 | [diff] [blame] | 4375 | |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 4376 | commit_desc = ChangeDescription(change_desc.description) |
maruel@chromium.org | cc73ad6 | 2011-07-06 17:39:26 +0000 | [diff] [blame] | 4377 | if cl.GetIssue(): |
smut@google.com | 4c61dcc | 2015-06-08 22:31:29 +0000 | [diff] [blame] | 4378 | # Xcode won't linkify this URL unless there is a non-whitespace character |
sergiyb@chromium.org | 4b39c5f | 2015-07-07 10:33:12 +0000 | [diff] [blame] | 4379 | # after it. Add a period on a new line to circumvent this. Also add a space |
| 4380 | # before the period to make sure that Gitiles continues to correctly resolve |
| 4381 | # the URL. |
| 4382 | commit_desc.append_footer('Review URL: %s .' % cl.GetIssueURL()) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4383 | if options.contributor: |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 4384 | commit_desc.append_footer('Patch from %s.' % options.contributor) |
| 4385 | |
agable@chromium.org | eec3ea3 | 2013-08-15 20:31:39 +0000 | [diff] [blame] | 4386 | print('Description:') |
| 4387 | print(commit_desc.description) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4388 | |
iannucci@chromium.org | e6896b5 | 2014-08-29 01:38:03 +0000 | [diff] [blame] | 4389 | branches = [merge_base, cl.GetBranchRef()] |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4390 | if not options.force: |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 4391 | print_stats(options.similarity, options.find_copies, branches) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4392 | |
szager@chromium.org | 9bb85e2 | 2012-06-13 20:28:23 +0000 | [diff] [blame] | 4393 | # We want to squash all this branch's commits into one commit with the proper |
| 4394 | # description. We do this by doing a "reset --soft" to the base branch (which |
| 4395 | # keeps the working copy the same), then dcommitting that. If origin/master |
| 4396 | # has a submodule merge commit, we'll also need to cherry-pick the squashed |
| 4397 | # commit onto a branch based on the git-svn head. |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4398 | MERGE_BRANCH = 'git-cl-commit' |
szager@chromium.org | 9bb85e2 | 2012-06-13 20:28:23 +0000 | [diff] [blame] | 4399 | CHERRY_PICK_BRANCH = 'git-cl-cherry-pick' |
| 4400 | # Delete the branches if they exist. |
| 4401 | for branch in [MERGE_BRANCH, CHERRY_PICK_BRANCH]: |
| 4402 | showref_cmd = ['show-ref', '--quiet', '--verify', 'refs/heads/%s' % branch] |
| 4403 | result = RunGitWithCode(showref_cmd) |
| 4404 | if result[0] == 0: |
| 4405 | RunGit(['branch', '-D', branch]) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4406 | |
| 4407 | # We might be in a directory that's present in this branch but not in the |
| 4408 | # trunk. Move up to the top of the tree so that git commands that expect a |
| 4409 | # valid CWD won't fail after we check out the merge branch. |
thestig@chromium.org | 8b0553c | 2014-02-11 00:33:37 +0000 | [diff] [blame] | 4410 | rel_base_path = settings.GetRelativeRoot() |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4411 | if rel_base_path: |
| 4412 | os.chdir(rel_base_path) |
| 4413 | |
| 4414 | # Stuff our change into the merge branch. |
| 4415 | # We wrap in a try...finally block so if anything goes wrong, |
| 4416 | # we clean up the branches. |
maruel@chromium.org | 0ba7f96 | 2011-01-11 22:13:58 +0000 | [diff] [blame] | 4417 | retcode = -1 |
iannucci@chromium.org | e6896b5 | 2014-08-29 01:38:03 +0000 | [diff] [blame] | 4418 | pushed_to_pending = False |
vadimsh@chromium.org | 566a02a | 2014-08-22 01:34:13 +0000 | [diff] [blame] | 4419 | pending_ref = None |
iannucci@chromium.org | e6896b5 | 2014-08-29 01:38:03 +0000 | [diff] [blame] | 4420 | revision = None |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4421 | try: |
bauerb@chromium.org | b4a75c4 | 2011-03-08 08:35:38 +0000 | [diff] [blame] | 4422 | RunGit(['checkout', '-q', '-b', MERGE_BRANCH]) |
iannucci@chromium.org | e6896b5 | 2014-08-29 01:38:03 +0000 | [diff] [blame] | 4423 | RunGit(['reset', '--soft', merge_base]) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4424 | if options.contributor: |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 4425 | RunGit( |
| 4426 | [ |
| 4427 | 'commit', '--author', options.contributor, |
| 4428 | '-m', commit_desc.description, |
| 4429 | ]) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4430 | else: |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 4431 | RunGit(['commit', '-m', commit_desc.description]) |
szager@chromium.org | 9bb85e2 | 2012-06-13 20:28:23 +0000 | [diff] [blame] | 4432 | if base_has_submodules: |
| 4433 | cherry_pick_commit = RunGit(['rev-list', 'HEAD^!']).rstrip() |
| 4434 | RunGit(['branch', CHERRY_PICK_BRANCH, svn_head]) |
| 4435 | RunGit(['checkout', CHERRY_PICK_BRANCH]) |
| 4436 | RunGit(['cherry-pick', cherry_pick_commit]) |
vadimsh@chromium.org | 566a02a | 2014-08-22 01:34:13 +0000 | [diff] [blame] | 4437 | if cmd == 'land': |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 4438 | remote, branch = cl.FetchUpstreamTuple(cl.GetBranch()) |
szager@chromium.org | 151ebcf | 2016-03-09 01:08:25 +0000 | [diff] [blame] | 4439 | mirror = settings.GetGitMirror(remote) |
| 4440 | pushurl = mirror.url if mirror else remote |
vadimsh@chromium.org | 566a02a | 2014-08-22 01:34:13 +0000 | [diff] [blame] | 4441 | pending_prefix = settings.GetPendingRefPrefix() |
| 4442 | if not pending_prefix or branch.startswith(pending_prefix): |
| 4443 | # If not using refs/pending/heads/* at all, or target ref is already set |
| 4444 | # to pending, then push to the target ref directly. |
| 4445 | retcode, output = RunGitWithCode( |
szager@chromium.org | 151ebcf | 2016-03-09 01:08:25 +0000 | [diff] [blame] | 4446 | ['push', '--porcelain', pushurl, 'HEAD:%s' % branch]) |
iannucci@chromium.org | e6896b5 | 2014-08-29 01:38:03 +0000 | [diff] [blame] | 4447 | pushed_to_pending = pending_prefix and branch.startswith(pending_prefix) |
vadimsh@chromium.org | 566a02a | 2014-08-22 01:34:13 +0000 | [diff] [blame] | 4448 | else: |
| 4449 | # Cherry-pick the change on top of pending ref and then push it. |
| 4450 | assert branch.startswith('refs/'), branch |
| 4451 | assert pending_prefix[-1] == '/', pending_prefix |
| 4452 | pending_ref = pending_prefix + branch[len('refs/'):] |
tandrii | bf42940 | 2016-09-14 07:09:12 -0700 | [diff] [blame] | 4453 | retcode, output = PushToGitPending(pushurl, pending_ref) |
iannucci@chromium.org | e6896b5 | 2014-08-29 01:38:03 +0000 | [diff] [blame] | 4454 | pushed_to_pending = (retcode == 0) |
iannucci@chromium.org | 34504a1 | 2014-08-29 23:51:37 +0000 | [diff] [blame] | 4455 | if retcode == 0: |
| 4456 | revision = RunGit(['rev-parse', 'HEAD']).strip() |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4457 | else: |
| 4458 | # dcommit the merge branch. |
iannucci@chromium.org | a1950c4 | 2014-12-05 22:15:56 +0000 | [diff] [blame] | 4459 | cmd_args = [ |
kjellander@chromium.org | 6abc652 | 2014-12-02 07:34:49 +0000 | [diff] [blame] | 4460 | 'svn', 'dcommit', |
| 4461 | '-C%s' % options.similarity, |
| 4462 | '--no-rebase', '--rmdir', |
| 4463 | ] |
| 4464 | if settings.GetForceHttpsCommitUrl(): |
| 4465 | # Allow forcing https commit URLs for some projects that don't allow |
| 4466 | # committing to http URLs (like Google Code). |
| 4467 | remote_url = cl.GetGitSvnRemoteUrl() |
| 4468 | if urlparse.urlparse(remote_url).scheme == 'http': |
| 4469 | remote_url = remote_url.replace('http://', 'https://') |
iannucci@chromium.org | a1950c4 | 2014-12-05 22:15:56 +0000 | [diff] [blame] | 4470 | cmd_args.append('--commit-url=%s' % remote_url) |
| 4471 | _, output = RunGitWithCode(cmd_args) |
iannucci@chromium.org | 34504a1 | 2014-08-29 23:51:37 +0000 | [diff] [blame] | 4472 | if 'Committed r' in output: |
| 4473 | revision = re.match( |
| 4474 | '.*?\nCommitted r(\\d+)', output, re.DOTALL).group(1) |
| 4475 | logging.debug(output) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4476 | finally: |
| 4477 | # And then swap back to the original branch and clean up. |
| 4478 | RunGit(['checkout', '-q', cl.GetBranch()]) |
| 4479 | RunGit(['branch', '-D', MERGE_BRANCH]) |
szager@chromium.org | 9bb85e2 | 2012-06-13 20:28:23 +0000 | [diff] [blame] | 4480 | if base_has_submodules: |
| 4481 | RunGit(['branch', '-D', CHERRY_PICK_BRANCH]) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4482 | |
iannucci@chromium.org | 34504a1 | 2014-08-29 23:51:37 +0000 | [diff] [blame] | 4483 | if not revision: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 4484 | print('Failed to push. If this persists, please file a bug.') |
iannucci@chromium.org | 34504a1 | 2014-08-29 23:51:37 +0000 | [diff] [blame] | 4485 | return 1 |
iannucci@chromium.org | 6c217b1 | 2014-08-29 22:10:59 +0000 | [diff] [blame] | 4486 | |
iannucci@chromium.org | bbe9cc5 | 2014-09-05 18:25:51 +0000 | [diff] [blame] | 4487 | killed = False |
iannucci@chromium.org | 6c217b1 | 2014-08-29 22:10:59 +0000 | [diff] [blame] | 4488 | if pushed_to_pending: |
iannucci@chromium.org | e6896b5 | 2014-08-29 01:38:03 +0000 | [diff] [blame] | 4489 | try: |
| 4490 | revision = WaitForRealCommit(remote, revision, base_branch, branch) |
| 4491 | # We set pushed_to_pending to False, since it made it all the way to the |
| 4492 | # real ref. |
| 4493 | pushed_to_pending = False |
| 4494 | except KeyboardInterrupt: |
iannucci@chromium.org | bbe9cc5 | 2014-09-05 18:25:51 +0000 | [diff] [blame] | 4495 | killed = True |
iannucci@chromium.org | e6896b5 | 2014-08-29 01:38:03 +0000 | [diff] [blame] | 4496 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4497 | if cl.GetIssue(): |
iannucci@chromium.org | e6896b5 | 2014-08-29 01:38:03 +0000 | [diff] [blame] | 4498 | to_pending = ' to pending queue' if pushed_to_pending else '' |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4499 | viewvc_url = settings.GetViewVCUrl() |
iannucci@chromium.org | e6896b5 | 2014-08-29 01:38:03 +0000 | [diff] [blame] | 4500 | if not to_pending: |
| 4501 | if viewvc_url and revision: |
| 4502 | change_desc.append_footer( |
| 4503 | 'Committed: %s%s' % (viewvc_url, revision)) |
| 4504 | elif revision: |
| 4505 | change_desc.append_footer('Committed: %s' % (revision,)) |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 4506 | print('Closing issue ' |
| 4507 | '(you may be prompted for your codereview password)...') |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 4508 | cl.UpdateDescription(change_desc.description) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4509 | cl.CloseIssue() |
maruel@chromium.org | 1033efd | 2013-07-23 23:25:09 +0000 | [diff] [blame] | 4510 | props = cl.GetIssueProperties() |
sadrul@chromium.org | 34b5d82 | 2013-02-18 01:39:24 +0000 | [diff] [blame] | 4511 | patch_num = len(props['patchsets']) |
rmistry@google.com | 52d224a | 2014-08-27 14:44:41 +0000 | [diff] [blame] | 4512 | comment = "Committed patchset #%d (id:%d)%s manually as %s" % ( |
mark@chromium.org | 782570c | 2014-09-26 21:48:02 +0000 | [diff] [blame] | 4513 | patch_num, props['patchsets'][-1], to_pending, revision) |
jochen@chromium.org | 3ec0d54 | 2014-01-14 20:00:03 +0000 | [diff] [blame] | 4514 | if options.bypass_hooks: |
| 4515 | comment += ' (tree was closed).' if GetTreeStatus() == 'closed' else '.' |
| 4516 | else: |
| 4517 | comment += ' (presubmit successful).' |
iannucci@chromium.org | b85a316 | 2013-01-26 01:11:13 +0000 | [diff] [blame] | 4518 | cl.RpcServer().add_comment(cl.GetIssue(), comment) |
maruel@chromium.org | 0ba7f96 | 2011-01-11 22:13:58 +0000 | [diff] [blame] | 4519 | |
iannucci@chromium.org | 6c217b1 | 2014-08-29 22:10:59 +0000 | [diff] [blame] | 4520 | if pushed_to_pending: |
vadimsh@chromium.org | 566a02a | 2014-08-22 01:34:13 +0000 | [diff] [blame] | 4521 | _, branch = cl.FetchUpstreamTuple(cl.GetBranch()) |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 4522 | print('The commit is in the pending queue (%s).' % pending_ref) |
| 4523 | print('It will show up on %s in ~1 min, once it gets a Cr-Commit-Position ' |
| 4524 | 'footer.' % branch) |
vadimsh@chromium.org | 566a02a | 2014-08-22 01:34:13 +0000 | [diff] [blame] | 4525 | |
iannucci@chromium.org | 6c217b1 | 2014-08-29 22:10:59 +0000 | [diff] [blame] | 4526 | hook = POSTUPSTREAM_HOOK_PATTERN % cmd |
| 4527 | if os.path.isfile(hook): |
| 4528 | RunCommand([hook, merge_base], error_ok=True) |
maruel@chromium.org | 0ba7f96 | 2011-01-11 22:13:58 +0000 | [diff] [blame] | 4529 | |
iannucci@chromium.org | bbe9cc5 | 2014-09-05 18:25:51 +0000 | [diff] [blame] | 4530 | return 1 if killed else 0 |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4531 | |
| 4532 | |
iannucci@chromium.org | e6896b5 | 2014-08-29 01:38:03 +0000 | [diff] [blame] | 4533 | def WaitForRealCommit(remote, pushed_commit, local_base_ref, real_ref): |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 4534 | print() |
| 4535 | print('Waiting for commit to be landed on %s...' % real_ref) |
| 4536 | print('(If you are impatient, you may Ctrl-C once without harm)') |
iannucci@chromium.org | e6896b5 | 2014-08-29 01:38:03 +0000 | [diff] [blame] | 4537 | target_tree = RunGit(['rev-parse', '%s:' % pushed_commit]).strip() |
| 4538 | current_rev = RunGit(['rev-parse', local_base_ref]).strip() |
szager@chromium.org | 151ebcf | 2016-03-09 01:08:25 +0000 | [diff] [blame] | 4539 | mirror = settings.GetGitMirror(remote) |
iannucci@chromium.org | e6896b5 | 2014-08-29 01:38:03 +0000 | [diff] [blame] | 4540 | |
| 4541 | loop = 0 |
| 4542 | while True: |
| 4543 | sys.stdout.write('fetching (%d)... \r' % loop) |
| 4544 | sys.stdout.flush() |
| 4545 | loop += 1 |
| 4546 | |
szager@chromium.org | 151ebcf | 2016-03-09 01:08:25 +0000 | [diff] [blame] | 4547 | if mirror: |
| 4548 | mirror.populate() |
iannucci@chromium.org | e6896b5 | 2014-08-29 01:38:03 +0000 | [diff] [blame] | 4549 | RunGit(['retry', 'fetch', remote, real_ref], stderr=subprocess2.VOID) |
| 4550 | to_rev = RunGit(['rev-parse', 'FETCH_HEAD']).strip() |
| 4551 | commits = RunGit(['rev-list', '%s..%s' % (current_rev, to_rev)]) |
| 4552 | for commit in commits.splitlines(): |
| 4553 | if RunGit(['rev-parse', '%s:' % commit]).strip() == target_tree: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 4554 | print('Found commit on %s' % real_ref) |
iannucci@chromium.org | e6896b5 | 2014-08-29 01:38:03 +0000 | [diff] [blame] | 4555 | return commit |
| 4556 | |
| 4557 | current_rev = to_rev |
| 4558 | |
| 4559 | |
tandrii | bf42940 | 2016-09-14 07:09:12 -0700 | [diff] [blame] | 4560 | def PushToGitPending(remote, pending_ref): |
vadimsh@chromium.org | 566a02a | 2014-08-22 01:34:13 +0000 | [diff] [blame] | 4561 | """Fetches pending_ref, cherry-picks current HEAD on top of it, pushes. |
| 4562 | |
| 4563 | Returns: |
| 4564 | (retcode of last operation, output log of last operation). |
| 4565 | """ |
| 4566 | assert pending_ref.startswith('refs/'), pending_ref |
| 4567 | local_pending_ref = 'refs/git-cl/' + pending_ref[len('refs/'):] |
| 4568 | cherry = RunGit(['rev-parse', 'HEAD']).strip() |
| 4569 | code = 0 |
| 4570 | out = '' |
vadimsh@chromium.org | 749fbd9 | 2014-08-26 21:57:53 +0000 | [diff] [blame] | 4571 | max_attempts = 3 |
| 4572 | attempts_left = max_attempts |
| 4573 | while attempts_left: |
| 4574 | if attempts_left != max_attempts: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 4575 | print('Retrying, %d attempts left...' % (attempts_left - 1,)) |
vadimsh@chromium.org | 749fbd9 | 2014-08-26 21:57:53 +0000 | [diff] [blame] | 4576 | attempts_left -= 1 |
vadimsh@chromium.org | 566a02a | 2014-08-22 01:34:13 +0000 | [diff] [blame] | 4577 | |
| 4578 | # Fetch. Retry fetch errors. |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 4579 | print('Fetching pending ref %s...' % pending_ref) |
vadimsh@chromium.org | 566a02a | 2014-08-22 01:34:13 +0000 | [diff] [blame] | 4580 | code, out = RunGitWithCode( |
vadimsh@chromium.org | 749fbd9 | 2014-08-26 21:57:53 +0000 | [diff] [blame] | 4581 | ['retry', 'fetch', remote, '+%s:%s' % (pending_ref, local_pending_ref)]) |
vadimsh@chromium.org | 566a02a | 2014-08-22 01:34:13 +0000 | [diff] [blame] | 4582 | if code: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 4583 | print('Fetch failed with exit code %d.' % code) |
vadimsh@chromium.org | 749fbd9 | 2014-08-26 21:57:53 +0000 | [diff] [blame] | 4584 | if out.strip(): |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 4585 | print(out.strip()) |
vadimsh@chromium.org | 566a02a | 2014-08-22 01:34:13 +0000 | [diff] [blame] | 4586 | continue |
| 4587 | |
| 4588 | # Try to cherry pick. Abort on merge conflicts. |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 4589 | print('Cherry-picking commit on top of pending ref...') |
vadimsh@chromium.org | 566a02a | 2014-08-22 01:34:13 +0000 | [diff] [blame] | 4590 | RunGitWithCode(['checkout', local_pending_ref], suppress_stderr=True) |
vadimsh@chromium.org | 749fbd9 | 2014-08-26 21:57:53 +0000 | [diff] [blame] | 4591 | code, out = RunGitWithCode(['cherry-pick', cherry]) |
vadimsh@chromium.org | 566a02a | 2014-08-22 01:34:13 +0000 | [diff] [blame] | 4592 | if code: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 4593 | print('Your patch doesn\'t apply cleanly to ref \'%s\', ' |
| 4594 | 'the following files have merge conflicts:' % pending_ref) |
| 4595 | print(RunGit(['diff', '--name-status', '--diff-filter=U']).strip()) |
| 4596 | print('Please rebase your patch and try again.') |
vadimsh@chromium.org | 749fbd9 | 2014-08-26 21:57:53 +0000 | [diff] [blame] | 4597 | RunGitWithCode(['cherry-pick', '--abort']) |
vadimsh@chromium.org | 566a02a | 2014-08-22 01:34:13 +0000 | [diff] [blame] | 4598 | return code, out |
| 4599 | |
| 4600 | # Applied cleanly, try to push now. Retry on error (flake or non-ff push). |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 4601 | print('Pushing commit to %s... It can take a while.' % pending_ref) |
vadimsh@chromium.org | 566a02a | 2014-08-22 01:34:13 +0000 | [diff] [blame] | 4602 | code, out = RunGitWithCode( |
| 4603 | ['retry', 'push', '--porcelain', remote, 'HEAD:%s' % pending_ref]) |
| 4604 | if code == 0: |
| 4605 | # Success. |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 4606 | print('Commit pushed to pending ref successfully!') |
vadimsh@chromium.org | 566a02a | 2014-08-22 01:34:13 +0000 | [diff] [blame] | 4607 | return code, out |
| 4608 | |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 4609 | print('Push failed with exit code %d.' % code) |
vadimsh@chromium.org | 749fbd9 | 2014-08-26 21:57:53 +0000 | [diff] [blame] | 4610 | if out.strip(): |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 4611 | print(out.strip()) |
vadimsh@chromium.org | 749fbd9 | 2014-08-26 21:57:53 +0000 | [diff] [blame] | 4612 | if IsFatalPushFailure(out): |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 4613 | print('Fatal push error. Make sure your .netrc credentials and git ' |
| 4614 | 'user.email are correct and you have push access to the repo.') |
vadimsh@chromium.org | 749fbd9 | 2014-08-26 21:57:53 +0000 | [diff] [blame] | 4615 | return code, out |
| 4616 | |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 4617 | print('All attempts to push to pending ref failed.') |
vadimsh@chromium.org | 566a02a | 2014-08-22 01:34:13 +0000 | [diff] [blame] | 4618 | return code, out |
| 4619 | |
| 4620 | |
vadimsh@chromium.org | 749fbd9 | 2014-08-26 21:57:53 +0000 | [diff] [blame] | 4621 | def IsFatalPushFailure(push_stdout): |
| 4622 | """True if retrying push won't help.""" |
| 4623 | return '(prohibited by Gerrit)' in push_stdout |
| 4624 | |
| 4625 | |
maruel@chromium.org | 0633fb4 | 2013-08-16 20:06:14 +0000 | [diff] [blame] | 4626 | @subcommand.usage('[upstream branch to apply against]') |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4627 | def CMDdcommit(parser, args): |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 4628 | """Commits the current changelist via git-svn.""" |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4629 | if not settings.GetIsGitSvn(): |
tandrii@chromium.org | 09d7a6a | 2016-03-04 15:44:48 +0000 | [diff] [blame] | 4630 | if git_footers.get_footer_svn_id(): |
mmoss@chromium.org | f0e4152 | 2015-06-10 19:52:01 +0000 | [diff] [blame] | 4631 | # If it looks like previous commits were mirrored with git-svn. |
agable | 3b9a5bb | 2016-09-22 11:32:08 -0700 | [diff] [blame] | 4632 | message = """This repository appears to be a git-svn mirror, but we |
| 4633 | don't support git-svn mirrors anymore.""" |
mmoss@chromium.org | f0e4152 | 2015-06-10 19:52:01 +0000 | [diff] [blame] | 4634 | else: |
| 4635 | message = """This doesn't appear to be an SVN repository. |
| 4636 | If your project has a true, writeable git repository, you probably want to run |
| 4637 | 'git cl land' instead. |
| 4638 | If your project has a git mirror of an upstream SVN master, you probably need |
| 4639 | to run 'git svn init'. |
| 4640 | |
| 4641 | Using the wrong command might cause your commit to appear to succeed, and the |
| 4642 | review to be closed, without actually landing upstream. If you choose to |
| 4643 | proceed, please verify that the commit lands upstream as expected.""" |
thakis@chromium.org | cde3bb6 | 2011-01-20 01:16:14 +0000 | [diff] [blame] | 4644 | print(message) |
maruel@chromium.org | 9054173 | 2011-04-01 17:54:18 +0000 | [diff] [blame] | 4645 | ask_for_data('[Press enter to dcommit or ctrl-C to quit]') |
tandrii | 3bb82ff | 2016-06-17 07:36:36 -0700 | [diff] [blame] | 4646 | print('WARNING: chrome infrastructure is migrating SVN repos to Git.\n' |
| 4647 | 'Please let us know of this project you are committing to:' |
| 4648 | ' http://crbug.com/600451') |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4649 | return SendUpstream(parser, args, 'dcommit') |
| 4650 | |
| 4651 | |
maruel@chromium.org | 0633fb4 | 2013-08-16 20:06:14 +0000 | [diff] [blame] | 4652 | @subcommand.usage('[upstream branch to apply against]') |
pgervais@chromium.org | cee6dc4 | 2014-05-07 17:04:03 +0000 | [diff] [blame] | 4653 | def CMDland(parser, args): |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 4654 | """Commits the current changelist via git.""" |
tandrii@chromium.org | 09d7a6a | 2016-03-04 15:44:48 +0000 | [diff] [blame] | 4655 | if settings.GetIsGitSvn() or git_footers.get_footer_svn_id(): |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4656 | print('This appears to be an SVN repository.') |
| 4657 | print('Are you sure you didn\'t mean \'git cl dcommit\'?') |
mmoss@chromium.org | f0e4152 | 2015-06-10 19:52:01 +0000 | [diff] [blame] | 4658 | print('(Ignore if this is the first commit after migrating from svn->git)') |
maruel@chromium.org | 9054173 | 2011-04-01 17:54:18 +0000 | [diff] [blame] | 4659 | ask_for_data('[Press enter to push or ctrl-C to quit]') |
vadimsh@chromium.org | 566a02a | 2014-08-22 01:34:13 +0000 | [diff] [blame] | 4660 | return SendUpstream(parser, args, 'land') |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4661 | |
| 4662 | |
dsinclair@chromium.org | fbed656 | 2015-09-25 21:22:36 +0000 | [diff] [blame] | 4663 | @subcommand.usage('<patch url or issue id or issue url>') |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4664 | def CMDpatch(parser, args): |
marq@chromium.org | e5e5900 | 2013-10-02 23:21:25 +0000 | [diff] [blame] | 4665 | """Patches in a code review.""" |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4666 | parser.add_option('-b', dest='newbranch', |
| 4667 | help='create a new branch off trunk for the patch') |
qsr@chromium.org | 1ef44af | 2013-10-16 16:24:32 +0000 | [diff] [blame] | 4668 | parser.add_option('-f', '--force', action='store_true', |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4669 | help='with -b, clobber any existing branch') |
qsr@chromium.org | 1ef44af | 2013-10-16 16:24:32 +0000 | [diff] [blame] | 4670 | parser.add_option('-d', '--directory', action='store', metavar='DIR', |
| 4671 | help='Change to the directory DIR immediately, ' |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 4672 | 'before doing anything else. Rietveld only.') |
qsr@chromium.org | 1ef44af | 2013-10-16 16:24:32 +0000 | [diff] [blame] | 4673 | parser.add_option('--reject', action='store_true', |
tapted@chromium.org | 6a0b07c | 2013-07-10 01:29:19 +0000 | [diff] [blame] | 4674 | help='failed patches spew .rej files rather than ' |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 4675 | 'attempting a 3-way merge. Rietveld only.') |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4676 | parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit', |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 4677 | help='don\'t commit after patch applies. Rietveld only.') |
mtrofin@chromium.org | 1d88dd3 | 2016-02-04 16:25:12 +0000 | [diff] [blame] | 4678 | |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 4679 | |
| 4680 | group = optparse.OptionGroup( |
| 4681 | parser, |
| 4682 | 'Options for continuing work on the current issue uploaded from a ' |
| 4683 | 'different clone (e.g. different machine). Must be used independently ' |
| 4684 | 'from the other options. No issue number should be specified, and the ' |
| 4685 | 'branch must have an issue number associated with it') |
| 4686 | group.add_option('--reapply', action='store_true', dest='reapply', |
| 4687 | help='Reset the branch and reapply the issue.\n' |
| 4688 | 'CAUTION: This will undo any local changes in this ' |
| 4689 | 'branch') |
mtrofin@chromium.org | 1d88dd3 | 2016-02-04 16:25:12 +0000 | [diff] [blame] | 4690 | |
| 4691 | group.add_option('--pull', action='store_true', dest='pull', |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 4692 | help='Performs a pull before reapplying.') |
mtrofin@chromium.org | 1d88dd3 | 2016-02-04 16:25:12 +0000 | [diff] [blame] | 4693 | parser.add_option_group(group) |
| 4694 | |
vadimsh@chromium.org | cf6a5d2 | 2015-04-09 22:02:00 +0000 | [diff] [blame] | 4695 | auth.add_auth_options(parser) |
tandrii@chromium.org | dde6462 | 2016-04-13 17:11:21 +0000 | [diff] [blame] | 4696 | _add_codereview_select_options(parser) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4697 | (options, args) = parser.parse_args(args) |
tandrii@chromium.org | dde6462 | 2016-04-13 17:11:21 +0000 | [diff] [blame] | 4698 | _process_codereview_select_options(parser, options) |
vadimsh@chromium.org | cf6a5d2 | 2015-04-09 22:02:00 +0000 | [diff] [blame] | 4699 | auth_config = auth.extract_auth_config_from_options(options) |
| 4700 | |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 4701 | |
mtrofin@chromium.org | 1d88dd3 | 2016-02-04 16:25:12 +0000 | [diff] [blame] | 4702 | if options.reapply : |
tandrii@chromium.org | c2786d9 | 2016-05-31 19:53:50 +0000 | [diff] [blame] | 4703 | if options.newbranch: |
| 4704 | parser.error('--reapply works on the current branch only') |
mtrofin@chromium.org | 1d88dd3 | 2016-02-04 16:25:12 +0000 | [diff] [blame] | 4705 | if len(args) > 0: |
tandrii@chromium.org | c2786d9 | 2016-05-31 19:53:50 +0000 | [diff] [blame] | 4706 | parser.error('--reapply implies no additional arguments') |
dsinclair@chromium.org | fbed656 | 2015-09-25 21:22:36 +0000 | [diff] [blame] | 4707 | |
tandrii@chromium.org | c2786d9 | 2016-05-31 19:53:50 +0000 | [diff] [blame] | 4708 | cl = Changelist(auth_config=auth_config, |
| 4709 | codereview=options.forced_codereview) |
| 4710 | if not cl.GetIssue(): |
| 4711 | parser.error('current branch must have an associated issue') |
| 4712 | |
mtrofin@chromium.org | 1d88dd3 | 2016-02-04 16:25:12 +0000 | [diff] [blame] | 4713 | upstream = cl.GetUpstreamBranch() |
| 4714 | if upstream == None: |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 4715 | parser.error('No upstream branch specified. Cannot reset branch') |
mtrofin@chromium.org | 1d88dd3 | 2016-02-04 16:25:12 +0000 | [diff] [blame] | 4716 | |
| 4717 | RunGit(['reset', '--hard', upstream]) |
| 4718 | if options.pull: |
| 4719 | RunGit(['pull']) |
mtrofin@chromium.org | 1d88dd3 | 2016-02-04 16:25:12 +0000 | [diff] [blame] | 4720 | |
tandrii@chromium.org | c2786d9 | 2016-05-31 19:53:50 +0000 | [diff] [blame] | 4721 | return cl.CMDPatchIssue(cl.GetIssue(), options.reject, options.nocommit, |
| 4722 | options.directory) |
| 4723 | |
| 4724 | if len(args) != 1 or not args[0]: |
| 4725 | parser.error('Must specify issue number or url') |
| 4726 | |
| 4727 | # We don't want uncommitted changes mixed up with the patch. |
| 4728 | if git_common.is_dirty_git_tree('patch'): |
dsinclair@chromium.org | fbed656 | 2015-09-25 21:22:36 +0000 | [diff] [blame] | 4729 | return 1 |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4730 | |
tandrii@chromium.org | c2786d9 | 2016-05-31 19:53:50 +0000 | [diff] [blame] | 4731 | if options.newbranch: |
| 4732 | if options.force: |
| 4733 | RunGit(['branch', '-D', options.newbranch], |
| 4734 | stderr=subprocess2.PIPE, error_ok=True) |
| 4735 | RunGit(['new-branch', options.newbranch]) |
tandrii | df09a46 | 2016-08-18 16:23:55 -0700 | [diff] [blame] | 4736 | elif not GetCurrentBranch(): |
| 4737 | DieWithError('A branch is required to apply patch. Hint: use -b option.') |
tandrii@chromium.org | c2786d9 | 2016-05-31 19:53:50 +0000 | [diff] [blame] | 4738 | |
| 4739 | cl = Changelist(auth_config=auth_config, codereview=options.forced_codereview) |
| 4740 | |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 4741 | if cl.IsGerrit(): |
| 4742 | if options.reject: |
| 4743 | parser.error('--reject is not supported with Gerrit codereview.') |
| 4744 | if options.nocommit: |
| 4745 | parser.error('--nocommit is not supported with Gerrit codereview.') |
| 4746 | if options.directory: |
| 4747 | parser.error('--directory is not supported with Gerrit codereview.') |
| 4748 | |
tandrii@chromium.org | c2786d9 | 2016-05-31 19:53:50 +0000 | [diff] [blame] | 4749 | return cl.CMDPatchIssue(args[0], options.reject, options.nocommit, |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 4750 | options.directory) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4751 | |
| 4752 | |
| 4753 | def CMDrebase(parser, args): |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 4754 | """Rebases current branch on top of svn repo.""" |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4755 | # Provide a wrapper for git svn rebase to help avoid accidental |
| 4756 | # git svn dcommit. |
| 4757 | # It's the only command that doesn't use parser at all since we just defer |
| 4758 | # execution to git-svn. |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 4759 | |
thestig@chromium.org | 8b0553c | 2014-02-11 00:33:37 +0000 | [diff] [blame] | 4760 | return RunGitWithCode(['svn', 'rebase'] + args)[1] |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4761 | |
| 4762 | |
jochen@chromium.org | 3ec0d54 | 2014-01-14 20:00:03 +0000 | [diff] [blame] | 4763 | def GetTreeStatus(url=None): |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4764 | """Fetches the tree status and returns either 'open', 'closed', |
| 4765 | 'unknown' or 'unset'.""" |
jochen@chromium.org | 3ec0d54 | 2014-01-14 20:00:03 +0000 | [diff] [blame] | 4766 | url = url or settings.GetTreeStatusUrl(error_ok=True) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4767 | if url: |
| 4768 | status = urllib2.urlopen(url).read().lower() |
| 4769 | if status.find('closed') != -1 or status == '0': |
| 4770 | return 'closed' |
| 4771 | elif status.find('open') != -1 or status == '1': |
| 4772 | return 'open' |
| 4773 | return 'unknown' |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4774 | return 'unset' |
| 4775 | |
dpranke@chromium.org | 970c522 | 2011-03-12 00:32:24 +0000 | [diff] [blame] | 4776 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4777 | def GetTreeStatusReason(): |
| 4778 | """Fetches the tree status from a json url and returns the message |
| 4779 | with the reason for the tree to be opened or closed.""" |
msb@chromium.org | bf1a7ba | 2011-02-01 16:21:46 +0000 | [diff] [blame] | 4780 | url = settings.GetTreeStatusUrl() |
| 4781 | json_url = urlparse.urljoin(url, '/current?format=json') |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4782 | connection = urllib2.urlopen(json_url) |
| 4783 | status = json.loads(connection.read()) |
| 4784 | connection.close() |
| 4785 | return status['message'] |
| 4786 | |
dpranke@chromium.org | 970c522 | 2011-03-12 00:32:24 +0000 | [diff] [blame] | 4787 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4788 | def CMDtree(parser, args): |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 4789 | """Shows the status of the tree.""" |
dpranke@chromium.org | 97ae58e | 2011-03-18 00:29:20 +0000 | [diff] [blame] | 4790 | _, args = parser.parse_args(args) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4791 | status = GetTreeStatus() |
| 4792 | if 'unset' == status: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 4793 | print('You must configure your tree status URL by running "git cl config".') |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4794 | return 2 |
| 4795 | |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 4796 | print('The tree is %s' % status) |
| 4797 | print() |
| 4798 | print(GetTreeStatusReason()) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4799 | if status != 'open': |
| 4800 | return 1 |
| 4801 | return 0 |
| 4802 | |
| 4803 | |
maruel@chromium.org | 1519240 | 2012-09-06 12:38:29 +0000 | [diff] [blame] | 4804 | def CMDtry(parser, args): |
qyearsley | 1fdfcb6 | 2016-10-24 13:22:03 -0700 | [diff] [blame] | 4805 | """Triggers try jobs using either BuildBucket or CQ dry run.""" |
tandrii | 1838bad | 2016-10-06 00:10:52 -0700 | [diff] [blame] | 4806 | group = optparse.OptionGroup(parser, 'Try job options') |
maruel@chromium.org | 1519240 | 2012-09-06 12:38:29 +0000 | [diff] [blame] | 4807 | group.add_option( |
tandrii | 1838bad | 2016-10-06 00:10:52 -0700 | [diff] [blame] | 4808 | '-b', '--bot', action='append', |
| 4809 | help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple ' |
| 4810 | 'times to specify multiple builders. ex: ' |
| 4811 | '"-b win_rel -b win_layout". See ' |
| 4812 | 'the try server waterfall for the builders name and the tests ' |
| 4813 | 'available.')) |
maruel@chromium.org | 1519240 | 2012-09-06 12:38:29 +0000 | [diff] [blame] | 4814 | group.add_option( |
borenet | 6c0efe6 | 2016-10-19 08:13:29 -0700 | [diff] [blame] | 4815 | '-B', '--bucket', default='', |
| 4816 | help=('Buildbucket bucket to send the try requests.')) |
| 4817 | group.add_option( |
tandrii | 1838bad | 2016-10-06 00:10:52 -0700 | [diff] [blame] | 4818 | '-m', '--master', default='', |
| 4819 | help=('Specify a try master where to run the tries.')) |
machenbach@chromium.org | 58a69cb | 2014-03-01 02:08:29 +0000 | [diff] [blame] | 4820 | group.add_option( |
tandrii | 1838bad | 2016-10-06 00:10:52 -0700 | [diff] [blame] | 4821 | '-r', '--revision', |
tandrii | f7b29d4 | 2016-10-07 08:45:41 -0700 | [diff] [blame] | 4822 | help='Revision to use for the try job; default: the revision will ' |
| 4823 | 'be determined by the try recipe that builder runs, which usually ' |
| 4824 | 'defaults to HEAD of origin/master') |
maruel@chromium.org | 1519240 | 2012-09-06 12:38:29 +0000 | [diff] [blame] | 4825 | group.add_option( |
tandrii | 1838bad | 2016-10-06 00:10:52 -0700 | [diff] [blame] | 4826 | '-c', '--clobber', action='store_true', default=False, |
tandrii | f7b29d4 | 2016-10-07 08:45:41 -0700 | [diff] [blame] | 4827 | help='Force a clobber before building; that is don\'t do an ' |
tandrii | 1838bad | 2016-10-06 00:10:52 -0700 | [diff] [blame] | 4828 | 'incremental build') |
maruel@chromium.org | 1519240 | 2012-09-06 12:38:29 +0000 | [diff] [blame] | 4829 | group.add_option( |
tandrii | 1838bad | 2016-10-06 00:10:52 -0700 | [diff] [blame] | 4830 | '--project', |
| 4831 | help='Override which project to use. Projects are defined ' |
tandrii | f7b29d4 | 2016-10-07 08:45:41 -0700 | [diff] [blame] | 4832 | 'in recipe to determine to which repository or directory to ' |
| 4833 | 'apply the patch') |
maruel@chromium.org | 1519240 | 2012-09-06 12:38:29 +0000 | [diff] [blame] | 4834 | group.add_option( |
tandrii | 1838bad | 2016-10-06 00:10:52 -0700 | [diff] [blame] | 4835 | '-p', '--property', dest='properties', action='append', default=[], |
| 4836 | help='Specify generic properties in the form -p key1=value1 -p ' |
tandrii | f7b29d4 | 2016-10-07 08:45:41 -0700 | [diff] [blame] | 4837 | 'key2=value2 etc. The value will be treated as ' |
| 4838 | 'json if decodable, or as string otherwise. ' |
| 4839 | 'NOTE: using this may make your try job not usable for CQ, ' |
| 4840 | 'which will then schedule another try job with default properties') |
sheyang@chromium.org | db37557 | 2015-08-17 19:22:23 +0000 | [diff] [blame] | 4841 | group.add_option( |
tandrii | 1838bad | 2016-10-06 00:10:52 -0700 | [diff] [blame] | 4842 | '--buildbucket-host', default='cr-buildbucket.appspot.com', |
| 4843 | help='Host of buildbucket. The default host is %default.') |
maruel@chromium.org | 1519240 | 2012-09-06 12:38:29 +0000 | [diff] [blame] | 4844 | parser.add_option_group(group) |
vadimsh@chromium.org | cf6a5d2 | 2015-04-09 22:02:00 +0000 | [diff] [blame] | 4845 | auth.add_auth_options(parser) |
maruel@chromium.org | 1519240 | 2012-09-06 12:38:29 +0000 | [diff] [blame] | 4846 | options, args = parser.parse_args(args) |
vadimsh@chromium.org | cf6a5d2 | 2015-04-09 22:02:00 +0000 | [diff] [blame] | 4847 | auth_config = auth.extract_auth_config_from_options(options) |
maruel@chromium.org | 1519240 | 2012-09-06 12:38:29 +0000 | [diff] [blame] | 4848 | |
machenbach@chromium.org | 4545314 | 2015-09-15 08:45:22 +0000 | [diff] [blame] | 4849 | # Make sure that all properties are prop=value pairs. |
| 4850 | bad_params = [x for x in options.properties if '=' not in x] |
| 4851 | if bad_params: |
| 4852 | parser.error('Got properties with missing "=": %s' % bad_params) |
| 4853 | |
maruel@chromium.org | 1519240 | 2012-09-06 12:38:29 +0000 | [diff] [blame] | 4854 | if args: |
| 4855 | parser.error('Unknown arguments: %s' % args) |
| 4856 | |
vadimsh@chromium.org | cf6a5d2 | 2015-04-09 22:02:00 +0000 | [diff] [blame] | 4857 | cl = Changelist(auth_config=auth_config) |
maruel@chromium.org | 1519240 | 2012-09-06 12:38:29 +0000 | [diff] [blame] | 4858 | if not cl.GetIssue(): |
| 4859 | parser.error('Need to upload first') |
| 4860 | |
tandrii | e113dfd | 2016-10-11 10:20:12 -0700 | [diff] [blame] | 4861 | error_message = cl.CannotTriggerTryJobReason() |
| 4862 | if error_message: |
qyearsley | 99e2cdf | 2016-10-23 12:51:41 -0700 | [diff] [blame] | 4863 | parser.error('Can\'t trigger try jobs: %s' % error_message) |
jrobbins@chromium.org | 16f10f7 | 2014-06-24 22:14:36 +0000 | [diff] [blame] | 4864 | |
borenet | 6c0efe6 | 2016-10-19 08:13:29 -0700 | [diff] [blame] | 4865 | if options.bucket and options.master: |
| 4866 | parser.error('Only one of --bucket and --master may be used.') |
| 4867 | |
qyearsley | 1fdfcb6 | 2016-10-24 13:22:03 -0700 | [diff] [blame] | 4868 | buckets = _get_bucket_map(cl, options, parser) |
phajdan.jr@chromium.org | 8da7f27 | 2014-03-14 01:28:39 +0000 | [diff] [blame] | 4869 | |
qyearsley | dd49f94 | 2016-10-28 11:57:22 -0700 | [diff] [blame] | 4870 | # If no bots are listed and we couldn't get a list based on PRESUBMIT files, |
| 4871 | # then we default to triggering a CQ dry run (see http://crbug.com/625697). |
qyearsley | 1fdfcb6 | 2016-10-24 13:22:03 -0700 | [diff] [blame] | 4872 | if not buckets: |
qyearsley | 1fdfcb6 | 2016-10-24 13:22:03 -0700 | [diff] [blame] | 4873 | if options.verbose: |
| 4874 | print('git cl try with no bots now defaults to CQ Dry Run.') |
| 4875 | return cl.TriggerDryRun() |
stip@chromium.org | 43064fd | 2013-12-18 20:07:44 +0000 | [diff] [blame] | 4876 | |
borenet | 6c0efe6 | 2016-10-19 08:13:29 -0700 | [diff] [blame] | 4877 | for builders in buckets.itervalues(): |
machenbach@chromium.org | 58a69cb | 2014-03-01 02:08:29 +0000 | [diff] [blame] | 4878 | if any('triggered' in b for b in builders): |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 4879 | print('ERROR You are trying to send a job to a triggered bot. This type ' |
tandrii | de281ae | 2016-10-12 06:02:30 -0700 | [diff] [blame] | 4880 | 'of bot requires an initial job from a parent (usually a builder). ' |
| 4881 | 'Instead send your job to the parent.\n' |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 4882 | 'Bot list: %s' % builders, file=sys.stderr) |
machenbach@chromium.org | 58a69cb | 2014-03-01 02:08:29 +0000 | [diff] [blame] | 4883 | return 1 |
ilevy@chromium.org | f3b2123 | 2012-09-24 20:48:55 +0000 | [diff] [blame] | 4884 | |
ilevy@chromium.org | 36e420b | 2013-08-06 23:21:12 +0000 | [diff] [blame] | 4885 | patchset = cl.GetMostRecentPatchset() |
tandrii | de281ae | 2016-10-12 06:02:30 -0700 | [diff] [blame] | 4886 | if patchset != cl.GetPatchset(): |
| 4887 | print('Warning: Codereview server has newer patchsets (%s) than most ' |
| 4888 | 'recent upload from local checkout (%s). Did a previous upload ' |
| 4889 | 'fail?\n' |
| 4890 | 'By default, git cl try uses the latest patchset from ' |
| 4891 | 'codereview, continuing to use patchset %s.\n' % |
| 4892 | (patchset, cl.GetPatchset(), patchset)) |
qyearsley | 1fdfcb6 | 2016-10-24 13:22:03 -0700 | [diff] [blame] | 4893 | |
tandrii | 568043b | 2016-10-11 07:49:18 -0700 | [diff] [blame] | 4894 | try: |
borenet | 6c0efe6 | 2016-10-19 08:13:29 -0700 | [diff] [blame] | 4895 | _trigger_try_jobs(auth_config, cl, buckets, options, 'git_cl_try', |
| 4896 | patchset) |
tandrii | 568043b | 2016-10-11 07:49:18 -0700 | [diff] [blame] | 4897 | except BuildbucketResponseException as ex: |
| 4898 | print('ERROR: %s' % ex) |
| 4899 | return 1 |
maruel@chromium.org | 1519240 | 2012-09-06 12:38:29 +0000 | [diff] [blame] | 4900 | return 0 |
| 4901 | |
| 4902 | |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 4903 | def CMDtry_results(parser, args): |
tandrii | 1838bad | 2016-10-06 00:10:52 -0700 | [diff] [blame] | 4904 | """Prints info about try jobs associated with current CL.""" |
| 4905 | group = optparse.OptionGroup(parser, 'Try job results options') |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 4906 | group.add_option( |
tandrii | 1838bad | 2016-10-06 00:10:52 -0700 | [diff] [blame] | 4907 | '-p', '--patchset', type=int, help='patchset number if not current.') |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 4908 | group.add_option( |
tandrii | 1838bad | 2016-10-06 00:10:52 -0700 | [diff] [blame] | 4909 | '--print-master', action='store_true', help='print master name as well.') |
tandrii@chromium.org | 6cf98c8 | 2016-03-15 11:56:00 +0000 | [diff] [blame] | 4910 | group.add_option( |
tandrii | 1838bad | 2016-10-06 00:10:52 -0700 | [diff] [blame] | 4911 | '--color', action='store_true', default=setup_color.IS_TTY, |
| 4912 | help='force color output, useful when piping output.') |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 4913 | group.add_option( |
tandrii | 1838bad | 2016-10-06 00:10:52 -0700 | [diff] [blame] | 4914 | '--buildbucket-host', default='cr-buildbucket.appspot.com', |
| 4915 | help='Host of buildbucket. The default host is %default.') |
qyearsley | 53f48a1 | 2016-09-01 10:45:13 -0700 | [diff] [blame] | 4916 | group.add_option( |
| 4917 | '--json', help='Path of JSON output file to write try job results to.') |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 4918 | parser.add_option_group(group) |
| 4919 | auth.add_auth_options(parser) |
| 4920 | options, args = parser.parse_args(args) |
| 4921 | if args: |
| 4922 | parser.error('Unrecognized args: %s' % ' '.join(args)) |
| 4923 | |
| 4924 | auth_config = auth.extract_auth_config_from_options(options) |
| 4925 | cl = Changelist(auth_config=auth_config) |
| 4926 | if not cl.GetIssue(): |
| 4927 | parser.error('Need to upload first') |
| 4928 | |
tandrii | 221ab25 | 2016-10-06 08:12:04 -0700 | [diff] [blame] | 4929 | patchset = options.patchset |
| 4930 | if not patchset: |
| 4931 | patchset = cl.GetMostRecentPatchset() |
| 4932 | if not patchset: |
| 4933 | parser.error('Codereview doesn\'t know about issue %s. ' |
| 4934 | 'No access to issue or wrong issue number?\n' |
| 4935 | 'Either upload first, or pass --patchset explicitely' % |
| 4936 | cl.GetIssue()) |
| 4937 | |
| 4938 | if patchset != cl.GetPatchset(): |
tandrii | 45b2a58 | 2016-10-11 03:14:16 -0700 | [diff] [blame] | 4939 | print('Warning: Codereview server has newer patchsets (%s) than most ' |
| 4940 | 'recent upload from local checkout (%s). Did a previous upload ' |
| 4941 | 'fail?\n' |
tandrii | de281ae | 2016-10-12 06:02:30 -0700 | [diff] [blame] | 4942 | 'By default, git cl try-results uses the latest patchset from ' |
| 4943 | 'codereview, continuing to use patchset %s.\n' % |
tandrii | 45b2a58 | 2016-10-11 03:14:16 -0700 | [diff] [blame] | 4944 | (patchset, cl.GetPatchset(), patchset)) |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 4945 | try: |
tandrii | 221ab25 | 2016-10-06 08:12:04 -0700 | [diff] [blame] | 4946 | jobs = fetch_try_jobs(auth_config, cl, options.buildbucket_host, patchset) |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 4947 | except BuildbucketResponseException as ex: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 4948 | print('Buildbucket error: %s' % ex) |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 4949 | return 1 |
qyearsley | 53f48a1 | 2016-09-01 10:45:13 -0700 | [diff] [blame] | 4950 | if options.json: |
| 4951 | write_try_results_json(options.json, jobs) |
| 4952 | else: |
| 4953 | print_try_jobs(options, jobs) |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 4954 | return 0 |
| 4955 | |
| 4956 | |
maruel@chromium.org | 0633fb4 | 2013-08-16 20:06:14 +0000 | [diff] [blame] | 4957 | @subcommand.usage('[new upstream branch]') |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4958 | def CMDupstream(parser, args): |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 4959 | """Prints or sets the name of the upstream branch, if any.""" |
dpranke@chromium.org | 97ae58e | 2011-03-18 00:29:20 +0000 | [diff] [blame] | 4960 | _, args = parser.parse_args(args) |
brettw@chromium.org | ac0ba33 | 2012-08-09 23:42:53 +0000 | [diff] [blame] | 4961 | if len(args) > 1: |
maruel@chromium.org | 27bb387 | 2011-05-30 20:33:19 +0000 | [diff] [blame] | 4962 | parser.error('Unrecognized args: %s' % ' '.join(args)) |
brettw@chromium.org | ac0ba33 | 2012-08-09 23:42:53 +0000 | [diff] [blame] | 4963 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4964 | cl = Changelist() |
brettw@chromium.org | ac0ba33 | 2012-08-09 23:42:53 +0000 | [diff] [blame] | 4965 | if args: |
| 4966 | # One arg means set upstream branch. |
bauerb@chromium.org | c9cf90a | 2014-04-28 20:32:31 +0000 | [diff] [blame] | 4967 | branch = cl.GetBranch() |
stip | 7a3dd35 | 2016-09-22 17:32:28 -0700 | [diff] [blame] | 4968 | RunGit(['branch', '--set-upstream-to', args[0], branch]) |
brettw@chromium.org | ac0ba33 | 2012-08-09 23:42:53 +0000 | [diff] [blame] | 4969 | cl = Changelist() |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 4970 | print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),)) |
bauerb@chromium.org | c9cf90a | 2014-04-28 20:32:31 +0000 | [diff] [blame] | 4971 | |
| 4972 | # Clear configured merge-base, if there is one. |
| 4973 | git_common.remove_merge_base(branch) |
brettw@chromium.org | ac0ba33 | 2012-08-09 23:42:53 +0000 | [diff] [blame] | 4974 | else: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 4975 | print(cl.GetUpstreamBranch()) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4976 | return 0 |
| 4977 | |
| 4978 | |
thestig@chromium.org | 00858c8 | 2013-12-02 23:08:03 +0000 | [diff] [blame] | 4979 | def CMDweb(parser, args): |
| 4980 | """Opens the current CL in the web browser.""" |
| 4981 | _, args = parser.parse_args(args) |
| 4982 | if args: |
| 4983 | parser.error('Unrecognized args: %s' % ' '.join(args)) |
| 4984 | |
| 4985 | issue_url = Changelist().GetIssueURL() |
| 4986 | if not issue_url: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 4987 | print('ERROR No issue to open', file=sys.stderr) |
thestig@chromium.org | 00858c8 | 2013-12-02 23:08:03 +0000 | [diff] [blame] | 4988 | return 1 |
| 4989 | |
| 4990 | webbrowser.open(issue_url) |
| 4991 | return 0 |
| 4992 | |
| 4993 | |
maruel@chromium.org | 27bb387 | 2011-05-30 20:33:19 +0000 | [diff] [blame] | 4994 | def CMDset_commit(parser, args): |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 4995 | """Sets the commit bit to trigger the Commit Queue.""" |
tandrii@chromium.org | fa330e8 | 2016-04-13 17:09:52 +0000 | [diff] [blame] | 4996 | parser.add_option('-d', '--dry-run', action='store_true', |
| 4997 | help='trigger in dry run mode') |
| 4998 | parser.add_option('-c', '--clear', action='store_true', |
| 4999 | help='stop CQ run, if any') |
vadimsh@chromium.org | cf6a5d2 | 2015-04-09 22:02:00 +0000 | [diff] [blame] | 5000 | auth.add_auth_options(parser) |
iannucci | e53c935 | 2016-08-17 14:40:40 -0700 | [diff] [blame] | 5001 | _add_codereview_issue_select_options(parser) |
vadimsh@chromium.org | cf6a5d2 | 2015-04-09 22:02:00 +0000 | [diff] [blame] | 5002 | options, args = parser.parse_args(args) |
iannucci | e53c935 | 2016-08-17 14:40:40 -0700 | [diff] [blame] | 5003 | _process_codereview_issue_select_options(parser, options) |
vadimsh@chromium.org | cf6a5d2 | 2015-04-09 22:02:00 +0000 | [diff] [blame] | 5004 | auth_config = auth.extract_auth_config_from_options(options) |
maruel@chromium.org | 27bb387 | 2011-05-30 20:33:19 +0000 | [diff] [blame] | 5005 | if args: |
| 5006 | parser.error('Unrecognized args: %s' % ' '.join(args)) |
tandrii@chromium.org | fa330e8 | 2016-04-13 17:09:52 +0000 | [diff] [blame] | 5007 | if options.dry_run and options.clear: |
| 5008 | parser.error('Make up your mind: both --dry-run and --clear not allowed') |
| 5009 | |
iannucci | e53c935 | 2016-08-17 14:40:40 -0700 | [diff] [blame] | 5010 | cl = Changelist(auth_config=auth_config, issue=options.issue, |
| 5011 | codereview=options.forced_codereview) |
tandrii@chromium.org | fa330e8 | 2016-04-13 17:09:52 +0000 | [diff] [blame] | 5012 | if options.clear: |
tandrii | d9e5ce5 | 2016-07-13 02:32:59 -0700 | [diff] [blame] | 5013 | state = _CQState.NONE |
tandrii@chromium.org | fa330e8 | 2016-04-13 17:09:52 +0000 | [diff] [blame] | 5014 | elif options.dry_run: |
qyearsley | 1fdfcb6 | 2016-10-24 13:22:03 -0700 | [diff] [blame] | 5015 | # TODO(qyearsley): Use cl.TriggerDryRun. |
tandrii@chromium.org | fa330e8 | 2016-04-13 17:09:52 +0000 | [diff] [blame] | 5016 | state = _CQState.DRY_RUN |
| 5017 | else: |
| 5018 | state = _CQState.COMMIT |
| 5019 | if not cl.GetIssue(): |
| 5020 | parser.error('Must upload the issue first') |
tandrii | 9de9ec6 | 2016-07-13 03:01:59 -0700 | [diff] [blame] | 5021 | cl.SetCQState(state) |
maruel@chromium.org | 27bb387 | 2011-05-30 20:33:19 +0000 | [diff] [blame] | 5022 | return 0 |
| 5023 | |
| 5024 | |
groby@chromium.org | 411034a | 2013-02-26 15:12:01 +0000 | [diff] [blame] | 5025 | def CMDset_close(parser, args): |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 5026 | """Closes the issue.""" |
iannucci | e53c935 | 2016-08-17 14:40:40 -0700 | [diff] [blame] | 5027 | _add_codereview_issue_select_options(parser) |
vadimsh@chromium.org | cf6a5d2 | 2015-04-09 22:02:00 +0000 | [diff] [blame] | 5028 | auth.add_auth_options(parser) |
| 5029 | options, args = parser.parse_args(args) |
iannucci | e53c935 | 2016-08-17 14:40:40 -0700 | [diff] [blame] | 5030 | _process_codereview_issue_select_options(parser, options) |
vadimsh@chromium.org | cf6a5d2 | 2015-04-09 22:02:00 +0000 | [diff] [blame] | 5031 | auth_config = auth.extract_auth_config_from_options(options) |
groby@chromium.org | 411034a | 2013-02-26 15:12:01 +0000 | [diff] [blame] | 5032 | if args: |
| 5033 | parser.error('Unrecognized args: %s' % ' '.join(args)) |
iannucci | e53c935 | 2016-08-17 14:40:40 -0700 | [diff] [blame] | 5034 | cl = Changelist(auth_config=auth_config, issue=options.issue, |
| 5035 | codereview=options.forced_codereview) |
groby@chromium.org | 411034a | 2013-02-26 15:12:01 +0000 | [diff] [blame] | 5036 | # Ensure there actually is an issue to close. |
| 5037 | cl.GetDescription() |
| 5038 | cl.CloseIssue() |
| 5039 | return 0 |
| 5040 | |
| 5041 | |
sbc@chromium.org | 87b9bf0 | 2013-09-26 20:35:15 +0000 | [diff] [blame] | 5042 | def CMDdiff(parser, args): |
wychen@chromium.org | 37b2ec0 | 2015-04-03 00:49:15 +0000 | [diff] [blame] | 5043 | """Shows differences between local tree and last upload.""" |
thomasanderson | 074beb2 | 2016-08-29 14:03:20 -0700 | [diff] [blame] | 5044 | parser.add_option( |
| 5045 | '--stat', |
| 5046 | action='store_true', |
| 5047 | dest='stat', |
| 5048 | help='Generate a diffstat') |
vadimsh@chromium.org | cf6a5d2 | 2015-04-09 22:02:00 +0000 | [diff] [blame] | 5049 | auth.add_auth_options(parser) |
| 5050 | options, args = parser.parse_args(args) |
| 5051 | auth_config = auth.extract_auth_config_from_options(options) |
| 5052 | if args: |
| 5053 | parser.error('Unrecognized args: %s' % ' '.join(args)) |
wychen@chromium.org | 46309bf | 2015-04-03 21:04:49 +0000 | [diff] [blame] | 5054 | |
| 5055 | # Uncommitted (staged and unstaged) changes will be destroyed by |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 5056 | # "git reset --hard" if there are merging conflicts in CMDPatchIssue(). |
wychen@chromium.org | 46309bf | 2015-04-03 21:04:49 +0000 | [diff] [blame] | 5057 | # Staged changes would be committed along with the patch from last |
| 5058 | # upload, hence counted toward the "last upload" side in the final |
| 5059 | # diff output, and this is not what we want. |
sbc@chromium.org | 71437c0 | 2015-04-09 19:29:40 +0000 | [diff] [blame] | 5060 | if git_common.is_dirty_git_tree('diff'): |
wychen@chromium.org | 46309bf | 2015-04-03 21:04:49 +0000 | [diff] [blame] | 5061 | return 1 |
| 5062 | |
vadimsh@chromium.org | cf6a5d2 | 2015-04-09 22:02:00 +0000 | [diff] [blame] | 5063 | cl = Changelist(auth_config=auth_config) |
sbc@chromium.org | 78dc984 | 2013-11-25 18:43:44 +0000 | [diff] [blame] | 5064 | issue = cl.GetIssue() |
sbc@chromium.org | 87b9bf0 | 2013-09-26 20:35:15 +0000 | [diff] [blame] | 5065 | branch = cl.GetBranch() |
sbc@chromium.org | 78dc984 | 2013-11-25 18:43:44 +0000 | [diff] [blame] | 5066 | if not issue: |
| 5067 | DieWithError('No issue found for current branch (%s)' % branch) |
sbc@chromium.org | 87b9bf0 | 2013-09-26 20:35:15 +0000 | [diff] [blame] | 5068 | TMP_BRANCH = 'git-cl-diff' |
thestig@chromium.org | 8b0553c | 2014-02-11 00:33:37 +0000 | [diff] [blame] | 5069 | base_branch = cl.GetCommonAncestorWithUpstream() |
sbc@chromium.org | 87b9bf0 | 2013-09-26 20:35:15 +0000 | [diff] [blame] | 5070 | |
| 5071 | # Create a new branch based on the merge-base |
| 5072 | RunGit(['checkout', '-q', '-b', TMP_BRANCH, base_branch]) |
tandrii@chromium.org | 534f67a | 2016-04-07 18:47:05 +0000 | [diff] [blame] | 5073 | # Clear cached branch in cl object, to avoid overwriting original CL branch |
| 5074 | # properties. |
| 5075 | cl.ClearBranch() |
sbc@chromium.org | 87b9bf0 | 2013-09-26 20:35:15 +0000 | [diff] [blame] | 5076 | try: |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 5077 | rtn = cl.CMDPatchIssue(issue, reject=False, nocommit=False, directory=None) |
sbc@chromium.org | 87b9bf0 | 2013-09-26 20:35:15 +0000 | [diff] [blame] | 5078 | if rtn != 0: |
wychen@chromium.org | a872e75 | 2015-04-28 23:42:18 +0000 | [diff] [blame] | 5079 | RunGit(['reset', '--hard']) |
sbc@chromium.org | 87b9bf0 | 2013-09-26 20:35:15 +0000 | [diff] [blame] | 5080 | return rtn |
| 5081 | |
wychen@chromium.org | 0692853 | 2015-02-03 02:11:29 +0000 | [diff] [blame] | 5082 | # Switch back to starting branch and diff against the temporary |
sbc@chromium.org | 87b9bf0 | 2013-09-26 20:35:15 +0000 | [diff] [blame] | 5083 | # branch containing the latest rietveld patch. |
thomasanderson | 074beb2 | 2016-08-29 14:03:20 -0700 | [diff] [blame] | 5084 | cmd = ['git', 'diff'] |
| 5085 | if options.stat: |
| 5086 | cmd.append('--stat') |
| 5087 | cmd.extend([TMP_BRANCH, branch, '--']) |
| 5088 | subprocess2.check_call(cmd) |
sbc@chromium.org | 87b9bf0 | 2013-09-26 20:35:15 +0000 | [diff] [blame] | 5089 | finally: |
| 5090 | RunGit(['checkout', '-q', branch]) |
| 5091 | RunGit(['branch', '-D', TMP_BRANCH]) |
| 5092 | |
| 5093 | return 0 |
| 5094 | |
| 5095 | |
ikarienator@chromium.org | faf3fdf | 2013-09-20 02:11:48 +0000 | [diff] [blame] | 5096 | def CMDowners(parser, args): |
wychen@chromium.org | 37b2ec0 | 2015-04-03 00:49:15 +0000 | [diff] [blame] | 5097 | """Interactively find the owners for reviewing.""" |
ikarienator@chromium.org | faf3fdf | 2013-09-20 02:11:48 +0000 | [diff] [blame] | 5098 | parser.add_option( |
| 5099 | '--no-color', |
| 5100 | action='store_true', |
| 5101 | help='Use this option to disable color output') |
vadimsh@chromium.org | cf6a5d2 | 2015-04-09 22:02:00 +0000 | [diff] [blame] | 5102 | auth.add_auth_options(parser) |
ikarienator@chromium.org | faf3fdf | 2013-09-20 02:11:48 +0000 | [diff] [blame] | 5103 | options, args = parser.parse_args(args) |
vadimsh@chromium.org | cf6a5d2 | 2015-04-09 22:02:00 +0000 | [diff] [blame] | 5104 | auth_config = auth.extract_auth_config_from_options(options) |
ikarienator@chromium.org | faf3fdf | 2013-09-20 02:11:48 +0000 | [diff] [blame] | 5105 | |
| 5106 | author = RunGit(['config', 'user.email']).strip() or None |
| 5107 | |
vadimsh@chromium.org | cf6a5d2 | 2015-04-09 22:02:00 +0000 | [diff] [blame] | 5108 | cl = Changelist(auth_config=auth_config) |
ikarienator@chromium.org | faf3fdf | 2013-09-20 02:11:48 +0000 | [diff] [blame] | 5109 | |
| 5110 | if args: |
| 5111 | if len(args) > 1: |
| 5112 | parser.error('Unknown args') |
| 5113 | base_branch = args[0] |
| 5114 | else: |
| 5115 | # Default to diffing against the common ancestor of the upstream branch. |
thestig@chromium.org | 8b0553c | 2014-02-11 00:33:37 +0000 | [diff] [blame] | 5116 | base_branch = cl.GetCommonAncestorWithUpstream() |
ikarienator@chromium.org | faf3fdf | 2013-09-20 02:11:48 +0000 | [diff] [blame] | 5117 | |
| 5118 | change = cl.GetChange(base_branch, None) |
| 5119 | return owners_finder.OwnersFinder( |
| 5120 | [f.LocalPath() for f in |
| 5121 | cl.GetChange(base_branch, None).AffectedFiles()], |
| 5122 | change.RepositoryRoot(), author, |
dtu | 944b605 | 2016-07-14 14:48:21 -0700 | [diff] [blame] | 5123 | fopen=file, os_path=os.path, |
ikarienator@chromium.org | faf3fdf | 2013-09-20 02:11:48 +0000 | [diff] [blame] | 5124 | disable_color=options.no_color).run() |
| 5125 | |
| 5126 | |
jkarlin@chromium.org | 6f7fa5e | 2016-01-20 19:32:21 +0000 | [diff] [blame] | 5127 | def BuildGitDiffCmd(diff_type, upstream_commit, args): |
erg@chromium.org | e0a7c5d | 2015-02-23 20:30:08 +0000 | [diff] [blame] | 5128 | """Generates a diff command.""" |
| 5129 | # Generate diff for the current branch's changes. |
| 5130 | diff_cmd = ['diff', '--no-ext-diff', '--no-prefix', diff_type, |
| 5131 | upstream_commit, '--' ] |
| 5132 | |
| 5133 | if args: |
| 5134 | for arg in args: |
jkarlin@chromium.org | 6f7fa5e | 2016-01-20 19:32:21 +0000 | [diff] [blame] | 5135 | if os.path.isdir(arg) or os.path.isfile(arg): |
erg@chromium.org | e0a7c5d | 2015-02-23 20:30:08 +0000 | [diff] [blame] | 5136 | diff_cmd.append(arg) |
| 5137 | else: |
| 5138 | DieWithError('Argument "%s" is not a file or a directory' % arg) |
erg@chromium.org | e0a7c5d | 2015-02-23 20:30:08 +0000 | [diff] [blame] | 5139 | |
| 5140 | return diff_cmd |
| 5141 | |
jkarlin@chromium.org | 6f7fa5e | 2016-01-20 19:32:21 +0000 | [diff] [blame] | 5142 | def MatchingFileType(file_name, extensions): |
| 5143 | """Returns true if the file name ends with one of the given extensions.""" |
| 5144 | return bool([ext for ext in extensions if file_name.lower().endswith(ext)]) |
erg@chromium.org | e0a7c5d | 2015-02-23 20:30:08 +0000 | [diff] [blame] | 5145 | |
enne@chromium.org | 555cfe4 | 2014-01-29 18:21:39 +0000 | [diff] [blame] | 5146 | @subcommand.usage('[files or directories to diff]') |
agable@chromium.org | fab8f82 | 2013-05-06 17:43:09 +0000 | [diff] [blame] | 5147 | def CMDformat(parser, args): |
sbc@chromium.org | 9d0644d | 2015-06-05 23:16:54 +0000 | [diff] [blame] | 5148 | """Runs auto-formatting tools (clang-format etc.) on the diff.""" |
zengster | bf47014 | 2016-07-07 16:43:00 -0700 | [diff] [blame] | 5149 | CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java'] |
kylechar | 58edce2 | 2016-06-17 06:07:51 -0700 | [diff] [blame] | 5150 | GN_EXTS = ['.gn', '.gni', '.typemap'] |
enne@chromium.org | 3b7e15c | 2014-01-21 17:44:47 +0000 | [diff] [blame] | 5151 | parser.add_option('--full', action='store_true', |
| 5152 | help='Reformat the full content of all touched files') |
| 5153 | parser.add_option('--dry-run', action='store_true', |
| 5154 | help='Don\'t modify any file on disk.') |
sbc@chromium.org | 9d0644d | 2015-06-05 23:16:54 +0000 | [diff] [blame] | 5155 | parser.add_option('--python', action='store_true', |
| 5156 | help='Format python code with yapf (experimental).') |
wittman@chromium.org | 04d5a22 | 2014-03-07 18:30:42 +0000 | [diff] [blame] | 5157 | parser.add_option('--diff', action='store_true', |
| 5158 | help='Print diff to stdout rather than modifying files.') |
agable@chromium.org | fab8f82 | 2013-05-06 17:43:09 +0000 | [diff] [blame] | 5159 | opts, args = parser.parse_args(args) |
agable@chromium.org | fab8f82 | 2013-05-06 17:43:09 +0000 | [diff] [blame] | 5160 | |
enne@chromium.org | ff7a1fb | 2013-12-10 19:21:41 +0000 | [diff] [blame] | 5161 | # git diff generates paths against the root of the repository. Change |
| 5162 | # to that directory so clang-format can find files even within subdirs. |
thestig@chromium.org | 8b0553c | 2014-02-11 00:33:37 +0000 | [diff] [blame] | 5163 | rel_base_path = settings.GetRelativeRoot() |
enne@chromium.org | ff7a1fb | 2013-12-10 19:21:41 +0000 | [diff] [blame] | 5164 | if rel_base_path: |
| 5165 | os.chdir(rel_base_path) |
| 5166 | |
digit@chromium.org | 29e4727 | 2013-05-17 17:01:46 +0000 | [diff] [blame] | 5167 | # Grab the merge-base commit, i.e. the upstream commit of the current |
| 5168 | # branch when it was created or the last time it was rebased. This is |
| 5169 | # to cover the case where the user may have called "git fetch origin", |
| 5170 | # moving the origin branch to a newer commit, but hasn't rebased yet. |
| 5171 | upstream_commit = None |
| 5172 | cl = Changelist() |
| 5173 | upstream_branch = cl.GetUpstreamBranch() |
| 5174 | if upstream_branch: |
| 5175 | upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch]) |
| 5176 | upstream_commit = upstream_commit.strip() |
| 5177 | |
| 5178 | if not upstream_commit: |
| 5179 | DieWithError('Could not find base commit for this branch. ' |
| 5180 | 'Are you in detached state?') |
| 5181 | |
jkarlin@chromium.org | 6f7fa5e | 2016-01-20 19:32:21 +0000 | [diff] [blame] | 5182 | changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args) |
| 5183 | diff_output = RunGit(changed_files_cmd) |
| 5184 | diff_files = diff_output.splitlines() |
jkarlin@chromium.org | ad21b92 | 2016-01-28 17:48:42 +0000 | [diff] [blame] | 5185 | # Filter out files deleted by this CL |
| 5186 | diff_files = [x for x in diff_files if os.path.isfile(x)] |
erg@chromium.org | e0a7c5d | 2015-02-23 20:30:08 +0000 | [diff] [blame] | 5187 | |
jkarlin@chromium.org | 6f7fa5e | 2016-01-20 19:32:21 +0000 | [diff] [blame] | 5188 | clang_diff_files = [x for x in diff_files if MatchingFileType(x, CLANG_EXTS)] |
| 5189 | python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])] |
| 5190 | dart_diff_files = [x for x in diff_files if MatchingFileType(x, ['.dart'])] |
kylechar@chromium.org | 8b61f11 | 2016-02-05 13:28:58 +0000 | [diff] [blame] | 5191 | gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)] |
digit@chromium.org | 29e4727 | 2013-05-17 17:01:46 +0000 | [diff] [blame] | 5192 | |
nick@chromium.org | 3ac1c4e | 2014-01-16 02:44:42 +0000 | [diff] [blame] | 5193 | top_dir = os.path.normpath( |
| 5194 | RunGit(["rev-parse", "--show-toplevel"]).rstrip('\n')) |
| 5195 | |
erg@chromium.org | e0a7c5d | 2015-02-23 20:30:08 +0000 | [diff] [blame] | 5196 | # Set to 2 to signal to CheckPatchFormatted() that this patch isn't |
| 5197 | # formatted. This is used to block during the presubmit. |
| 5198 | return_value = 0 |
| 5199 | |
sammc@chromium.org | 0b35f5d | 2016-02-25 22:39:23 +0000 | [diff] [blame] | 5200 | if clang_diff_files: |
techtonik@gmail.com | 5573df1 | 2016-04-12 18:34:10 +0000 | [diff] [blame] | 5201 | # Locate the clang-format binary in the checkout |
| 5202 | try: |
| 5203 | clang_format_tool = clang_format.FindClangFormatToolInChromiumTree() |
vapier | fd77ac7 | 2016-06-16 08:33:57 -0700 | [diff] [blame] | 5204 | except clang_format.NotFoundError as e: |
techtonik@gmail.com | 5573df1 | 2016-04-12 18:34:10 +0000 | [diff] [blame] | 5205 | DieWithError(e) |
| 5206 | |
sammc@chromium.org | 0b35f5d | 2016-02-25 22:39:23 +0000 | [diff] [blame] | 5207 | if opts.full: |
erg@chromium.org | e0a7c5d | 2015-02-23 20:30:08 +0000 | [diff] [blame] | 5208 | cmd = [clang_format_tool] |
| 5209 | if not opts.dry_run and not opts.diff: |
| 5210 | cmd.append('-i') |
jkarlin@chromium.org | 6f7fa5e | 2016-01-20 19:32:21 +0000 | [diff] [blame] | 5211 | stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir) |
erg@chromium.org | e0a7c5d | 2015-02-23 20:30:08 +0000 | [diff] [blame] | 5212 | if opts.diff: |
| 5213 | sys.stdout.write(stdout) |
sammc@chromium.org | 0b35f5d | 2016-02-25 22:39:23 +0000 | [diff] [blame] | 5214 | else: |
| 5215 | env = os.environ.copy() |
| 5216 | env['PATH'] = str(os.path.dirname(clang_format_tool)) |
| 5217 | try: |
| 5218 | script = clang_format.FindClangFormatScriptInChromiumTree( |
| 5219 | 'clang-format-diff.py') |
vapier | fd77ac7 | 2016-06-16 08:33:57 -0700 | [diff] [blame] | 5220 | except clang_format.NotFoundError as e: |
sammc@chromium.org | 0b35f5d | 2016-02-25 22:39:23 +0000 | [diff] [blame] | 5221 | DieWithError(e) |
digit@chromium.org | d6ddc1c | 2013-10-25 15:36:32 +0000 | [diff] [blame] | 5222 | |
sammc@chromium.org | 0b35f5d | 2016-02-25 22:39:23 +0000 | [diff] [blame] | 5223 | cmd = [sys.executable, script, '-p0'] |
| 5224 | if not opts.dry_run and not opts.diff: |
| 5225 | cmd.append('-i') |
digit@chromium.org | d6ddc1c | 2013-10-25 15:36:32 +0000 | [diff] [blame] | 5226 | |
sammc@chromium.org | 0b35f5d | 2016-02-25 22:39:23 +0000 | [diff] [blame] | 5227 | diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files) |
| 5228 | diff_output = RunGit(diff_cmd) |
jkarlin@chromium.org | 6f7fa5e | 2016-01-20 19:32:21 +0000 | [diff] [blame] | 5229 | |
sammc@chromium.org | 0b35f5d | 2016-02-25 22:39:23 +0000 | [diff] [blame] | 5230 | stdout = RunCommand(cmd, stdin=diff_output, cwd=top_dir, env=env) |
| 5231 | if opts.diff: |
| 5232 | sys.stdout.write(stdout) |
| 5233 | if opts.dry_run and len(stdout) > 0: |
| 5234 | return_value = 2 |
agable@chromium.org | fab8f82 | 2013-05-06 17:43:09 +0000 | [diff] [blame] | 5235 | |
sbc@chromium.org | 9d0644d | 2015-06-05 23:16:54 +0000 | [diff] [blame] | 5236 | # Similar code to above, but using yapf on .py files rather than clang-format |
| 5237 | # on C/C++ files |
| 5238 | if opts.python: |
sbc@chromium.org | 9d0644d | 2015-06-05 23:16:54 +0000 | [diff] [blame] | 5239 | yapf_tool = gclient_utils.FindExecutable('yapf') |
| 5240 | if yapf_tool is None: |
| 5241 | DieWithError('yapf not found in PATH') |
| 5242 | |
| 5243 | if opts.full: |
jkarlin@chromium.org | 6f7fa5e | 2016-01-20 19:32:21 +0000 | [diff] [blame] | 5244 | if python_diff_files: |
sbc@chromium.org | 9d0644d | 2015-06-05 23:16:54 +0000 | [diff] [blame] | 5245 | cmd = [yapf_tool] |
| 5246 | if not opts.dry_run and not opts.diff: |
| 5247 | cmd.append('-i') |
jkarlin@chromium.org | 6f7fa5e | 2016-01-20 19:32:21 +0000 | [diff] [blame] | 5248 | stdout = RunCommand(cmd + python_diff_files, cwd=top_dir) |
sbc@chromium.org | 9d0644d | 2015-06-05 23:16:54 +0000 | [diff] [blame] | 5249 | if opts.diff: |
| 5250 | sys.stdout.write(stdout) |
| 5251 | else: |
| 5252 | # TODO(sbc): yapf --lines mode still has some issues. |
| 5253 | # https://github.com/google/yapf/issues/154 |
| 5254 | DieWithError('--python currently only works with --full') |
| 5255 | |
jkarlin@chromium.org | 6f7fa5e | 2016-01-20 19:32:21 +0000 | [diff] [blame] | 5256 | # Dart's formatter does not have the nice property of only operating on |
| 5257 | # modified chunks, so hard code full. |
| 5258 | if dart_diff_files: |
erg@chromium.org | e0a7c5d | 2015-02-23 20:30:08 +0000 | [diff] [blame] | 5259 | try: |
| 5260 | command = [dart_format.FindDartFmtToolInChromiumTree()] |
| 5261 | if not opts.dry_run and not opts.diff: |
| 5262 | command.append('-w') |
jkarlin@chromium.org | 6f7fa5e | 2016-01-20 19:32:21 +0000 | [diff] [blame] | 5263 | command.extend(dart_diff_files) |
erg@chromium.org | e0a7c5d | 2015-02-23 20:30:08 +0000 | [diff] [blame] | 5264 | |
ppi@chromium.org | 6593d93 | 2016-03-03 15:41:15 +0000 | [diff] [blame] | 5265 | stdout = RunCommand(command, cwd=top_dir) |
erg@chromium.org | e0a7c5d | 2015-02-23 20:30:08 +0000 | [diff] [blame] | 5266 | if opts.dry_run and stdout: |
| 5267 | return_value = 2 |
| 5268 | except dart_format.NotFoundError as e: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 5269 | print('Warning: Unable to check Dart code formatting. Dart SDK not ' |
| 5270 | 'found in this checkout. Files in other languages are still ' |
| 5271 | 'formatted.') |
erg@chromium.org | e0a7c5d | 2015-02-23 20:30:08 +0000 | [diff] [blame] | 5272 | |
kylechar@chromium.org | 8b61f11 | 2016-02-05 13:28:58 +0000 | [diff] [blame] | 5273 | # Format GN build files. Always run on full build files for canonical form. |
| 5274 | if gn_diff_files: |
brettw | 4b8ed59 | 2016-08-05 16:19:12 -0700 | [diff] [blame] | 5275 | cmd = ['gn', 'format' ] |
| 5276 | if opts.dry_run or opts.diff: |
| 5277 | cmd.append('--dry-run') |
kylechar@chromium.org | 8b61f11 | 2016-02-05 13:28:58 +0000 | [diff] [blame] | 5278 | for gn_diff_file in gn_diff_files: |
brettw | 4b8ed59 | 2016-08-05 16:19:12 -0700 | [diff] [blame] | 5279 | gn_ret = subprocess2.call(cmd + [gn_diff_file], |
| 5280 | shell=sys.platform == 'win32', |
| 5281 | cwd=top_dir) |
| 5282 | if opts.dry_run and gn_ret == 2: |
| 5283 | return_value = 2 # Not formatted. |
| 5284 | elif opts.diff and gn_ret == 2: |
| 5285 | # TODO this should compute and print the actual diff. |
| 5286 | print("This change has GN build file diff for " + gn_diff_file) |
| 5287 | elif gn_ret != 0: |
| 5288 | # For non-dry run cases (and non-2 return values for dry-run), a |
| 5289 | # nonzero error code indicates a failure, probably because the file |
| 5290 | # doesn't parse. |
| 5291 | DieWithError("gn format failed on " + gn_diff_file + |
| 5292 | "\nTry running 'gn format' on this file manually.") |
kylechar@chromium.org | 8b61f11 | 2016-02-05 13:28:58 +0000 | [diff] [blame] | 5293 | |
erg@chromium.org | e0a7c5d | 2015-02-23 20:30:08 +0000 | [diff] [blame] | 5294 | return return_value |
agable@chromium.org | fab8f82 | 2013-05-06 17:43:09 +0000 | [diff] [blame] | 5295 | |
| 5296 | |
scottmg@chromium.org | 84a80c4 | 2015-09-22 20:40:37 +0000 | [diff] [blame] | 5297 | @subcommand.usage('<codereview url or issue id>') |
| 5298 | def CMDcheckout(parser, args): |
tandrii@chromium.org | 5df290f | 2016-04-11 16:12:29 +0000 | [diff] [blame] | 5299 | """Checks out a branch associated with a given Rietveld or Gerrit issue.""" |
scottmg@chromium.org | 84a80c4 | 2015-09-22 20:40:37 +0000 | [diff] [blame] | 5300 | _, args = parser.parse_args(args) |
| 5301 | |
| 5302 | if len(args) != 1: |
| 5303 | parser.print_help() |
| 5304 | return 1 |
| 5305 | |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 5306 | issue_arg = ParseIssueNumberArgument(args[0]) |
tandrii@chromium.org | de6c9a1 | 2016-04-11 15:33:53 +0000 | [diff] [blame] | 5307 | if not issue_arg.valid: |
scottmg@chromium.org | 84a80c4 | 2015-09-22 20:40:37 +0000 | [diff] [blame] | 5308 | parser.print_help() |
| 5309 | return 1 |
tandrii@chromium.org | abd27e5 | 2016-04-11 15:43:32 +0000 | [diff] [blame] | 5310 | target_issue = str(issue_arg.issue) |
scottmg@chromium.org | 84a80c4 | 2015-09-22 20:40:37 +0000 | [diff] [blame] | 5311 | |
tandrii@chromium.org | 5df290f | 2016-04-11 16:12:29 +0000 | [diff] [blame] | 5312 | def find_issues(issueprefix): |
tandrii@chromium.org | 26c8fd2 | 2016-04-11 21:33:21 +0000 | [diff] [blame] | 5313 | output = RunGit(['config', '--local', '--get-regexp', |
| 5314 | r'branch\..*\.%s' % issueprefix], |
| 5315 | error_ok=True) |
| 5316 | for key, issue in [x.split() for x in output.splitlines()]: |
tandrii@chromium.org | 5df290f | 2016-04-11 16:12:29 +0000 | [diff] [blame] | 5317 | if issue == target_issue: |
| 5318 | yield re.sub(r'branch\.(.*)\.%s' % issueprefix, r'\1', key) |
scottmg@chromium.org | 84a80c4 | 2015-09-22 20:40:37 +0000 | [diff] [blame] | 5319 | |
tandrii@chromium.org | 5df290f | 2016-04-11 16:12:29 +0000 | [diff] [blame] | 5320 | branches = [] |
| 5321 | for cls in _CODEREVIEW_IMPLEMENTATIONS.values(): |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 5322 | branches.extend(find_issues(cls.IssueConfigKey())) |
scottmg@chromium.org | 84a80c4 | 2015-09-22 20:40:37 +0000 | [diff] [blame] | 5323 | if len(branches) == 0: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 5324 | print('No branch found for issue %s.' % target_issue) |
scottmg@chromium.org | 84a80c4 | 2015-09-22 20:40:37 +0000 | [diff] [blame] | 5325 | return 1 |
| 5326 | if len(branches) == 1: |
| 5327 | RunGit(['checkout', branches[0]]) |
| 5328 | else: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 5329 | print('Multiple branches match issue %s:' % target_issue) |
scottmg@chromium.org | 84a80c4 | 2015-09-22 20:40:37 +0000 | [diff] [blame] | 5330 | for i in range(len(branches)): |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 5331 | print('%d: %s' % (i, branches[i])) |
scottmg@chromium.org | 84a80c4 | 2015-09-22 20:40:37 +0000 | [diff] [blame] | 5332 | which = raw_input('Choose by index: ') |
| 5333 | try: |
| 5334 | RunGit(['checkout', branches[int(which)]]) |
| 5335 | except (IndexError, ValueError): |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 5336 | print('Invalid selection, not checking out any branch.') |
scottmg@chromium.org | 84a80c4 | 2015-09-22 20:40:37 +0000 | [diff] [blame] | 5337 | return 1 |
| 5338 | |
| 5339 | return 0 |
| 5340 | |
| 5341 | |
maruel@chromium.org | 29404b5 | 2014-09-08 22:58:00 +0000 | [diff] [blame] | 5342 | def CMDlol(parser, args): |
| 5343 | # This command is intentionally undocumented. |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 5344 | print(zlib.decompress(base64.b64decode( |
thakis@chromium.org | 3421c99 | 2014-11-02 02:20:32 +0000 | [diff] [blame] | 5345 | 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE' |
| 5346 | 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9' |
| 5347 | 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W' |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 5348 | 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY'))) |
maruel@chromium.org | 29404b5 | 2014-09-08 22:58:00 +0000 | [diff] [blame] | 5349 | return 0 |
| 5350 | |
| 5351 | |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 5352 | class OptionParser(optparse.OptionParser): |
| 5353 | """Creates the option parse and add --verbose support.""" |
| 5354 | def __init__(self, *args, **kwargs): |
maruel@chromium.org | 0633fb4 | 2013-08-16 20:06:14 +0000 | [diff] [blame] | 5355 | optparse.OptionParser.__init__( |
| 5356 | self, *args, prog='git cl', version=__version__, **kwargs) |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 5357 | self.add_option( |
| 5358 | '-v', '--verbose', action='count', default=0, |
| 5359 | help='Use 2 times for more debugging info') |
| 5360 | |
| 5361 | def parse_args(self, args=None, values=None): |
| 5362 | options, args = optparse.OptionParser.parse_args(self, args, values) |
| 5363 | levels = [logging.WARNING, logging.INFO, logging.DEBUG] |
| 5364 | logging.basicConfig(level=levels[min(options.verbose, len(levels) - 1)]) |
| 5365 | return options, args |
| 5366 | |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 5367 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 5368 | def main(argv): |
maruel@chromium.org | 82798cb | 2012-02-23 18:16:12 +0000 | [diff] [blame] | 5369 | if sys.hexversion < 0x02060000: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 5370 | print('\nYour python version %s is unsupported, please upgrade.\n' % |
| 5371 | (sys.version.split(' ', 1)[0],), file=sys.stderr) |
maruel@chromium.org | 82798cb | 2012-02-23 18:16:12 +0000 | [diff] [blame] | 5372 | return 2 |
maruel@chromium.org | 2e23ce3 | 2013-05-07 12:42:28 +0000 | [diff] [blame] | 5373 | |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 5374 | # Reload settings. |
| 5375 | global settings |
| 5376 | settings = Settings() |
| 5377 | |
maruel@chromium.org | 39c0b22 | 2013-08-17 16:57:01 +0000 | [diff] [blame] | 5378 | colorize_CMDstatus_doc() |
maruel@chromium.org | 0633fb4 | 2013-08-16 20:06:14 +0000 | [diff] [blame] | 5379 | dispatcher = subcommand.CommandDispatcher(__name__) |
| 5380 | try: |
| 5381 | return dispatcher.execute(OptionParser(), argv) |
vadimsh@chromium.org | eed4df3 | 2015-04-10 21:30:20 +0000 | [diff] [blame] | 5382 | except auth.AuthenticationError as e: |
| 5383 | DieWithError(str(e)) |
vapier | fd77ac7 | 2016-06-16 08:33:57 -0700 | [diff] [blame] | 5384 | except urllib2.HTTPError as e: |
maruel@chromium.org | 0633fb4 | 2013-08-16 20:06:14 +0000 | [diff] [blame] | 5385 | if e.code != 500: |
| 5386 | raise |
| 5387 | DieWithError( |
| 5388 | ('AppEngine is misbehaving and returned HTTP %d, again. Keep faith ' |
| 5389 | 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e))) |
sbc@chromium.org | 013731e | 2015-02-26 18:28:43 +0000 | [diff] [blame] | 5390 | return 0 |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 5391 | |
| 5392 | |
| 5393 | if __name__ == '__main__': |
maruel@chromium.org | 2e23ce3 | 2013-05-07 12:42:28 +0000 | [diff] [blame] | 5394 | # These affect sys.stdout so do it outside of main() to simplify mocks in |
| 5395 | # unit testing. |
maruel@chromium.org | 6f09cd9 | 2011-04-01 16:38:12 +0000 | [diff] [blame] | 5396 | fix_encoding.fix_encoding() |
iannucci@chromium.org | 596cd5c | 2016-04-04 21:34:39 +0000 | [diff] [blame] | 5397 | setup_color.init() |
sbc@chromium.org | 013731e | 2015-02-26 18:28:43 +0000 | [diff] [blame] | 5398 | try: |
| 5399 | sys.exit(main(sys.argv[1:])) |
| 5400 | except KeyboardInterrupt: |
| 5401 | sys.stderr.write('interrupted\n') |
| 5402 | sys.exit(1) |