maruel@chromium.org | 725f1c3 | 2011-04-01 20:24:54 +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 | |
maruel@chromium.org | 725f1c3 | 2011-04-01 20:24:54 +0000 | [diff] [blame] | 8 | """A git-command for integrating reviews on Rietveld.""" |
| 9 | |
tapted@chromium.org | 6a0b07c | 2013-07-10 01:29:19 +0000 | [diff] [blame] | 10 | from distutils.version import LooseVersion |
thakis@chromium.org | 3421c99 | 2014-11-02 02:20:32 +0000 | [diff] [blame] | 11 | import base64 |
ikarienator@chromium.org | faf3fdf | 2013-09-20 02:11:48 +0000 | [diff] [blame] | 12 | import glob |
maruel@chromium.org | 4f6852c | 2012-04-20 20:39:20 +0000 | [diff] [blame] | 13 | import json |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 14 | import logging |
| 15 | import optparse |
| 16 | import os |
maruel@chromium.org | 1033efd | 2013-07-23 23:25:09 +0000 | [diff] [blame] | 17 | import Queue |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 18 | import re |
ukai@chromium.org | 78c4b98 | 2012-02-14 02:20:26 +0000 | [diff] [blame] | 19 | import stat |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 20 | import sys |
bauerb@chromium.org | 27386dd | 2015-02-16 10:45:39 +0000 | [diff] [blame] | 21 | import tempfile |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 22 | import textwrap |
maruel@chromium.org | 1033efd | 2013-07-23 23:25:09 +0000 | [diff] [blame] | 23 | import threading |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 24 | import urllib2 |
maruel@chromium.org | 967c0a8 | 2013-06-17 22:52:24 +0000 | [diff] [blame] | 25 | import urlparse |
thestig@chromium.org | 00858c8 | 2013-12-02 23:08:03 +0000 | [diff] [blame] | 26 | import webbrowser |
thakis@chromium.org | 3421c99 | 2014-11-02 02:20:32 +0000 | [diff] [blame] | 27 | import zlib |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 28 | |
| 29 | try: |
maruel@chromium.org | c98c0c5 | 2011-04-06 13:39:43 +0000 | [diff] [blame] | 30 | import readline # pylint: disable=F0401,W0611 |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 31 | except ImportError: |
| 32 | pass |
| 33 | |
maruel@chromium.org | 2a74d37 | 2011-03-29 19:05:50 +0000 | [diff] [blame] | 34 | |
maruel@chromium.org | 2e23ce3 | 2013-05-07 12:42:28 +0000 | [diff] [blame] | 35 | from third_party import colorama |
maruel@chromium.org | 2a74d37 | 2011-03-29 19:05:50 +0000 | [diff] [blame] | 36 | from third_party import upload |
| 37 | import breakpad # pylint: disable=W0611 |
nick@chromium.org | 3ac1c4e | 2014-01-16 02:44:42 +0000 | [diff] [blame] | 38 | import clang_format |
maruel@chromium.org | 6f09cd9 | 2011-04-01 16:38:12 +0000 | [diff] [blame] | 39 | import fix_encoding |
maruel@chromium.org | 0e0436a | 2011-10-25 13:32:41 +0000 | [diff] [blame] | 40 | import gclient_utils |
iannucci@chromium.org | 9e84927 | 2014-04-04 00:31:55 +0000 | [diff] [blame] | 41 | import git_common |
piman@chromium.org | 336f912 | 2014-09-04 02:16:55 +0000 | [diff] [blame] | 42 | import owners |
iannucci@chromium.org | 9e84927 | 2014-04-04 00:31:55 +0000 | [diff] [blame] | 43 | import owners_finder |
maruel@chromium.org | 2a74d37 | 2011-03-29 19:05:50 +0000 | [diff] [blame] | 44 | import presubmit_support |
maruel@chromium.org | cab38e9 | 2011-04-09 00:30:51 +0000 | [diff] [blame] | 45 | import rietveld |
maruel@chromium.org | 2a74d37 | 2011-03-29 19:05:50 +0000 | [diff] [blame] | 46 | import scm |
maruel@chromium.org | 0633fb4 | 2013-08-16 20:06:14 +0000 | [diff] [blame] | 47 | import subcommand |
maruel@chromium.org | 32f9f5e | 2011-09-14 13:41:47 +0000 | [diff] [blame] | 48 | import subprocess2 |
maruel@chromium.org | 2a74d37 | 2011-03-29 19:05:50 +0000 | [diff] [blame] | 49 | import watchlists |
| 50 | |
maruel@chromium.org | 0633fb4 | 2013-08-16 20:06:14 +0000 | [diff] [blame] | 51 | __version__ = '1.0' |
maruel@chromium.org | 2a74d37 | 2011-03-29 19:05:50 +0000 | [diff] [blame] | 52 | |
maruel@chromium.org | eb5edbc | 2012-01-16 17:03:28 +0000 | [diff] [blame] | 53 | DEFAULT_SERVER = 'https://codereview.appspot.com' |
maruel@chromium.org | 0ba7f96 | 2011-01-11 22:13:58 +0000 | [diff] [blame] | 54 | POSTUPSTREAM_HOOK_PATTERN = '.git/hooks/post-cl-%s' |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 55 | DESCRIPTION_BACKUP_FILE = '~/.git_cl_description_backup' |
pgervais@chromium.org | d6617f3 | 2013-11-19 00:34:54 +0000 | [diff] [blame] | 56 | GIT_INSTRUCTIONS_URL = 'http://code.google.com/p/chromium/wiki/UsingGit' |
sivachandra@chromium.org | aebe87f | 2012-10-22 20:34:21 +0000 | [diff] [blame] | 57 | CHANGE_ID = 'Change-Id:' |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 58 | |
thestig@chromium.org | 44202a2 | 2014-03-11 19:22:18 +0000 | [diff] [blame] | 59 | # Valid extensions for files we want to lint. |
| 60 | DEFAULT_LINT_REGEX = r"(.*\.cpp|.*\.cc|.*\.h)" |
| 61 | DEFAULT_LINT_IGNORE_REGEX = r"$^" |
| 62 | |
maruel@chromium.org | 2e23ce3 | 2013-05-07 12:42:28 +0000 | [diff] [blame] | 63 | # Shortcut since it quickly becomes redundant. |
| 64 | Fore = colorama.Fore |
maruel@chromium.org | 9054173 | 2011-04-01 17:54:18 +0000 | [diff] [blame] | 65 | |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 66 | # Initialized in main() |
| 67 | settings = None |
| 68 | |
| 69 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 70 | def DieWithError(message): |
dpranke@chromium.org | 970c522 | 2011-03-12 00:32:24 +0000 | [diff] [blame] | 71 | print >> sys.stderr, message |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 72 | sys.exit(1) |
| 73 | |
| 74 | |
thestig@chromium.org | 8b0553c | 2014-02-11 00:33:37 +0000 | [diff] [blame] | 75 | def GetNoGitPagerEnv(): |
| 76 | env = os.environ.copy() |
| 77 | # 'cat' is a magical git string that disables pagers on all platforms. |
| 78 | env['GIT_PAGER'] = 'cat' |
| 79 | return env |
| 80 | |
vadimsh@chromium.org | 566a02a | 2014-08-22 01:34:13 +0000 | [diff] [blame] | 81 | |
maruel@chromium.org | 32f9f5e | 2011-09-14 13:41:47 +0000 | [diff] [blame] | 82 | def RunCommand(args, error_ok=False, error_message=None, **kwargs): |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 83 | try: |
maruel@chromium.org | 373af80 | 2012-05-25 21:07:33 +0000 | [diff] [blame] | 84 | return subprocess2.check_output(args, shell=False, **kwargs) |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 85 | except subprocess2.CalledProcessError as e: |
| 86 | logging.debug('Failed running %s', args) |
maruel@chromium.org | 32f9f5e | 2011-09-14 13:41:47 +0000 | [diff] [blame] | 87 | if not error_ok: |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 88 | DieWithError( |
maruel@chromium.org | 32f9f5e | 2011-09-14 13:41:47 +0000 | [diff] [blame] | 89 | 'Command "%s" failed.\n%s' % ( |
| 90 | ' '.join(args), error_message or e.stdout or '')) |
| 91 | return e.stdout |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 92 | |
| 93 | |
| 94 | def RunGit(args, **kwargs): |
maruel@chromium.org | 32f9f5e | 2011-09-14 13:41:47 +0000 | [diff] [blame] | 95 | """Returns stdout.""" |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 96 | return RunCommand(['git'] + args, **kwargs) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 97 | |
| 98 | |
enne@chromium.org | 3b7e15c | 2014-01-21 17:44:47 +0000 | [diff] [blame] | 99 | def RunGitWithCode(args, suppress_stderr=False): |
maruel@chromium.org | 32f9f5e | 2011-09-14 13:41:47 +0000 | [diff] [blame] | 100 | """Returns return code and stdout.""" |
szager@chromium.org | 9bb85e2 | 2012-06-13 20:28:23 +0000 | [diff] [blame] | 101 | try: |
enne@chromium.org | 3b7e15c | 2014-01-21 17:44:47 +0000 | [diff] [blame] | 102 | if suppress_stderr: |
| 103 | stderr = subprocess2.VOID |
| 104 | else: |
| 105 | stderr = sys.stderr |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 106 | out, code = subprocess2.communicate(['git'] + args, |
thestig@chromium.org | 8b0553c | 2014-02-11 00:33:37 +0000 | [diff] [blame] | 107 | env=GetNoGitPagerEnv(), |
enne@chromium.org | 3b7e15c | 2014-01-21 17:44:47 +0000 | [diff] [blame] | 108 | stdout=subprocess2.PIPE, |
| 109 | stderr=stderr) |
szager@chromium.org | 9bb85e2 | 2012-06-13 20:28:23 +0000 | [diff] [blame] | 110 | return code, out[0] |
| 111 | except ValueError: |
| 112 | # When the subprocess fails, it returns None. That triggers a ValueError |
| 113 | # when trying to unpack the return value into (out, code). |
| 114 | return 1, '' |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 115 | |
| 116 | |
bauerb@chromium.org | 27386dd | 2015-02-16 10:45:39 +0000 | [diff] [blame] | 117 | def RunGitSilent(args): |
| 118 | """Returns stdout, suppresses stderr and ingores the return code.""" |
| 119 | return RunGitWithCode(args, suppress_stderr=True)[1] |
| 120 | |
| 121 | |
tapted@chromium.org | 6a0b07c | 2013-07-10 01:29:19 +0000 | [diff] [blame] | 122 | def IsGitVersionAtLeast(min_version): |
ilevy@chromium.org | cc56ee4 | 2013-07-10 22:16:29 +0000 | [diff] [blame] | 123 | prefix = 'git version ' |
tapted@chromium.org | 6a0b07c | 2013-07-10 01:29:19 +0000 | [diff] [blame] | 124 | version = RunGit(['--version']).strip() |
ilevy@chromium.org | cc56ee4 | 2013-07-10 22:16:29 +0000 | [diff] [blame] | 125 | return (version.startswith(prefix) and |
| 126 | LooseVersion(version[len(prefix):]) >= LooseVersion(min_version)) |
tapted@chromium.org | 6a0b07c | 2013-07-10 01:29:19 +0000 | [diff] [blame] | 127 | |
| 128 | |
maruel@chromium.org | 9054173 | 2011-04-01 17:54:18 +0000 | [diff] [blame] | 129 | def ask_for_data(prompt): |
| 130 | try: |
| 131 | return raw_input(prompt) |
| 132 | except KeyboardInterrupt: |
| 133 | # Hide the exception. |
| 134 | sys.exit(1) |
| 135 | |
| 136 | |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 137 | def git_set_branch_value(key, value): |
| 138 | branch = Changelist().GetBranch() |
rogerta@chromium.org | caa1655 | 2013-03-18 20:45:05 +0000 | [diff] [blame] | 139 | if not branch: |
| 140 | return |
| 141 | |
| 142 | cmd = ['config'] |
| 143 | if isinstance(value, int): |
| 144 | cmd.append('--int') |
| 145 | git_key = 'branch.%s.%s' % (branch, key) |
| 146 | RunGit(cmd + [git_key, str(value)]) |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 147 | |
| 148 | |
| 149 | def git_get_branch_default(key, default): |
| 150 | branch = Changelist().GetBranch() |
| 151 | if branch: |
| 152 | git_key = 'branch.%s.%s' % (branch, key) |
| 153 | (_, stdout) = RunGitWithCode(['config', '--int', '--get', git_key]) |
| 154 | try: |
| 155 | return int(stdout.strip()) |
| 156 | except ValueError: |
| 157 | pass |
| 158 | return default |
| 159 | |
| 160 | |
iannucci@chromium.org | 53937ba | 2012-10-02 18:20:43 +0000 | [diff] [blame] | 161 | def add_git_similarity(parser): |
| 162 | parser.add_option( |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 163 | '--similarity', metavar='SIM', type='int', action='store', |
iannucci@chromium.org | 53937ba | 2012-10-02 18:20:43 +0000 | [diff] [blame] | 164 | help='Sets the percentage that a pair of files need to match in order to' |
| 165 | ' be considered copies (default 50)') |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 166 | parser.add_option( |
| 167 | '--find-copies', action='store_true', |
| 168 | help='Allows git to look for copies.') |
| 169 | parser.add_option( |
| 170 | '--no-find-copies', action='store_false', dest='find_copies', |
| 171 | help='Disallows git from looking for copies.') |
iannucci@chromium.org | 53937ba | 2012-10-02 18:20:43 +0000 | [diff] [blame] | 172 | |
| 173 | old_parser_args = parser.parse_args |
| 174 | def Parse(args): |
| 175 | options, args = old_parser_args(args) |
| 176 | |
iannucci@chromium.org | 53937ba | 2012-10-02 18:20:43 +0000 | [diff] [blame] | 177 | if options.similarity is None: |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 178 | options.similarity = git_get_branch_default('git-cl-similarity', 50) |
iannucci@chromium.org | 53937ba | 2012-10-02 18:20:43 +0000 | [diff] [blame] | 179 | else: |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 180 | print('Note: Saving similarity of %d%% in git config.' |
| 181 | % options.similarity) |
| 182 | git_set_branch_value('git-cl-similarity', options.similarity) |
iannucci@chromium.org | 53937ba | 2012-10-02 18:20:43 +0000 | [diff] [blame] | 183 | |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 184 | options.similarity = max(0, min(options.similarity, 100)) |
| 185 | |
| 186 | if options.find_copies is None: |
| 187 | options.find_copies = bool( |
| 188 | git_get_branch_default('git-find-copies', True)) |
| 189 | else: |
| 190 | git_set_branch_value('git-find-copies', int(options.find_copies)) |
iannucci@chromium.org | 53937ba | 2012-10-02 18:20:43 +0000 | [diff] [blame] | 191 | |
| 192 | print('Using %d%% similarity for rename/copy detection. ' |
| 193 | 'Override with --similarity.' % options.similarity) |
| 194 | |
| 195 | return options, args |
| 196 | parser.parse_args = Parse |
| 197 | |
| 198 | |
ukai@chromium.org | 259e468 | 2012-10-25 07:36:33 +0000 | [diff] [blame] | 199 | def is_dirty_git_tree(cmd): |
| 200 | # Make sure index is up-to-date before running diff-index. |
| 201 | RunGit(['update-index', '--refresh', '-q'], error_ok=True) |
| 202 | dirty = RunGit(['diff-index', '--name-status', 'HEAD']) |
| 203 | if dirty: |
| 204 | print 'Cannot %s with a dirty tree. You must commit locally first.' % cmd |
| 205 | print 'Uncommitted files: (git diff-index --name-status HEAD)' |
| 206 | print dirty[:4096] |
| 207 | if len(dirty) > 4096: |
| 208 | print '... (run "git diff-index --name-status HEAD" to see full output).' |
| 209 | return True |
| 210 | return False |
| 211 | |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 212 | |
bauerb@chromium.org | 866276c | 2011-03-18 20:09:31 +0000 | [diff] [blame] | 213 | def MatchSvnGlob(url, base_url, glob_spec, allow_wildcards): |
| 214 | """Return the corresponding git ref if |base_url| together with |glob_spec| |
| 215 | matches the full |url|. |
| 216 | |
| 217 | If |allow_wildcards| is true, |glob_spec| can contain wildcards (see below). |
| 218 | """ |
| 219 | fetch_suburl, as_ref = glob_spec.split(':') |
| 220 | if allow_wildcards: |
| 221 | glob_match = re.match('(.+/)?(\*|{[^/]*})(/.+)?', fetch_suburl) |
| 222 | if glob_match: |
| 223 | # Parse specs like "branches/*/src:refs/remotes/svn/*" or |
| 224 | # "branches/{472,597,648}/src:refs/remotes/svn/*". |
| 225 | branch_re = re.escape(base_url) |
| 226 | if glob_match.group(1): |
| 227 | branch_re += '/' + re.escape(glob_match.group(1)) |
| 228 | wildcard = glob_match.group(2) |
| 229 | if wildcard == '*': |
| 230 | branch_re += '([^/]*)' |
| 231 | else: |
| 232 | # Escape and replace surrounding braces with parentheses and commas |
| 233 | # with pipe symbols. |
| 234 | wildcard = re.escape(wildcard) |
| 235 | wildcard = re.sub('^\\\\{', '(', wildcard) |
| 236 | wildcard = re.sub('\\\\,', '|', wildcard) |
| 237 | wildcard = re.sub('\\\\}$', ')', wildcard) |
| 238 | branch_re += wildcard |
| 239 | if glob_match.group(3): |
| 240 | branch_re += re.escape(glob_match.group(3)) |
| 241 | match = re.match(branch_re, url) |
| 242 | if match: |
| 243 | return re.sub('\*$', match.group(1), as_ref) |
| 244 | |
| 245 | # Parse specs like "trunk/src:refs/remotes/origin/trunk". |
| 246 | if fetch_suburl: |
| 247 | full_url = base_url + '/' + fetch_suburl |
| 248 | else: |
| 249 | full_url = base_url |
| 250 | if full_url == url: |
| 251 | return as_ref |
| 252 | return None |
| 253 | |
maruel@chromium.org | 32f9f5e | 2011-09-14 13:41:47 +0000 | [diff] [blame] | 254 | |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 255 | def print_stats(similarity, find_copies, args): |
maruel@chromium.org | 49e3d80 | 2012-07-18 23:54:45 +0000 | [diff] [blame] | 256 | """Prints statistics about the change to the user.""" |
| 257 | # --no-ext-diff is broken in some versions of Git, so try to work around |
| 258 | # this by overriding the environment (but there is still a problem if the |
| 259 | # git config key "diff.external" is used). |
thestig@chromium.org | 8b0553c | 2014-02-11 00:33:37 +0000 | [diff] [blame] | 260 | env = GetNoGitPagerEnv() |
maruel@chromium.org | 49e3d80 | 2012-07-18 23:54:45 +0000 | [diff] [blame] | 261 | if 'GIT_EXTERNAL_DIFF' in env: |
| 262 | del env['GIT_EXTERNAL_DIFF'] |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 263 | |
| 264 | if find_copies: |
| 265 | similarity_options = ['--find-copies-harder', '-l100000', |
| 266 | '-C%s' % similarity] |
| 267 | else: |
| 268 | similarity_options = ['-M%s' % similarity] |
| 269 | |
szager@chromium.org | d057f9a | 2014-05-29 21:09:36 +0000 | [diff] [blame] | 270 | try: |
| 271 | stdout = sys.stdout.fileno() |
| 272 | except AttributeError: |
| 273 | stdout = None |
maruel@chromium.org | 49e3d80 | 2012-07-18 23:54:45 +0000 | [diff] [blame] | 274 | return subprocess2.call( |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 275 | ['git', |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 276 | 'diff', '--no-ext-diff', '--stat'] + similarity_options + args, |
szager@chromium.org | d057f9a | 2014-05-29 21:09:36 +0000 | [diff] [blame] | 277 | stdout=stdout, env=env) |
maruel@chromium.org | 49e3d80 | 2012-07-18 23:54:45 +0000 | [diff] [blame] | 278 | |
| 279 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 280 | class Settings(object): |
| 281 | def __init__(self): |
| 282 | self.default_server = None |
| 283 | self.cc = None |
thestig@chromium.org | 7a54e81 | 2014-02-11 19:57:22 +0000 | [diff] [blame] | 284 | self.root = None |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 285 | self.is_git_svn = None |
| 286 | self.svn_branch = None |
| 287 | self.tree_status_url = None |
| 288 | self.viewvc_url = None |
| 289 | self.updated = False |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 290 | self.is_gerrit = None |
jbroman@chromium.org | 615a262 | 2013-05-03 13:20:14 +0000 | [diff] [blame] | 291 | self.git_editor = None |
sheyang@chromium.org | 152cf83 | 2014-06-11 21:37:49 +0000 | [diff] [blame] | 292 | self.project = None |
kjellander@chromium.org | 6abc652 | 2014-12-02 07:34:49 +0000 | [diff] [blame] | 293 | self.force_https_commit_url = None |
vadimsh@chromium.org | 566a02a | 2014-08-22 01:34:13 +0000 | [diff] [blame] | 294 | self.pending_ref_prefix = None |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 295 | |
| 296 | def LazyUpdateIfNeeded(self): |
| 297 | """Updates the settings from a codereview.settings file, if available.""" |
| 298 | if not self.updated: |
pgervais@chromium.org | 87884cc | 2014-01-03 22:23:41 +0000 | [diff] [blame] | 299 | # The only value that actually changes the behavior is |
| 300 | # autoupdate = "false". Everything else means "true". |
nick@chromium.org | 3ac1c4e | 2014-01-16 02:44:42 +0000 | [diff] [blame] | 301 | autoupdate = RunGit(['config', 'rietveld.autoupdate'], |
pgervais@chromium.org | 87884cc | 2014-01-03 22:23:41 +0000 | [diff] [blame] | 302 | error_ok=True |
| 303 | ).strip().lower() |
| 304 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 305 | cr_settings_file = FindCodereviewSettingsFile() |
pgervais@chromium.org | 87884cc | 2014-01-03 22:23:41 +0000 | [diff] [blame] | 306 | if autoupdate != 'false' and cr_settings_file: |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 307 | LoadCodereviewSettingsFromFile(cr_settings_file) |
pgervais@chromium.org | 87884cc | 2014-01-03 22:23:41 +0000 | [diff] [blame] | 308 | # set updated to True to avoid infinite calling loop |
| 309 | # through DownloadHooks |
ukai@chromium.org | 78c4b98 | 2012-02-14 02:20:26 +0000 | [diff] [blame] | 310 | self.updated = True |
| 311 | DownloadHooks(False) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 312 | self.updated = True |
| 313 | |
| 314 | def GetDefaultServerUrl(self, error_ok=False): |
| 315 | if not self.default_server: |
| 316 | self.LazyUpdateIfNeeded() |
maruel@chromium.org | eb5edbc | 2012-01-16 17:03:28 +0000 | [diff] [blame] | 317 | self.default_server = gclient_utils.UpgradeToHttps( |
thestig@chromium.org | 8b0553c | 2014-02-11 00:33:37 +0000 | [diff] [blame] | 318 | self._GetRietveldConfig('server', error_ok=True)) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 319 | if error_ok: |
| 320 | return self.default_server |
| 321 | if not self.default_server: |
| 322 | error_message = ('Could not find settings file. You must configure ' |
| 323 | 'your review setup by running "git cl config".') |
maruel@chromium.org | eb5edbc | 2012-01-16 17:03:28 +0000 | [diff] [blame] | 324 | self.default_server = gclient_utils.UpgradeToHttps( |
thestig@chromium.org | 8b0553c | 2014-02-11 00:33:37 +0000 | [diff] [blame] | 325 | self._GetRietveldConfig('server', error_message=error_message)) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 326 | return self.default_server |
| 327 | |
thestig@chromium.org | 7a54e81 | 2014-02-11 19:57:22 +0000 | [diff] [blame] | 328 | @staticmethod |
| 329 | def GetRelativeRoot(): |
| 330 | return RunGit(['rev-parse', '--show-cdup']).strip() |
thestig@chromium.org | 8b0553c | 2014-02-11 00:33:37 +0000 | [diff] [blame] | 331 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 332 | def GetRoot(self): |
thestig@chromium.org | 7a54e81 | 2014-02-11 19:57:22 +0000 | [diff] [blame] | 333 | if self.root is None: |
| 334 | self.root = os.path.abspath(self.GetRelativeRoot()) |
| 335 | return self.root |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 336 | |
| 337 | def GetIsGitSvn(self): |
| 338 | """Return true if this repo looks like it's using git-svn.""" |
| 339 | if self.is_git_svn is None: |
vadimsh@chromium.org | 566a02a | 2014-08-22 01:34:13 +0000 | [diff] [blame] | 340 | if self.GetPendingRefPrefix(): |
| 341 | # If PENDING_REF_PREFIX is set then it's a pure git repo no matter what. |
| 342 | self.is_git_svn = False |
| 343 | else: |
| 344 | # If you have any "svn-remote.*" config keys, we think you're using svn. |
| 345 | self.is_git_svn = RunGitWithCode( |
| 346 | ['config', '--local', '--get-regexp', r'^svn-remote\.'])[0] == 0 |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 347 | return self.is_git_svn |
| 348 | |
| 349 | def GetSVNBranch(self): |
| 350 | if self.svn_branch is None: |
| 351 | if not self.GetIsGitSvn(): |
| 352 | DieWithError('Repo doesn\'t appear to be a git-svn repo.') |
| 353 | |
| 354 | # Try to figure out which remote branch we're based on. |
| 355 | # Strategy: |
bauerb@chromium.org | ade368c | 2011-03-01 08:57:50 +0000 | [diff] [blame] | 356 | # 1) iterate through our branch history and find the svn URL. |
| 357 | # 2) find the svn-remote that fetches from the URL. |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 358 | |
| 359 | # regexp matching the git-svn line that contains the URL. |
| 360 | git_svn_re = re.compile(r'^\s*git-svn-id: (\S+)@', re.MULTILINE) |
| 361 | |
bauerb@chromium.org | ade368c | 2011-03-01 08:57:50 +0000 | [diff] [blame] | 362 | # We don't want to go through all of history, so read a line from the |
| 363 | # pipe at a time. |
| 364 | # 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] | 365 | cmd = ['git', 'log', '-100', '--pretty=medium'] |
thestig@chromium.org | 8b0553c | 2014-02-11 00:33:37 +0000 | [diff] [blame] | 366 | proc = subprocess2.Popen(cmd, stdout=subprocess2.PIPE, |
| 367 | env=GetNoGitPagerEnv()) |
maruel@chromium.org | 740f9d7 | 2011-06-10 18:33:10 +0000 | [diff] [blame] | 368 | url = None |
bauerb@chromium.org | ade368c | 2011-03-01 08:57:50 +0000 | [diff] [blame] | 369 | for line in proc.stdout: |
| 370 | match = git_svn_re.match(line) |
| 371 | if match: |
| 372 | url = match.group(1) |
| 373 | proc.stdout.close() # Cut pipe. |
| 374 | break |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 375 | |
bauerb@chromium.org | ade368c | 2011-03-01 08:57:50 +0000 | [diff] [blame] | 376 | if url: |
| 377 | svn_remote_re = re.compile(r'^svn-remote\.([^.]+)\.url (.*)$') |
| 378 | remotes = RunGit(['config', '--get-regexp', |
| 379 | r'^svn-remote\..*\.url']).splitlines() |
| 380 | for remote in remotes: |
| 381 | match = svn_remote_re.match(remote) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 382 | if match: |
bauerb@chromium.org | ade368c | 2011-03-01 08:57:50 +0000 | [diff] [blame] | 383 | remote = match.group(1) |
| 384 | base_url = match.group(2) |
szager@chromium.org | 4ac2553 | 2013-12-16 22:07:02 +0000 | [diff] [blame] | 385 | rewrite_root = RunGit( |
| 386 | ['config', 'svn-remote.%s.rewriteRoot' % remote], |
| 387 | error_ok=True).strip() |
| 388 | if rewrite_root: |
| 389 | base_url = rewrite_root |
bauerb@chromium.org | ade368c | 2011-03-01 08:57:50 +0000 | [diff] [blame] | 390 | fetch_spec = RunGit( |
bauerb@chromium.org | 866276c | 2011-03-18 20:09:31 +0000 | [diff] [blame] | 391 | ['config', 'svn-remote.%s.fetch' % remote], |
| 392 | error_ok=True).strip() |
| 393 | if fetch_spec: |
| 394 | self.svn_branch = MatchSvnGlob(url, base_url, fetch_spec, False) |
| 395 | if self.svn_branch: |
| 396 | break |
| 397 | branch_spec = RunGit( |
| 398 | ['config', 'svn-remote.%s.branches' % remote], |
| 399 | error_ok=True).strip() |
| 400 | if branch_spec: |
| 401 | self.svn_branch = MatchSvnGlob(url, base_url, branch_spec, True) |
| 402 | if self.svn_branch: |
| 403 | break |
| 404 | tag_spec = RunGit( |
| 405 | ['config', 'svn-remote.%s.tags' % remote], |
| 406 | error_ok=True).strip() |
| 407 | if tag_spec: |
| 408 | self.svn_branch = MatchSvnGlob(url, base_url, tag_spec, True) |
| 409 | if self.svn_branch: |
| 410 | break |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 411 | |
| 412 | if not self.svn_branch: |
| 413 | DieWithError('Can\'t guess svn branch -- try specifying it on the ' |
| 414 | 'command line') |
| 415 | |
| 416 | return self.svn_branch |
| 417 | |
| 418 | def GetTreeStatusUrl(self, error_ok=False): |
| 419 | if not self.tree_status_url: |
| 420 | error_message = ('You must configure your tree status URL by running ' |
| 421 | '"git cl config".') |
thestig@chromium.org | 8b0553c | 2014-02-11 00:33:37 +0000 | [diff] [blame] | 422 | self.tree_status_url = self._GetRietveldConfig( |
| 423 | 'tree-status-url', error_ok=error_ok, error_message=error_message) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 424 | return self.tree_status_url |
| 425 | |
| 426 | def GetViewVCUrl(self): |
| 427 | if not self.viewvc_url: |
thestig@chromium.org | 8b0553c | 2014-02-11 00:33:37 +0000 | [diff] [blame] | 428 | self.viewvc_url = self._GetRietveldConfig('viewvc-url', error_ok=True) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 429 | return self.viewvc_url |
| 430 | |
rmistry@google.com | 9075258 | 2014-01-14 21:04:50 +0000 | [diff] [blame] | 431 | def GetBugPrefix(self): |
thestig@chromium.org | 8b0553c | 2014-02-11 00:33:37 +0000 | [diff] [blame] | 432 | return self._GetRietveldConfig('bug-prefix', error_ok=True) |
rmistry@google.com | 9075258 | 2014-01-14 21:04:50 +0000 | [diff] [blame] | 433 | |
bauerb@chromium.org | ae6df35 | 2011-04-06 17:40:39 +0000 | [diff] [blame] | 434 | def GetDefaultCCList(self): |
thestig@chromium.org | 8b0553c | 2014-02-11 00:33:37 +0000 | [diff] [blame] | 435 | return self._GetRietveldConfig('cc', error_ok=True) |
bauerb@chromium.org | ae6df35 | 2011-04-06 17:40:39 +0000 | [diff] [blame] | 436 | |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 437 | def GetDefaultPrivateFlag(self): |
thestig@chromium.org | 8b0553c | 2014-02-11 00:33:37 +0000 | [diff] [blame] | 438 | return self._GetRietveldConfig('private', error_ok=True) |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 439 | |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 440 | def GetIsGerrit(self): |
| 441 | """Return true if this repo is assosiated with gerrit code review system.""" |
| 442 | if self.is_gerrit is None: |
| 443 | self.is_gerrit = self._GetConfig('gerrit.host', error_ok=True) |
| 444 | return self.is_gerrit |
| 445 | |
jbroman@chromium.org | 615a262 | 2013-05-03 13:20:14 +0000 | [diff] [blame] | 446 | def GetGitEditor(self): |
| 447 | """Return the editor specified in the git config, or None if none is.""" |
| 448 | if self.git_editor is None: |
| 449 | self.git_editor = self._GetConfig('core.editor', error_ok=True) |
| 450 | return self.git_editor or None |
| 451 | |
thestig@chromium.org | 44202a2 | 2014-03-11 19:22:18 +0000 | [diff] [blame] | 452 | def GetLintRegex(self): |
| 453 | return (self._GetRietveldConfig('cpplint-regex', error_ok=True) or |
| 454 | DEFAULT_LINT_REGEX) |
| 455 | |
| 456 | def GetLintIgnoreRegex(self): |
| 457 | return (self._GetRietveldConfig('cpplint-ignore-regex', error_ok=True) or |
| 458 | DEFAULT_LINT_IGNORE_REGEX) |
| 459 | |
sheyang@chromium.org | 152cf83 | 2014-06-11 21:37:49 +0000 | [diff] [blame] | 460 | def GetProject(self): |
| 461 | if not self.project: |
| 462 | self.project = self._GetRietveldConfig('project', error_ok=True) |
| 463 | return self.project |
| 464 | |
kjellander@chromium.org | 6abc652 | 2014-12-02 07:34:49 +0000 | [diff] [blame] | 465 | def GetForceHttpsCommitUrl(self): |
| 466 | if not self.force_https_commit_url: |
| 467 | self.force_https_commit_url = self._GetRietveldConfig( |
| 468 | 'force-https-commit-url', error_ok=True) |
| 469 | return self.force_https_commit_url |
| 470 | |
vadimsh@chromium.org | 566a02a | 2014-08-22 01:34:13 +0000 | [diff] [blame] | 471 | def GetPendingRefPrefix(self): |
| 472 | if not self.pending_ref_prefix: |
| 473 | self.pending_ref_prefix = self._GetRietveldConfig( |
| 474 | 'pending-ref-prefix', error_ok=True) |
| 475 | return self.pending_ref_prefix |
| 476 | |
thestig@chromium.org | 8b0553c | 2014-02-11 00:33:37 +0000 | [diff] [blame] | 477 | def _GetRietveldConfig(self, param, **kwargs): |
| 478 | return self._GetConfig('rietveld.' + param, **kwargs) |
| 479 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 480 | def _GetConfig(self, param, **kwargs): |
| 481 | self.LazyUpdateIfNeeded() |
| 482 | return RunGit(['config', param], **kwargs).strip() |
| 483 | |
| 484 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 485 | def ShortBranchName(branch): |
| 486 | """Convert a name like 'refs/heads/foo' to just 'foo'.""" |
| 487 | return branch.replace('refs/heads/', '') |
| 488 | |
| 489 | |
| 490 | class Changelist(object): |
maruel@chromium.org | 1033efd | 2013-07-23 23:25:09 +0000 | [diff] [blame] | 491 | def __init__(self, branchref=None, issue=None): |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 492 | # 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] | 493 | global settings |
| 494 | if not settings: |
| 495 | # Happens when git_cl.py is used as a utility library. |
| 496 | settings = Settings() |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 497 | settings.GetDefaultServerUrl() |
| 498 | self.branchref = branchref |
| 499 | if self.branchref: |
| 500 | self.branch = ShortBranchName(self.branchref) |
| 501 | else: |
| 502 | self.branch = None |
| 503 | self.rietveld_server = None |
| 504 | self.upstream_branch = None |
maruel@chromium.org | 1033efd | 2013-07-23 23:25:09 +0000 | [diff] [blame] | 505 | self.lookedup_issue = False |
| 506 | self.issue = issue or None |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 507 | self.has_description = False |
| 508 | self.description = None |
maruel@chromium.org | 1033efd | 2013-07-23 23:25:09 +0000 | [diff] [blame] | 509 | self.lookedup_patchset = False |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 510 | self.patchset = None |
maruel@chromium.org | e77ebbf | 2011-03-29 20:35:38 +0000 | [diff] [blame] | 511 | self._rpc_server = None |
bauerb@chromium.org | ae6df35 | 2011-04-06 17:40:39 +0000 | [diff] [blame] | 512 | self.cc = None |
| 513 | self.watchers = () |
jmbaker@chromium.org | a2cbbbb | 2012-03-22 20:40:40 +0000 | [diff] [blame] | 514 | self._remote = None |
maruel@chromium.org | 1033efd | 2013-07-23 23:25:09 +0000 | [diff] [blame] | 515 | self._props = None |
bauerb@chromium.org | ae6df35 | 2011-04-06 17:40:39 +0000 | [diff] [blame] | 516 | |
| 517 | def GetCCList(self): |
| 518 | """Return the users cc'd on this CL. |
| 519 | |
| 520 | Return is a string suitable for passing to gcl with the --cc flag. |
| 521 | """ |
| 522 | if self.cc is None: |
tyoshino@chromium.org | 99918ab | 2013-09-30 06:17:28 +0000 | [diff] [blame] | 523 | base_cc = settings.GetDefaultCCList() |
bauerb@chromium.org | ae6df35 | 2011-04-06 17:40:39 +0000 | [diff] [blame] | 524 | more_cc = ','.join(self.watchers) |
| 525 | self.cc = ','.join(filter(None, (base_cc, more_cc))) or '' |
| 526 | return self.cc |
| 527 | |
tyoshino@chromium.org | 99918ab | 2013-09-30 06:17:28 +0000 | [diff] [blame] | 528 | def GetCCListWithoutDefault(self): |
| 529 | """Return the users cc'd on this CL excluding default ones.""" |
| 530 | if self.cc is None: |
| 531 | self.cc = ','.join(self.watchers) |
| 532 | return self.cc |
| 533 | |
bauerb@chromium.org | ae6df35 | 2011-04-06 17:40:39 +0000 | [diff] [blame] | 534 | def SetWatchers(self, watchers): |
| 535 | """Set the list of email addresses that should be cc'd based on the changed |
| 536 | files in this CL. |
| 537 | """ |
| 538 | self.watchers = watchers |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 539 | |
| 540 | def GetBranch(self): |
| 541 | """Returns the short branch name, e.g. 'master'.""" |
| 542 | if not self.branch: |
szager@chromium.org | d62c61f | 2014-10-20 22:33:21 +0000 | [diff] [blame] | 543 | branchref = RunGit(['symbolic-ref', 'HEAD'], |
| 544 | stderr=subprocess2.VOID, error_ok=True).strip() |
| 545 | if not branchref: |
| 546 | return None |
| 547 | self.branchref = branchref |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 548 | self.branch = ShortBranchName(self.branchref) |
| 549 | return self.branch |
| 550 | |
| 551 | def GetBranchRef(self): |
| 552 | """Returns the full branch name, e.g. 'refs/heads/master'.""" |
| 553 | self.GetBranch() # Poke the lazy loader. |
| 554 | return self.branchref |
| 555 | |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 556 | @staticmethod |
| 557 | def FetchUpstreamTuple(branch): |
pgervais@chromium.org | d6617f3 | 2013-11-19 00:34:54 +0000 | [diff] [blame] | 558 | """Returns a tuple containing remote and remote ref, |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 559 | e.g. 'origin', 'refs/heads/master' |
| 560 | """ |
| 561 | remote = '.' |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 562 | upstream_branch = RunGit(['config', 'branch.%s.merge' % branch], |
| 563 | error_ok=True).strip() |
| 564 | if upstream_branch: |
| 565 | remote = RunGit(['config', 'branch.%s.remote' % branch]).strip() |
| 566 | else: |
bauerb@chromium.org | ade368c | 2011-03-01 08:57:50 +0000 | [diff] [blame] | 567 | upstream_branch = RunGit(['config', 'rietveld.upstream-branch'], |
| 568 | error_ok=True).strip() |
| 569 | if upstream_branch: |
| 570 | remote = RunGit(['config', 'rietveld.upstream-remote']).strip() |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 571 | else: |
bauerb@chromium.org | ade368c | 2011-03-01 08:57:50 +0000 | [diff] [blame] | 572 | # Fall back on trying a git-svn upstream branch. |
| 573 | if settings.GetIsGitSvn(): |
| 574 | upstream_branch = settings.GetSVNBranch() |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 575 | else: |
bauerb@chromium.org | ade368c | 2011-03-01 08:57:50 +0000 | [diff] [blame] | 576 | # Else, try to guess the origin remote. |
| 577 | remote_branches = RunGit(['branch', '-r']).split() |
| 578 | if 'origin/master' in remote_branches: |
| 579 | # Fall back on origin/master if it exits. |
| 580 | remote = 'origin' |
| 581 | upstream_branch = 'refs/heads/master' |
| 582 | elif 'origin/trunk' in remote_branches: |
| 583 | # Fall back on origin/trunk if it exists. Generally a shared |
| 584 | # git-svn clone |
| 585 | remote = 'origin' |
| 586 | upstream_branch = 'refs/heads/trunk' |
| 587 | else: |
| 588 | DieWithError("""Unable to determine default branch to diff against. |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 589 | Either pass complete "git diff"-style arguments, like |
| 590 | git cl upload origin/master |
| 591 | or verify this branch is set up to track another (via the --track argument to |
| 592 | "git checkout -b ...").""") |
| 593 | |
| 594 | return remote, upstream_branch |
| 595 | |
thestig@chromium.org | 8b0553c | 2014-02-11 00:33:37 +0000 | [diff] [blame] | 596 | def GetCommonAncestorWithUpstream(self): |
iannucci@chromium.org | 9e84927 | 2014-04-04 00:31:55 +0000 | [diff] [blame] | 597 | return git_common.get_or_create_merge_base(self.GetBranch(), |
| 598 | self.GetUpstreamBranch()) |
thestig@chromium.org | 8b0553c | 2014-02-11 00:33:37 +0000 | [diff] [blame] | 599 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 600 | def GetUpstreamBranch(self): |
| 601 | if self.upstream_branch is None: |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 602 | remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch()) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 603 | if remote is not '.': |
mmoss@chromium.org | e758545 | 2014-08-24 01:41:11 +0000 | [diff] [blame] | 604 | upstream_branch = upstream_branch.replace('refs/heads/', |
| 605 | 'refs/remotes/%s/' % remote) |
| 606 | upstream_branch = upstream_branch.replace('refs/branch-heads/', |
| 607 | 'refs/remotes/branch-heads/') |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 608 | self.upstream_branch = upstream_branch |
| 609 | return self.upstream_branch |
| 610 | |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 611 | def GetRemoteBranch(self): |
jmbaker@chromium.org | a2cbbbb | 2012-03-22 20:40:40 +0000 | [diff] [blame] | 612 | if not self._remote: |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 613 | remote, branch = None, self.GetBranch() |
| 614 | seen_branches = set() |
| 615 | while branch not in seen_branches: |
| 616 | seen_branches.add(branch) |
| 617 | remote, branch = self.FetchUpstreamTuple(branch) |
| 618 | branch = ShortBranchName(branch) |
| 619 | if remote != '.' or branch.startswith('refs/remotes'): |
| 620 | break |
| 621 | else: |
jmbaker@chromium.org | a2cbbbb | 2012-03-22 20:40:40 +0000 | [diff] [blame] | 622 | remotes = RunGit(['remote'], error_ok=True).split() |
| 623 | if len(remotes) == 1: |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 624 | remote, = remotes |
jmbaker@chromium.org | a2cbbbb | 2012-03-22 20:40:40 +0000 | [diff] [blame] | 625 | elif 'origin' in remotes: |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 626 | remote = 'origin' |
jmbaker@chromium.org | a2cbbbb | 2012-03-22 20:40:40 +0000 | [diff] [blame] | 627 | logging.warning('Could not determine which remote this change is ' |
| 628 | 'associated with, so defaulting to "%s". This may ' |
| 629 | 'not be what you want. You may prevent this message ' |
| 630 | 'by running "git svn info" as documented here: %s', |
| 631 | self._remote, |
| 632 | GIT_INSTRUCTIONS_URL) |
| 633 | else: |
| 634 | logging.warn('Could not determine which remote this change is ' |
| 635 | 'associated with. You may prevent this message by ' |
| 636 | 'running "git svn info" as documented here: %s', |
| 637 | GIT_INSTRUCTIONS_URL) |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 638 | branch = 'HEAD' |
| 639 | if branch.startswith('refs/remotes'): |
| 640 | self._remote = (remote, branch) |
mmoss@chromium.org | e758545 | 2014-08-24 01:41:11 +0000 | [diff] [blame] | 641 | elif branch.startswith('refs/branch-heads/'): |
| 642 | self._remote = (remote, branch.replace('refs/', 'refs/remotes/')) |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 643 | else: |
| 644 | self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch)) |
jmbaker@chromium.org | a2cbbbb | 2012-03-22 20:40:40 +0000 | [diff] [blame] | 645 | return self._remote |
| 646 | |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 647 | def GitSanityChecks(self, upstream_git_obj): |
| 648 | """Checks git repo status and ensures diff is from local commits.""" |
| 649 | |
sbc@chromium.org | 7970606 | 2015-01-14 21:18:12 +0000 | [diff] [blame] | 650 | if upstream_git_obj is None: |
| 651 | if self.GetBranch() is None: |
| 652 | print >> sys.stderr, ( |
| 653 | 'ERROR: unable to dertermine current branch (detached HEAD?)') |
| 654 | else: |
| 655 | print >> sys.stderr, ( |
| 656 | 'ERROR: no upstream branch') |
| 657 | return False |
| 658 | |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 659 | # Verify the commit we're diffing against is in our current branch. |
| 660 | upstream_sha = RunGit(['rev-parse', '--verify', upstream_git_obj]).strip() |
| 661 | common_ancestor = RunGit(['merge-base', upstream_sha, 'HEAD']).strip() |
| 662 | if upstream_sha != common_ancestor: |
| 663 | print >> sys.stderr, ( |
| 664 | 'ERROR: %s is not in the current branch. You may need to rebase ' |
| 665 | 'your tracking branch' % upstream_sha) |
| 666 | return False |
| 667 | |
| 668 | # List the commits inside the diff, and verify they are all local. |
| 669 | commits_in_diff = RunGit( |
| 670 | ['rev-list', '^%s' % upstream_sha, 'HEAD']).splitlines() |
| 671 | code, remote_branch = RunGitWithCode(['config', 'gitcl.remotebranch']) |
| 672 | remote_branch = remote_branch.strip() |
| 673 | if code != 0: |
| 674 | _, remote_branch = self.GetRemoteBranch() |
| 675 | |
| 676 | commits_in_remote = RunGit( |
| 677 | ['rev-list', '^%s' % upstream_sha, remote_branch]).splitlines() |
| 678 | |
| 679 | common_commits = set(commits_in_diff) & set(commits_in_remote) |
| 680 | if common_commits: |
| 681 | print >> sys.stderr, ( |
| 682 | 'ERROR: Your diff contains %d commits already in %s.\n' |
| 683 | 'Run "git log --oneline %s..HEAD" to get a list of commits in ' |
| 684 | 'the diff. If you are using a custom git flow, you can override' |
| 685 | ' the reference used for this check with "git config ' |
| 686 | 'gitcl.remotebranch <git-ref>".' % ( |
| 687 | len(common_commits), remote_branch, upstream_git_obj)) |
| 688 | return False |
| 689 | return True |
| 690 | |
kalmard@homejinni.com | 6b0051e | 2012-04-03 15:45:08 +0000 | [diff] [blame] | 691 | def GetGitBaseUrlFromConfig(self): |
sheyang@chromium.org | a656e70 | 2014-05-15 20:43:05 +0000 | [diff] [blame] | 692 | """Return the configured base URL from branch.<branchname>.baseurl. |
kalmard@homejinni.com | 6b0051e | 2012-04-03 15:45:08 +0000 | [diff] [blame] | 693 | |
| 694 | Returns None if it is not set. |
| 695 | """ |
sheyang@chromium.org | a656e70 | 2014-05-15 20:43:05 +0000 | [diff] [blame] | 696 | return RunGit(['config', 'branch.%s.base-url' % self.GetBranch()], |
| 697 | error_ok=True).strip() |
jmbaker@chromium.org | a2cbbbb | 2012-03-22 20:40:40 +0000 | [diff] [blame] | 698 | |
kjellander@chromium.org | 6abc652 | 2014-12-02 07:34:49 +0000 | [diff] [blame] | 699 | def GetGitSvnRemoteUrl(self): |
| 700 | """Return the configured git-svn remote URL parsed from git svn info. |
| 701 | |
| 702 | Returns None if it is not set. |
| 703 | """ |
| 704 | # URL is dependent on the current directory. |
| 705 | data = RunGit(['svn', 'info'], cwd=settings.GetRoot()) |
| 706 | if data: |
| 707 | keys = dict(line.split(': ', 1) for line in data.splitlines() |
| 708 | if ': ' in line) |
| 709 | return keys.get('URL', None) |
| 710 | return None |
| 711 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 712 | def GetRemoteUrl(self): |
| 713 | """Return the configured remote URL, e.g. 'git://example.org/foo.git/'. |
| 714 | |
| 715 | Returns None if there is no remote. |
| 716 | """ |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 717 | remote, _ = self.GetRemoteBranch() |
dyen@chromium.org | 2a13d4f | 2014-06-13 00:06:37 +0000 | [diff] [blame] | 718 | url = RunGit(['config', 'remote.%s.url' % remote], error_ok=True).strip() |
| 719 | |
| 720 | # If URL is pointing to a local directory, it is probably a git cache. |
| 721 | if os.path.isdir(url): |
| 722 | url = RunGit(['config', 'remote.%s.url' % remote], |
| 723 | error_ok=True, |
| 724 | cwd=url).strip() |
| 725 | return url |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 726 | |
| 727 | def GetIssue(self): |
maruel@chromium.org | 5242430 | 2012-08-29 15:14:30 +0000 | [diff] [blame] | 728 | """Returns the issue number as a int or None if not set.""" |
maruel@chromium.org | 1033efd | 2013-07-23 23:25:09 +0000 | [diff] [blame] | 729 | if self.issue is None and not self.lookedup_issue: |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 730 | issue = RunGit(['config', self._IssueSetting()], error_ok=True).strip() |
maruel@chromium.org | 1033efd | 2013-07-23 23:25:09 +0000 | [diff] [blame] | 731 | self.issue = int(issue) or None if issue else None |
| 732 | self.lookedup_issue = True |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 733 | return self.issue |
| 734 | |
| 735 | def GetRietveldServer(self): |
evan@chromium.org | 0af9b70 | 2012-02-11 00:42:16 +0000 | [diff] [blame] | 736 | if not self.rietveld_server: |
| 737 | # If we're on a branch then get the server potentially associated |
| 738 | # with that branch. |
| 739 | if self.GetIssue(): |
szager@chromium.org | d62c61f | 2014-10-20 22:33:21 +0000 | [diff] [blame] | 740 | rietveld_server_config = self._RietveldServer() |
| 741 | if rietveld_server_config: |
| 742 | self.rietveld_server = gclient_utils.UpgradeToHttps(RunGit( |
| 743 | ['config', rietveld_server_config], error_ok=True).strip()) |
evan@chromium.org | 0af9b70 | 2012-02-11 00:42:16 +0000 | [diff] [blame] | 744 | if not self.rietveld_server: |
| 745 | self.rietveld_server = settings.GetDefaultServerUrl() |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 746 | return self.rietveld_server |
| 747 | |
| 748 | def GetIssueURL(self): |
| 749 | """Get the URL for a particular issue.""" |
dbeam@chromium.org | 015fd3d | 2013-06-18 19:02:50 +0000 | [diff] [blame] | 750 | if not self.GetIssue(): |
| 751 | return None |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 752 | return '%s/%s' % (self.GetRietveldServer(), self.GetIssue()) |
| 753 | |
| 754 | def GetDescription(self, pretty=False): |
| 755 | if not self.has_description: |
| 756 | if self.GetIssue(): |
maruel@chromium.org | 5242430 | 2012-08-29 15:14:30 +0000 | [diff] [blame] | 757 | issue = self.GetIssue() |
miket@chromium.org | 183df1a | 2012-01-04 19:44:55 +0000 | [diff] [blame] | 758 | try: |
| 759 | self.description = self.RpcServer().get_description(issue).strip() |
maruel@chromium.org | 85616e0 | 2014-07-28 15:37:55 +0000 | [diff] [blame] | 760 | except urllib2.HTTPError as e: |
miket@chromium.org | 183df1a | 2012-01-04 19:44:55 +0000 | [diff] [blame] | 761 | if e.code == 404: |
| 762 | DieWithError( |
| 763 | ('\nWhile fetching the description for issue %d, received a ' |
| 764 | '404 (not found)\n' |
| 765 | 'error. It is likely that you deleted this ' |
| 766 | 'issue on the server. If this is the\n' |
| 767 | 'case, please run\n\n' |
| 768 | ' git cl issue 0\n\n' |
| 769 | 'to clear the association with the deleted issue. Then run ' |
| 770 | 'this command again.') % issue) |
| 771 | else: |
| 772 | DieWithError( |
yujie.mao@intel.com | daee1d3 | 2013-12-18 11:55:03 +0000 | [diff] [blame] | 773 | '\nFailed to fetch issue description. HTTP error %d' % e.code) |
maruel@chromium.org | 85616e0 | 2014-07-28 15:37:55 +0000 | [diff] [blame] | 774 | except urllib2.URLError as e: |
| 775 | print >> sys.stderr, ( |
| 776 | 'Warning: Failed to retrieve CL description due to network ' |
| 777 | 'failure.') |
| 778 | self.description = '' |
| 779 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 780 | self.has_description = True |
| 781 | if pretty: |
| 782 | wrapper = textwrap.TextWrapper() |
| 783 | wrapper.initial_indent = wrapper.subsequent_indent = ' ' |
| 784 | return wrapper.fill(self.description) |
| 785 | return self.description |
| 786 | |
| 787 | def GetPatchset(self): |
maruel@chromium.org | 5242430 | 2012-08-29 15:14:30 +0000 | [diff] [blame] | 788 | """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] | 789 | if self.patchset is None and not self.lookedup_patchset: |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 790 | patchset = RunGit(['config', self._PatchsetSetting()], |
| 791 | error_ok=True).strip() |
maruel@chromium.org | 1033efd | 2013-07-23 23:25:09 +0000 | [diff] [blame] | 792 | self.patchset = int(patchset) or None if patchset else None |
| 793 | self.lookedup_patchset = True |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 794 | return self.patchset |
| 795 | |
| 796 | def SetPatchset(self, patchset): |
| 797 | """Set this branch's patchset. If patchset=0, clears the patchset.""" |
| 798 | if patchset: |
| 799 | RunGit(['config', self._PatchsetSetting(), str(patchset)]) |
maruel@chromium.org | 1033efd | 2013-07-23 23:25:09 +0000 | [diff] [blame] | 800 | self.patchset = patchset |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 801 | else: |
| 802 | RunGit(['config', '--unset', self._PatchsetSetting()], |
maruel@chromium.org | 32f9f5e | 2011-09-14 13:41:47 +0000 | [diff] [blame] | 803 | stderr=subprocess2.PIPE, error_ok=True) |
maruel@chromium.org | 1033efd | 2013-07-23 23:25:09 +0000 | [diff] [blame] | 804 | self.patchset = None |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 805 | |
maruel@chromium.org | 1033efd | 2013-07-23 23:25:09 +0000 | [diff] [blame] | 806 | def GetMostRecentPatchset(self): |
| 807 | return self.GetIssueProperties()['patchsets'][-1] |
binji@chromium.org | 0281f52 | 2012-09-14 13:37:59 +0000 | [diff] [blame] | 808 | |
| 809 | def GetPatchSetDiff(self, issue, patchset): |
maruel@chromium.org | 27bb387 | 2011-05-30 20:33:19 +0000 | [diff] [blame] | 810 | return self.RpcServer().get( |
maruel@chromium.org | e77ebbf | 2011-03-29 20:35:38 +0000 | [diff] [blame] | 811 | '/download/issue%s_%s.diff' % (issue, patchset)) |
| 812 | |
maruel@chromium.org | 1033efd | 2013-07-23 23:25:09 +0000 | [diff] [blame] | 813 | def GetIssueProperties(self): |
| 814 | if self._props is None: |
| 815 | issue = self.GetIssue() |
| 816 | if not issue: |
| 817 | self._props = {} |
| 818 | else: |
| 819 | self._props = self.RpcServer().get_issue_properties(issue, True) |
| 820 | return self._props |
| 821 | |
maruel@chromium.org | cf08778 | 2013-07-23 13:08:48 +0000 | [diff] [blame] | 822 | def GetApprovingReviewers(self): |
maruel@chromium.org | 1033efd | 2013-07-23 23:25:09 +0000 | [diff] [blame] | 823 | return get_approving_reviewers(self.GetIssueProperties()) |
maruel@chromium.org | e52678e | 2013-04-26 18:34:44 +0000 | [diff] [blame] | 824 | |
apavlov@chromium.org | e4efd51 | 2014-11-05 09:05:29 +0000 | [diff] [blame] | 825 | def AddComment(self, message): |
| 826 | return self.RpcServer().add_comment(self.GetIssue(), message) |
| 827 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 828 | def SetIssue(self, issue): |
| 829 | """Set this branch's issue. If issue=0, clears the issue.""" |
| 830 | if issue: |
maruel@chromium.org | 1033efd | 2013-07-23 23:25:09 +0000 | [diff] [blame] | 831 | self.issue = issue |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 832 | RunGit(['config', self._IssueSetting(), str(issue)]) |
| 833 | if self.rietveld_server: |
| 834 | RunGit(['config', self._RietveldServer(), self.rietveld_server]) |
| 835 | else: |
teravest@chromium.org | d79d4b8 | 2013-10-23 20:09:08 +0000 | [diff] [blame] | 836 | current_issue = self.GetIssue() |
| 837 | if current_issue: |
| 838 | RunGit(['config', '--unset', self._IssueSetting()]) |
maruel@chromium.org | 1033efd | 2013-07-23 23:25:09 +0000 | [diff] [blame] | 839 | self.issue = None |
| 840 | self.SetPatchset(None) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 841 | |
asvitkine@chromium.org | 1516995 | 2011-09-27 14:30:53 +0000 | [diff] [blame] | 842 | def GetChange(self, upstream_branch, author): |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 843 | if not self.GitSanityChecks(upstream_branch): |
| 844 | DieWithError('\nGit sanity check failure') |
| 845 | |
thestig@chromium.org | 8b0553c | 2014-02-11 00:33:37 +0000 | [diff] [blame] | 846 | root = settings.GetRelativeRoot() |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 847 | if not root: |
| 848 | root = '.' |
bauerb@chromium.org | 512f1ef | 2011-04-20 15:17:57 +0000 | [diff] [blame] | 849 | absroot = os.path.abspath(root) |
bauerb@chromium.org | 6fb99c6 | 2011-04-18 15:57:28 +0000 | [diff] [blame] | 850 | |
| 851 | # 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] | 852 | name = RunGitWithCode(['rev-parse', 'HEAD'])[1].strip() |
bauerb@chromium.org | 512f1ef | 2011-04-20 15:17:57 +0000 | [diff] [blame] | 853 | # Need to pass a relative path for msysgit. |
maruel@chromium.org | 2b38e9c | 2011-10-19 00:04:35 +0000 | [diff] [blame] | 854 | try: |
maruel@chromium.org | 80a9ef1 | 2011-12-13 20:44:10 +0000 | [diff] [blame] | 855 | files = scm.GIT.CaptureStatus([root], '.', upstream_branch) |
maruel@chromium.org | 2b38e9c | 2011-10-19 00:04:35 +0000 | [diff] [blame] | 856 | except subprocess2.CalledProcessError: |
| 857 | DieWithError( |
pgervais@chromium.org | d6617f3 | 2013-11-19 00:34:54 +0000 | [diff] [blame] | 858 | ('\nFailed to diff against upstream branch %s\n\n' |
maruel@chromium.org | 2b38e9c | 2011-10-19 00:04:35 +0000 | [diff] [blame] | 859 | 'This branch probably doesn\'t exist anymore. To reset the\n' |
| 860 | 'tracking branch, please run\n' |
| 861 | ' git branch --set-upstream %s trunk\n' |
| 862 | 'replacing trunk with origin/master or the relevant branch') % |
| 863 | (upstream_branch, self.GetBranch())) |
bauerb@chromium.org | 6fb99c6 | 2011-04-18 15:57:28 +0000 | [diff] [blame] | 864 | |
maruel@chromium.org | 5242430 | 2012-08-29 15:14:30 +0000 | [diff] [blame] | 865 | issue = self.GetIssue() |
| 866 | patchset = self.GetPatchset() |
bauerb@chromium.org | 6fb99c6 | 2011-04-18 15:57:28 +0000 | [diff] [blame] | 867 | if issue: |
| 868 | description = self.GetDescription() |
| 869 | else: |
| 870 | # If the change was never uploaded, use the log messages of all commits |
| 871 | # up to the branch point, as git cl upload will prefill the description |
| 872 | # with these log messages. |
thestig@chromium.org | 8b0553c | 2014-02-11 00:33:37 +0000 | [diff] [blame] | 873 | args = ['log', '--pretty=format:%s%n%n%b', '%s...' % (upstream_branch)] |
| 874 | description = RunGitWithCode(args)[1].strip() |
maruel@chromium.org | 03b3bdc | 2011-06-14 13:04:12 +0000 | [diff] [blame] | 875 | |
| 876 | if not author: |
maruel@chromium.org | 13f623c | 2011-07-22 16:02:23 +0000 | [diff] [blame] | 877 | author = RunGit(['config', 'user.email']).strip() or None |
asvitkine@chromium.org | 1516995 | 2011-09-27 14:30:53 +0000 | [diff] [blame] | 878 | return presubmit_support.GitChange( |
bauerb@chromium.org | 6fb99c6 | 2011-04-18 15:57:28 +0000 | [diff] [blame] | 879 | name, |
| 880 | description, |
| 881 | absroot, |
| 882 | files, |
| 883 | issue, |
| 884 | patchset, |
agable@chromium.org | ea84ef1 | 2014-04-30 19:55:12 +0000 | [diff] [blame] | 885 | author, |
| 886 | upstream=upstream_branch) |
bauerb@chromium.org | 6fb99c6 | 2011-04-18 15:57:28 +0000 | [diff] [blame] | 887 | |
jsbell@chromium.org | b99fbd9 | 2014-09-11 17:29:28 +0000 | [diff] [blame] | 888 | def GetStatus(self): |
| 889 | """Apply a rough heuristic to give a simple summary of an issue's review |
| 890 | or CQ status, assuming adherence to a common workflow. |
| 891 | |
| 892 | Returns None if no issue for this branch, or one of the following keywords: |
| 893 | * 'error' - error from review tool (including deleted issues) |
| 894 | * 'unsent' - not sent for review |
| 895 | * 'waiting' - waiting for review |
| 896 | * 'reply' - waiting for owner to reply to review |
| 897 | * 'lgtm' - LGTM from at least one approved reviewer |
| 898 | * 'commit' - in the commit queue |
| 899 | * 'closed' - closed |
| 900 | """ |
| 901 | if not self.GetIssue(): |
| 902 | return None |
| 903 | |
| 904 | try: |
| 905 | props = self.GetIssueProperties() |
| 906 | except urllib2.HTTPError: |
| 907 | return 'error' |
| 908 | |
| 909 | if props.get('closed'): |
| 910 | # Issue is closed. |
| 911 | return 'closed' |
| 912 | if props.get('commit'): |
| 913 | # Issue is in the commit queue. |
| 914 | return 'commit' |
| 915 | |
| 916 | try: |
| 917 | reviewers = self.GetApprovingReviewers() |
| 918 | except urllib2.HTTPError: |
| 919 | return 'error' |
| 920 | |
| 921 | if reviewers: |
| 922 | # Was LGTM'ed. |
| 923 | return 'lgtm' |
| 924 | |
| 925 | messages = props.get('messages') or [] |
| 926 | |
| 927 | if not messages: |
| 928 | # No message was sent. |
| 929 | return 'unsent' |
| 930 | if messages[-1]['sender'] != props.get('owner_email'): |
| 931 | # Non-LGTM reply from non-owner |
| 932 | return 'reply' |
| 933 | return 'waiting' |
| 934 | |
ilevy@chromium.org | 051ad0e | 2013-03-04 21:57:34 +0000 | [diff] [blame] | 935 | def RunHook(self, committing, may_prompt, verbose, change): |
asvitkine@chromium.org | 1516995 | 2011-09-27 14:30:53 +0000 | [diff] [blame] | 936 | """Calls sys.exit() if the hook fails; returns a HookResults otherwise.""" |
bauerb@chromium.org | 6fb99c6 | 2011-04-18 15:57:28 +0000 | [diff] [blame] | 937 | |
| 938 | try: |
maruel@chromium.org | b0a6391 | 2012-01-17 18:10:16 +0000 | [diff] [blame] | 939 | return presubmit_support.DoPresubmitChecks(change, committing, |
bauerb@chromium.org | 6fb99c6 | 2011-04-18 15:57:28 +0000 | [diff] [blame] | 940 | verbose=verbose, output_stream=sys.stdout, input_stream=sys.stdin, |
maruel@chromium.org | cc73ad6 | 2011-07-06 17:39:26 +0000 | [diff] [blame] | 941 | default_presubmit=None, may_prompt=may_prompt, |
maruel@chromium.org | 239f411 | 2011-06-03 20:08:23 +0000 | [diff] [blame] | 942 | rietveld_obj=self.RpcServer()) |
bauerb@chromium.org | 6fb99c6 | 2011-04-18 15:57:28 +0000 | [diff] [blame] | 943 | except presubmit_support.PresubmitFailure, e: |
| 944 | DieWithError( |
| 945 | ('%s\nMaybe your depot_tools is out of date?\n' |
| 946 | 'If all fails, contact maruel@') % e) |
| 947 | |
maruel@chromium.org | b021b32 | 2013-04-08 17:57:29 +0000 | [diff] [blame] | 948 | def UpdateDescription(self, description): |
| 949 | self.description = description |
| 950 | return self.RpcServer().update_description( |
| 951 | self.GetIssue(), self.description) |
| 952 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 953 | def CloseIssue(self): |
maruel@chromium.org | 607bb1b | 2011-06-01 23:43:11 +0000 | [diff] [blame] | 954 | """Updates the description and closes the issue.""" |
maruel@chromium.org | b021b32 | 2013-04-08 17:57:29 +0000 | [diff] [blame] | 955 | return self.RpcServer().close_issue(self.GetIssue()) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 956 | |
maruel@chromium.org | 27bb387 | 2011-05-30 20:33:19 +0000 | [diff] [blame] | 957 | def SetFlag(self, flag, value): |
| 958 | """Patchset must match.""" |
| 959 | if not self.GetPatchset(): |
| 960 | DieWithError('The patchset needs to match. Send another patchset.') |
| 961 | try: |
| 962 | return self.RpcServer().set_flag( |
maruel@chromium.org | 5242430 | 2012-08-29 15:14:30 +0000 | [diff] [blame] | 963 | self.GetIssue(), self.GetPatchset(), flag, value) |
maruel@chromium.org | 27bb387 | 2011-05-30 20:33:19 +0000 | [diff] [blame] | 964 | except urllib2.HTTPError, e: |
| 965 | if e.code == 404: |
| 966 | DieWithError('The issue %s doesn\'t exist.' % self.GetIssue()) |
| 967 | if e.code == 403: |
| 968 | DieWithError( |
| 969 | ('Access denied to issue %s. Maybe the patchset %s doesn\'t ' |
| 970 | 'match?') % (self.GetIssue(), self.GetPatchset())) |
| 971 | raise |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 972 | |
maruel@chromium.org | cab38e9 | 2011-04-09 00:30:51 +0000 | [diff] [blame] | 973 | def RpcServer(self): |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 974 | """Returns an upload.RpcServer() to access this review's rietveld instance. |
| 975 | """ |
maruel@chromium.org | e77ebbf | 2011-03-29 20:35:38 +0000 | [diff] [blame] | 976 | if not self._rpc_server: |
maruel@chromium.org | 4bac4b5 | 2012-11-27 20:33:52 +0000 | [diff] [blame] | 977 | self._rpc_server = rietveld.CachingRietveld( |
| 978 | self.GetRietveldServer(), None, None) |
maruel@chromium.org | e77ebbf | 2011-03-29 20:35:38 +0000 | [diff] [blame] | 979 | return self._rpc_server |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 980 | |
| 981 | def _IssueSetting(self): |
| 982 | """Return the git setting that stores this change's issue.""" |
| 983 | return 'branch.%s.rietveldissue' % self.GetBranch() |
| 984 | |
| 985 | def _PatchsetSetting(self): |
| 986 | """Return the git setting that stores this change's most recent patchset.""" |
| 987 | return 'branch.%s.rietveldpatchset' % self.GetBranch() |
| 988 | |
| 989 | def _RietveldServer(self): |
| 990 | """Returns the git setting that stores this change's rietveld server.""" |
szager@chromium.org | d62c61f | 2014-10-20 22:33:21 +0000 | [diff] [blame] | 991 | branch = self.GetBranch() |
| 992 | if branch: |
| 993 | return 'branch.%s.rietveldserver' % branch |
| 994 | return None |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 995 | |
| 996 | |
| 997 | def GetCodereviewSettingsInteractively(): |
| 998 | """Prompt the user for settings.""" |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 999 | # TODO(ukai): ask code review system is rietveld or gerrit? |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1000 | server = settings.GetDefaultServerUrl(error_ok=True) |
| 1001 | prompt = 'Rietveld server (host[:port])' |
| 1002 | prompt += ' [%s]' % (server or DEFAULT_SERVER) |
maruel@chromium.org | 9054173 | 2011-04-01 17:54:18 +0000 | [diff] [blame] | 1003 | newserver = ask_for_data(prompt + ':') |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1004 | if not server and not newserver: |
| 1005 | newserver = DEFAULT_SERVER |
maruel@chromium.org | eb5edbc | 2012-01-16 17:03:28 +0000 | [diff] [blame] | 1006 | if newserver: |
| 1007 | newserver = gclient_utils.UpgradeToHttps(newserver) |
| 1008 | if newserver != server: |
| 1009 | RunGit(['config', 'rietveld.server', newserver]) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1010 | |
maruel@chromium.org | eb5edbc | 2012-01-16 17:03:28 +0000 | [diff] [blame] | 1011 | def SetProperty(initial, caption, name, is_url): |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1012 | prompt = caption |
| 1013 | if initial: |
| 1014 | prompt += ' ("x" to clear) [%s]' % initial |
maruel@chromium.org | 9054173 | 2011-04-01 17:54:18 +0000 | [diff] [blame] | 1015 | new_val = ask_for_data(prompt + ':') |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1016 | if new_val == 'x': |
| 1017 | RunGit(['config', '--unset-all', 'rietveld.' + name], error_ok=True) |
maruel@chromium.org | eb5edbc | 2012-01-16 17:03:28 +0000 | [diff] [blame] | 1018 | elif new_val: |
| 1019 | if is_url: |
| 1020 | new_val = gclient_utils.UpgradeToHttps(new_val) |
| 1021 | if new_val != initial: |
| 1022 | RunGit(['config', 'rietveld.' + name, new_val]) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1023 | |
maruel@chromium.org | eb5edbc | 2012-01-16 17:03:28 +0000 | [diff] [blame] | 1024 | SetProperty(settings.GetDefaultCCList(), 'CC list', 'cc', False) |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 1025 | SetProperty(settings.GetDefaultPrivateFlag(), |
| 1026 | 'Private flag (rietveld only)', 'private', False) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1027 | SetProperty(settings.GetTreeStatusUrl(error_ok=True), 'Tree status URL', |
maruel@chromium.org | eb5edbc | 2012-01-16 17:03:28 +0000 | [diff] [blame] | 1028 | 'tree-status-url', False) |
| 1029 | SetProperty(settings.GetViewVCUrl(), 'ViewVC URL', 'viewvc-url', True) |
rmistry@google.com | 9075258 | 2014-01-14 21:04:50 +0000 | [diff] [blame] | 1030 | SetProperty(settings.GetBugPrefix(), 'Bug Prefix', 'bug-prefix', False) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1031 | |
| 1032 | # TODO: configure a default branch to diff against, rather than this |
| 1033 | # svn-based hackery. |
| 1034 | |
| 1035 | |
dpranke@chromium.org | 20254fc | 2011-03-22 18:28:59 +0000 | [diff] [blame] | 1036 | class ChangeDescription(object): |
| 1037 | """Contains a parsed form of the change description.""" |
maruel@chromium.org | c6f60e8 | 2013-04-19 17:01:57 +0000 | [diff] [blame] | 1038 | R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$' |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 1039 | BUG_LINE = r'^[ \t]*(BUG)[ \t]*=[ \t]*(.*?)[ \t]*$' |
dpranke@chromium.org | 20254fc | 2011-03-22 18:28:59 +0000 | [diff] [blame] | 1040 | |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 1041 | def __init__(self, description): |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 1042 | self._description_lines = (description or '').strip().splitlines() |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 1043 | |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 1044 | @property # www.logilab.org/ticket/89786 |
| 1045 | def description(self): # pylint: disable=E0202 |
| 1046 | return '\n'.join(self._description_lines) |
| 1047 | |
| 1048 | def set_description(self, desc): |
| 1049 | if isinstance(desc, basestring): |
| 1050 | lines = desc.splitlines() |
| 1051 | else: |
| 1052 | lines = [line.rstrip() for line in desc] |
| 1053 | while lines and not lines[0]: |
| 1054 | lines.pop(0) |
| 1055 | while lines and not lines[-1]: |
| 1056 | lines.pop(-1) |
| 1057 | self._description_lines = lines |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 1058 | |
piman@chromium.org | 336f912 | 2014-09-04 02:16:55 +0000 | [diff] [blame] | 1059 | def update_reviewers(self, reviewers, add_owners_tbr=False, change=None): |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 1060 | """Rewrites the R=/TBR= line(s) as a single line each.""" |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 1061 | assert isinstance(reviewers, list), reviewers |
piman@chromium.org | 336f912 | 2014-09-04 02:16:55 +0000 | [diff] [blame] | 1062 | if not reviewers and not add_owners_tbr: |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 1063 | return |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 1064 | reviewers = reviewers[:] |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 1065 | |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 1066 | # Get the set of R= and TBR= lines and remove them from the desciption. |
| 1067 | regexp = re.compile(self.R_LINE) |
| 1068 | matches = [regexp.match(line) for line in self._description_lines] |
| 1069 | new_desc = [l for i, l in enumerate(self._description_lines) |
| 1070 | if not matches[i]] |
| 1071 | self.set_description(new_desc) |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 1072 | |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 1073 | # Construct new unified R= and TBR= lines. |
| 1074 | r_names = [] |
| 1075 | tbr_names = [] |
| 1076 | for match in matches: |
| 1077 | if not match: |
| 1078 | continue |
| 1079 | people = cleanup_list([match.group(2).strip()]) |
| 1080 | if match.group(1) == 'TBR': |
| 1081 | tbr_names.extend(people) |
| 1082 | else: |
| 1083 | r_names.extend(people) |
| 1084 | for name in r_names: |
| 1085 | if name not in reviewers: |
| 1086 | reviewers.append(name) |
piman@chromium.org | 336f912 | 2014-09-04 02:16:55 +0000 | [diff] [blame] | 1087 | if add_owners_tbr: |
| 1088 | owners_db = owners.Database(change.RepositoryRoot(), |
| 1089 | fopen=file, os_path=os.path, glob=glob.glob) |
| 1090 | all_reviewers = set(tbr_names + reviewers) |
| 1091 | missing_files = owners_db.files_not_covered_by(change.LocalPaths(), |
| 1092 | all_reviewers) |
| 1093 | tbr_names.extend(owners_db.reviewers_for(missing_files, |
| 1094 | change.author_email)) |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 1095 | new_r_line = 'R=' + ', '.join(reviewers) if reviewers else None |
| 1096 | new_tbr_line = 'TBR=' + ', '.join(tbr_names) if tbr_names else None |
| 1097 | |
| 1098 | # Put the new lines in the description where the old first R= line was. |
| 1099 | line_loc = next((i for i, match in enumerate(matches) if match), -1) |
| 1100 | if 0 <= line_loc < len(self._description_lines): |
| 1101 | if new_tbr_line: |
| 1102 | self._description_lines.insert(line_loc, new_tbr_line) |
| 1103 | if new_r_line: |
| 1104 | self._description_lines.insert(line_loc, new_r_line) |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 1105 | else: |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 1106 | if new_r_line: |
| 1107 | self.append_footer(new_r_line) |
| 1108 | if new_tbr_line: |
| 1109 | self.append_footer(new_tbr_line) |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 1110 | |
| 1111 | def prompt(self): |
| 1112 | """Asks the user to update the description.""" |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 1113 | self.set_description([ |
| 1114 | '# Enter a description of the change.', |
| 1115 | '# This will be displayed on the codereview site.', |
| 1116 | '# 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] | 1117 | '#--------------------This line is 72 characters long' |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 1118 | '--------------------', |
| 1119 | ] + self._description_lines) |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 1120 | |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 1121 | regexp = re.compile(self.BUG_LINE) |
| 1122 | if not any((regexp.match(line) for line in self._description_lines)): |
rmistry@google.com | 9075258 | 2014-01-14 21:04:50 +0000 | [diff] [blame] | 1123 | self.append_footer('BUG=%s' % settings.GetBugPrefix()) |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 1124 | content = gclient_utils.RunEditor(self.description, True, |
jbroman@chromium.org | 615a262 | 2013-05-03 13:20:14 +0000 | [diff] [blame] | 1125 | git_editor=settings.GetGitEditor()) |
maruel@chromium.org | 0e0436a | 2011-10-25 13:32:41 +0000 | [diff] [blame] | 1126 | if not content: |
| 1127 | DieWithError('Running editor failed') |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 1128 | lines = content.splitlines() |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 1129 | |
| 1130 | # Strip off comments. |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 1131 | clean_lines = [line.rstrip() for line in lines if not line.startswith('#')] |
| 1132 | if not clean_lines: |
maruel@chromium.org | 0e0436a | 2011-10-25 13:32:41 +0000 | [diff] [blame] | 1133 | DieWithError('No CL description, aborting') |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 1134 | self.set_description(clean_lines) |
dpranke@chromium.org | 20254fc | 2011-03-22 18:28:59 +0000 | [diff] [blame] | 1135 | |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 1136 | def append_footer(self, line): |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 1137 | if self._description_lines: |
| 1138 | # Add an empty line if either the last line or the new line isn't a tag. |
| 1139 | last_line = self._description_lines[-1] |
| 1140 | if (not presubmit_support.Change.TAG_LINE_RE.match(last_line) or |
| 1141 | not presubmit_support.Change.TAG_LINE_RE.match(line)): |
| 1142 | self._description_lines.append('') |
| 1143 | self._description_lines.append(line) |
dpranke@chromium.org | 20254fc | 2011-03-22 18:28:59 +0000 | [diff] [blame] | 1144 | |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 1145 | def get_reviewers(self): |
| 1146 | """Retrieves the list of reviewers.""" |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 1147 | matches = [re.match(self.R_LINE, line) for line in self._description_lines] |
| 1148 | reviewers = [match.group(2).strip() for match in matches if match] |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 1149 | return cleanup_list(reviewers) |
dpranke@chromium.org | 20254fc | 2011-03-22 18:28:59 +0000 | [diff] [blame] | 1150 | |
| 1151 | |
maruel@chromium.org | e52678e | 2013-04-26 18:34:44 +0000 | [diff] [blame] | 1152 | def get_approving_reviewers(props): |
| 1153 | """Retrieves the reviewers that approved a CL from the issue properties with |
| 1154 | messages. |
| 1155 | |
| 1156 | Note that the list may contain reviewers that are not committer, thus are not |
| 1157 | considered by the CQ. |
| 1158 | """ |
| 1159 | return sorted( |
| 1160 | set( |
| 1161 | message['sender'] |
| 1162 | for message in props['messages'] |
| 1163 | if message['approval'] and message['sender'] in props['reviewers'] |
| 1164 | ) |
| 1165 | ) |
| 1166 | |
| 1167 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1168 | def FindCodereviewSettingsFile(filename='codereview.settings'): |
| 1169 | """Finds the given file starting in the cwd and going up. |
| 1170 | |
| 1171 | Only looks up to the top of the repository unless an |
| 1172 | 'inherit-review-settings-ok' file exists in the root of the repository. |
| 1173 | """ |
| 1174 | inherit_ok_file = 'inherit-review-settings-ok' |
| 1175 | cwd = os.getcwd() |
thestig@chromium.org | 8b0553c | 2014-02-11 00:33:37 +0000 | [diff] [blame] | 1176 | root = settings.GetRoot() |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1177 | if os.path.isfile(os.path.join(root, inherit_ok_file)): |
| 1178 | root = '/' |
| 1179 | while True: |
| 1180 | if filename in os.listdir(cwd): |
| 1181 | if os.path.isfile(os.path.join(cwd, filename)): |
| 1182 | return open(os.path.join(cwd, filename)) |
| 1183 | if cwd == root: |
| 1184 | break |
| 1185 | cwd = os.path.dirname(cwd) |
| 1186 | |
| 1187 | |
| 1188 | def LoadCodereviewSettingsFromFile(fileobj): |
| 1189 | """Parse a codereview.settings file and updates hooks.""" |
maruel@chromium.org | 99ac1c5 | 2012-01-16 14:52:12 +0000 | [diff] [blame] | 1190 | keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read()) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1191 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1192 | def SetProperty(name, setting, unset_error_ok=False): |
| 1193 | fullname = 'rietveld.' + name |
| 1194 | if setting in keyvals: |
| 1195 | RunGit(['config', fullname, keyvals[setting]]) |
| 1196 | else: |
| 1197 | RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok) |
| 1198 | |
| 1199 | SetProperty('server', 'CODE_REVIEW_SERVER') |
| 1200 | # Only server setting is required. Other settings can be absent. |
| 1201 | # In that case, we ignore errors raised during option deletion attempt. |
| 1202 | SetProperty('cc', 'CC_LIST', unset_error_ok=True) |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 1203 | SetProperty('private', 'PRIVATE', unset_error_ok=True) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1204 | SetProperty('tree-status-url', 'STATUS', unset_error_ok=True) |
| 1205 | SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True) |
rmistry@google.com | 9075258 | 2014-01-14 21:04:50 +0000 | [diff] [blame] | 1206 | SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True) |
thestig@chromium.org | 44202a2 | 2014-03-11 19:22:18 +0000 | [diff] [blame] | 1207 | SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True) |
kjellander@chromium.org | 6abc652 | 2014-12-02 07:34:49 +0000 | [diff] [blame] | 1208 | SetProperty('force-https-commit-url', 'FORCE_HTTPS_COMMIT_URL', |
| 1209 | unset_error_ok=True) |
thestig@chromium.org | 44202a2 | 2014-03-11 19:22:18 +0000 | [diff] [blame] | 1210 | SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True) |
sheyang@chromium.org | 152cf83 | 2014-06-11 21:37:49 +0000 | [diff] [blame] | 1211 | SetProperty('project', 'PROJECT', unset_error_ok=True) |
vadimsh@chromium.org | 566a02a | 2014-08-22 01:34:13 +0000 | [diff] [blame] | 1212 | SetProperty('pending-ref-prefix', 'PENDING_REF_PREFIX', unset_error_ok=True) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1213 | |
ukai@chromium.org | 7044efc | 2013-11-28 01:51:21 +0000 | [diff] [blame] | 1214 | if 'GERRIT_HOST' in keyvals: |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 1215 | RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']]) |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 1216 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1217 | if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals: |
| 1218 | #should be of the form |
| 1219 | #PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof |
| 1220 | #ORIGIN_URL_CONFIG: http://src.chromium.org/git |
| 1221 | RunGit(['config', keyvals['PUSH_URL_CONFIG'], |
| 1222 | keyvals['ORIGIN_URL_CONFIG']]) |
| 1223 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1224 | |
joshua.lock@intel.com | 426f69b | 2012-08-02 23:41:49 +0000 | [diff] [blame] | 1225 | def urlretrieve(source, destination): |
| 1226 | """urllib is broken for SSL connections via a proxy therefore we |
| 1227 | can't use urllib.urlretrieve().""" |
| 1228 | with open(destination, 'w') as f: |
| 1229 | f.write(urllib2.urlopen(source).read()) |
| 1230 | |
| 1231 | |
ukai@chromium.org | 712d610 | 2013-11-27 00:52:58 +0000 | [diff] [blame] | 1232 | def hasSheBang(fname): |
| 1233 | """Checks fname is a #! script.""" |
| 1234 | with open(fname) as f: |
| 1235 | return f.read(2).startswith('#!') |
| 1236 | |
| 1237 | |
ukai@chromium.org | 78c4b98 | 2012-02-14 02:20:26 +0000 | [diff] [blame] | 1238 | def DownloadHooks(force): |
| 1239 | """downloads hooks |
| 1240 | |
| 1241 | Args: |
| 1242 | force: True to update hooks. False to install hooks if not present. |
| 1243 | """ |
| 1244 | if not settings.GetIsGerrit(): |
| 1245 | return |
ukai@chromium.org | 712d610 | 2013-11-27 00:52:58 +0000 | [diff] [blame] | 1246 | src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg' |
ukai@chromium.org | 78c4b98 | 2012-02-14 02:20:26 +0000 | [diff] [blame] | 1247 | dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg') |
| 1248 | if not os.access(dst, os.X_OK): |
| 1249 | if os.path.exists(dst): |
| 1250 | if not force: |
| 1251 | return |
ukai@chromium.org | 78c4b98 | 2012-02-14 02:20:26 +0000 | [diff] [blame] | 1252 | try: |
joshua.lock@intel.com | 426f69b | 2012-08-02 23:41:49 +0000 | [diff] [blame] | 1253 | urlretrieve(src, dst) |
ukai@chromium.org | 712d610 | 2013-11-27 00:52:58 +0000 | [diff] [blame] | 1254 | if not hasSheBang(dst): |
| 1255 | DieWithError('Not a script: %s\n' |
| 1256 | 'You need to download from\n%s\n' |
| 1257 | 'into .git/hooks/commit-msg and ' |
| 1258 | 'chmod +x .git/hooks/commit-msg' % (dst, src)) |
ukai@chromium.org | 78c4b98 | 2012-02-14 02:20:26 +0000 | [diff] [blame] | 1259 | os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR) |
| 1260 | except Exception: |
| 1261 | if os.path.exists(dst): |
| 1262 | os.remove(dst) |
ukai@chromium.org | 712d610 | 2013-11-27 00:52:58 +0000 | [diff] [blame] | 1263 | DieWithError('\nFailed to download hooks.\n' |
| 1264 | 'You need to download from\n%s\n' |
| 1265 | 'into .git/hooks/commit-msg and ' |
| 1266 | 'chmod +x .git/hooks/commit-msg' % src) |
ukai@chromium.org | 78c4b98 | 2012-02-14 02:20:26 +0000 | [diff] [blame] | 1267 | |
| 1268 | |
maruel@chromium.org | 0633fb4 | 2013-08-16 20:06:14 +0000 | [diff] [blame] | 1269 | @subcommand.usage('[repo root containing codereview.settings]') |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1270 | def CMDconfig(parser, args): |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 1271 | """Edits configuration for this tree.""" |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1272 | |
pgervais@chromium.org | 87884cc | 2014-01-03 22:23:41 +0000 | [diff] [blame] | 1273 | parser.add_option('--activate-update', action='store_true', |
| 1274 | help='activate auto-updating [rietveld] section in ' |
| 1275 | '.git/config') |
| 1276 | parser.add_option('--deactivate-update', action='store_true', |
| 1277 | help='deactivate auto-updating [rietveld] section in ' |
| 1278 | '.git/config') |
| 1279 | options, args = parser.parse_args(args) |
| 1280 | |
| 1281 | if options.deactivate_update: |
| 1282 | RunGit(['config', 'rietveld.autoupdate', 'false']) |
| 1283 | return |
| 1284 | |
| 1285 | if options.activate_update: |
| 1286 | RunGit(['config', '--unset', 'rietveld.autoupdate']) |
| 1287 | return |
| 1288 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1289 | if len(args) == 0: |
| 1290 | GetCodereviewSettingsInteractively() |
ukai@chromium.org | 78c4b98 | 2012-02-14 02:20:26 +0000 | [diff] [blame] | 1291 | DownloadHooks(True) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1292 | return 0 |
| 1293 | |
| 1294 | url = args[0] |
| 1295 | if not url.endswith('codereview.settings'): |
| 1296 | url = os.path.join(url, 'codereview.settings') |
| 1297 | |
| 1298 | # Load code review settings and download hooks (if available). |
| 1299 | LoadCodereviewSettingsFromFile(urllib2.urlopen(url)) |
ukai@chromium.org | 78c4b98 | 2012-02-14 02:20:26 +0000 | [diff] [blame] | 1300 | DownloadHooks(True) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1301 | return 0 |
| 1302 | |
| 1303 | |
kalmard@homejinni.com | 6b0051e | 2012-04-03 15:45:08 +0000 | [diff] [blame] | 1304 | def CMDbaseurl(parser, args): |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 1305 | """Gets or sets base-url for this branch.""" |
kalmard@homejinni.com | 6b0051e | 2012-04-03 15:45:08 +0000 | [diff] [blame] | 1306 | branchref = RunGit(['symbolic-ref', 'HEAD']).strip() |
| 1307 | branch = ShortBranchName(branchref) |
| 1308 | _, args = parser.parse_args(args) |
| 1309 | if not args: |
| 1310 | print("Current base-url:") |
| 1311 | return RunGit(['config', 'branch.%s.base-url' % branch], |
| 1312 | error_ok=False).strip() |
| 1313 | else: |
| 1314 | print("Setting base-url to %s" % args[0]) |
| 1315 | return RunGit(['config', 'branch.%s.base-url' % branch, args[0]], |
| 1316 | error_ok=False).strip() |
| 1317 | |
| 1318 | |
jsbell@chromium.org | b99fbd9 | 2014-09-11 17:29:28 +0000 | [diff] [blame] | 1319 | def color_for_status(status): |
| 1320 | """Maps a Changelist status to color, for CMDstatus and other tools.""" |
| 1321 | return { |
| 1322 | 'unsent': Fore.RED, |
| 1323 | 'waiting': Fore.BLUE, |
| 1324 | 'reply': Fore.YELLOW, |
| 1325 | 'lgtm': Fore.GREEN, |
| 1326 | 'commit': Fore.MAGENTA, |
| 1327 | 'closed': Fore.CYAN, |
| 1328 | 'error': Fore.WHITE, |
| 1329 | }.get(status, Fore.WHITE) |
| 1330 | |
| 1331 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1332 | def CMDstatus(parser, args): |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 1333 | """Show status of changelists. |
| 1334 | |
| 1335 | 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] | 1336 | - Red not sent for review or broken |
| 1337 | - Blue waiting for review |
| 1338 | - Yellow waiting for you to reply to review |
| 1339 | - Green LGTM'ed |
| 1340 | - Magenta in the commit queue |
| 1341 | - Cyan was committed, branch can be deleted |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 1342 | |
| 1343 | Also see 'git cl comments'. |
| 1344 | """ |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1345 | parser.add_option('--field', |
| 1346 | help='print only specific field (desc|id|patch|url)') |
maruel@chromium.org | 1033efd | 2013-07-23 23:25:09 +0000 | [diff] [blame] | 1347 | parser.add_option('-f', '--fast', action='store_true', |
| 1348 | help='Do not retrieve review status') |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1349 | (options, args) = parser.parse_args(args) |
maruel@chromium.org | 39c0b22 | 2013-08-17 16:57:01 +0000 | [diff] [blame] | 1350 | if args: |
| 1351 | parser.error('Unsupported args: %s' % args) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1352 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1353 | if options.field: |
maruel@chromium.org | e25c75b | 2013-07-23 18:30:56 +0000 | [diff] [blame] | 1354 | cl = Changelist() |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1355 | if options.field.startswith('desc'): |
| 1356 | print cl.GetDescription() |
| 1357 | elif options.field == 'id': |
| 1358 | issueid = cl.GetIssue() |
| 1359 | if issueid: |
| 1360 | print issueid |
| 1361 | elif options.field == 'patch': |
| 1362 | patchset = cl.GetPatchset() |
| 1363 | if patchset: |
| 1364 | print patchset |
| 1365 | elif options.field == 'url': |
| 1366 | url = cl.GetIssueURL() |
| 1367 | if url: |
| 1368 | print url |
maruel@chromium.org | e25c75b | 2013-07-23 18:30:56 +0000 | [diff] [blame] | 1369 | return 0 |
| 1370 | |
| 1371 | branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads']) |
| 1372 | if not branches: |
| 1373 | print('No local branch found.') |
| 1374 | return 0 |
| 1375 | |
| 1376 | changes = (Changelist(branchref=b) for b in branches.splitlines()) |
jrobbins@chromium.org | a4c0305 | 2014-04-25 19:06:36 +0000 | [diff] [blame] | 1377 | branches = [c.GetBranch() for c in changes] |
maruel@chromium.org | e25c75b | 2013-07-23 18:30:56 +0000 | [diff] [blame] | 1378 | alignment = max(5, max(len(b) for b in branches)) |
| 1379 | print 'Branches associated with reviews:' |
maruel@chromium.org | 1033efd | 2013-07-23 23:25:09 +0000 | [diff] [blame] | 1380 | # Adhoc thread pool to request data concurrently. |
| 1381 | output = Queue.Queue() |
| 1382 | |
| 1383 | # Silence upload.py otherwise it becomes unweldly. |
| 1384 | upload.verbosity = 0 |
| 1385 | |
| 1386 | if not options.fast: |
| 1387 | def fetch(b): |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 1388 | """Fetches information for an issue and returns (branch, issue, color).""" |
maruel@chromium.org | 1033efd | 2013-07-23 23:25:09 +0000 | [diff] [blame] | 1389 | c = Changelist(branchref=b) |
| 1390 | i = c.GetIssueURL() |
jsbell@chromium.org | b99fbd9 | 2014-09-11 17:29:28 +0000 | [diff] [blame] | 1391 | status = c.GetStatus() |
| 1392 | color = color_for_status(status) |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 1393 | |
jsbell@chromium.org | b99fbd9 | 2014-09-11 17:29:28 +0000 | [diff] [blame] | 1394 | if i and (not status or status == 'error'): |
| 1395 | # The issue probably doesn't exist anymore. |
| 1396 | i += ' (broken)' |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 1397 | |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 1398 | output.put((b, i, color)) |
maruel@chromium.org | 1033efd | 2013-07-23 23:25:09 +0000 | [diff] [blame] | 1399 | |
jrobbins@chromium.org | a4c0305 | 2014-04-25 19:06:36 +0000 | [diff] [blame] | 1400 | # Process one branch synchronously to work through authentication, then |
| 1401 | # spawn threads to process all the other branches in parallel. |
| 1402 | if branches: |
| 1403 | fetch(branches[0]) |
| 1404 | threads = [ |
| 1405 | threading.Thread(target=fetch, args=(b,)) for b in branches[1:]] |
maruel@chromium.org | 1033efd | 2013-07-23 23:25:09 +0000 | [diff] [blame] | 1406 | for t in threads: |
| 1407 | t.daemon = True |
| 1408 | t.start() |
| 1409 | else: |
| 1410 | # Do not use GetApprovingReviewers(), since it requires an HTTP request. |
| 1411 | for b in branches: |
| 1412 | c = Changelist(branchref=b) |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 1413 | url = c.GetIssueURL() |
| 1414 | output.put((b, url, Fore.BLUE if url else Fore.WHITE)) |
maruel@chromium.org | 1033efd | 2013-07-23 23:25:09 +0000 | [diff] [blame] | 1415 | |
| 1416 | tmp = {} |
| 1417 | alignment = max(5, max(len(ShortBranchName(b)) for b in branches)) |
maruel@chromium.org | e25c75b | 2013-07-23 18:30:56 +0000 | [diff] [blame] | 1418 | for branch in sorted(branches): |
maruel@chromium.org | 1033efd | 2013-07-23 23:25:09 +0000 | [diff] [blame] | 1419 | while branch not in tmp: |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 1420 | b, i, color = output.get() |
| 1421 | tmp[b] = (i, color) |
| 1422 | issue, color = tmp.pop(branch) |
maruel@chromium.org | 885f651 | 2013-07-27 02:17:26 +0000 | [diff] [blame] | 1423 | reset = Fore.RESET |
| 1424 | if not sys.stdout.isatty(): |
| 1425 | color = '' |
| 1426 | reset = '' |
binji@chromium.org | c3d17dd | 2013-12-19 00:55:31 +0000 | [diff] [blame] | 1427 | print ' %*s : %s%s%s' % ( |
maruel@chromium.org | 885f651 | 2013-07-27 02:17:26 +0000 | [diff] [blame] | 1428 | alignment, ShortBranchName(branch), color, issue, reset) |
maruel@chromium.org | 1033efd | 2013-07-23 23:25:09 +0000 | [diff] [blame] | 1429 | |
maruel@chromium.org | e25c75b | 2013-07-23 18:30:56 +0000 | [diff] [blame] | 1430 | cl = Changelist() |
| 1431 | print |
| 1432 | print 'Current branch:', |
| 1433 | if not cl.GetIssue(): |
| 1434 | print 'no issue assigned.' |
| 1435 | return 0 |
| 1436 | print cl.GetBranch() |
| 1437 | print 'Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()) |
maruel@chromium.org | 85616e0 | 2014-07-28 15:37:55 +0000 | [diff] [blame] | 1438 | if not options.fast: |
| 1439 | print 'Issue description:' |
| 1440 | print cl.GetDescription(pretty=True) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1441 | return 0 |
| 1442 | |
| 1443 | |
maruel@chromium.org | 39c0b22 | 2013-08-17 16:57:01 +0000 | [diff] [blame] | 1444 | def colorize_CMDstatus_doc(): |
| 1445 | """To be called once in main() to add colors to git cl status help.""" |
| 1446 | colors = [i for i in dir(Fore) if i[0].isupper()] |
| 1447 | |
| 1448 | def colorize_line(line): |
| 1449 | for color in colors: |
| 1450 | if color in line.upper(): |
| 1451 | # Extract whitespaces first and the leading '-'. |
| 1452 | indent = len(line) - len(line.lstrip(' ')) + 1 |
| 1453 | return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET |
| 1454 | return line |
| 1455 | |
| 1456 | lines = CMDstatus.__doc__.splitlines() |
| 1457 | CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines) |
| 1458 | |
| 1459 | |
maruel@chromium.org | 0633fb4 | 2013-08-16 20:06:14 +0000 | [diff] [blame] | 1460 | @subcommand.usage('[issue_number]') |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1461 | def CMDissue(parser, args): |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 1462 | """Sets or displays the current code review issue number. |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1463 | |
| 1464 | Pass issue number 0 to clear the current issue. |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 1465 | """ |
dpranke@chromium.org | 97ae58e | 2011-03-18 00:29:20 +0000 | [diff] [blame] | 1466 | _, args = parser.parse_args(args) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1467 | |
| 1468 | cl = Changelist() |
| 1469 | if len(args) > 0: |
| 1470 | try: |
| 1471 | issue = int(args[0]) |
| 1472 | except ValueError: |
| 1473 | DieWithError('Pass a number to set the issue or none to list it.\n' |
| 1474 | 'Maybe you want to run git cl status?') |
| 1475 | cl.SetIssue(issue) |
maruel@chromium.org | 5242430 | 2012-08-29 15:14:30 +0000 | [diff] [blame] | 1476 | print 'Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1477 | return 0 |
| 1478 | |
| 1479 | |
maruel@chromium.org | 9977a2e | 2012-06-06 22:30:56 +0000 | [diff] [blame] | 1480 | def CMDcomments(parser, args): |
apavlov@chromium.org | e4efd51 | 2014-11-05 09:05:29 +0000 | [diff] [blame] | 1481 | """Shows or posts review comments for any changelist.""" |
| 1482 | parser.add_option('-a', '--add-comment', dest='comment', |
| 1483 | help='comment to add to an issue') |
| 1484 | parser.add_option('-i', dest='issue', |
| 1485 | help="review issue id (defaults to current issue)") |
| 1486 | options, args = parser.parse_args(args) |
maruel@chromium.org | 9977a2e | 2012-06-06 22:30:56 +0000 | [diff] [blame] | 1487 | |
apavlov@chromium.org | e4efd51 | 2014-11-05 09:05:29 +0000 | [diff] [blame] | 1488 | issue = None |
| 1489 | if options.issue: |
| 1490 | try: |
| 1491 | issue = int(options.issue) |
| 1492 | except ValueError: |
| 1493 | DieWithError('A review issue id is expected to be a number') |
| 1494 | |
| 1495 | cl = Changelist(issue=issue) |
| 1496 | |
| 1497 | if options.comment: |
| 1498 | cl.AddComment(options.comment) |
| 1499 | return 0 |
| 1500 | |
| 1501 | data = cl.GetIssueProperties() |
maruel@chromium.org | 5cab2d3 | 2014-11-11 18:32:41 +0000 | [diff] [blame] | 1502 | for message in sorted(data.get('messages', []), key=lambda x: x['date']): |
apavlov@chromium.org | e4efd51 | 2014-11-05 09:05:29 +0000 | [diff] [blame] | 1503 | if message['disapproval']: |
| 1504 | color = Fore.RED |
| 1505 | elif message['approval']: |
| 1506 | color = Fore.GREEN |
| 1507 | elif message['sender'] == data['owner_email']: |
| 1508 | color = Fore.MAGENTA |
| 1509 | else: |
| 1510 | color = Fore.BLUE |
| 1511 | print '\n%s%s %s%s' % ( |
| 1512 | color, message['date'].split('.', 1)[0], message['sender'], |
| 1513 | Fore.RESET) |
| 1514 | if message['text'].strip(): |
| 1515 | print '\n'.join(' ' + l for l in message['text'].splitlines()) |
maruel@chromium.org | 9977a2e | 2012-06-06 22:30:56 +0000 | [diff] [blame] | 1516 | return 0 |
| 1517 | |
| 1518 | |
rsesek@chromium.org | eec7659 | 2013-05-20 16:27:57 +0000 | [diff] [blame] | 1519 | def CMDdescription(parser, args): |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 1520 | """Brings up the editor for the current CL's description.""" |
rsesek@chromium.org | eec7659 | 2013-05-20 16:27:57 +0000 | [diff] [blame] | 1521 | cl = Changelist() |
| 1522 | if not cl.GetIssue(): |
| 1523 | DieWithError('This branch has no associated changelist.') |
| 1524 | description = ChangeDescription(cl.GetDescription()) |
| 1525 | description.prompt() |
| 1526 | cl.UpdateDescription(description.description) |
| 1527 | return 0 |
| 1528 | |
| 1529 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1530 | def CreateDescriptionFromLog(args): |
| 1531 | """Pulls out the commit log to use as a base for the CL description.""" |
| 1532 | log_args = [] |
| 1533 | if len(args) == 1 and not args[0].endswith('.'): |
| 1534 | log_args = [args[0] + '..'] |
| 1535 | elif len(args) == 1 and args[0].endswith('...'): |
| 1536 | log_args = [args[0][:-1]] |
| 1537 | elif len(args) == 2: |
| 1538 | log_args = [args[0] + '..' + args[1]] |
| 1539 | else: |
| 1540 | log_args = args[:] # Hope for the best! |
maruel@chromium.org | 373af80 | 2012-05-25 21:07:33 +0000 | [diff] [blame] | 1541 | return RunGit(['log', '--pretty=format:%s\n\n%b'] + log_args) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1542 | |
| 1543 | |
thestig@chromium.org | 44202a2 | 2014-03-11 19:22:18 +0000 | [diff] [blame] | 1544 | def CMDlint(parser, args): |
| 1545 | """Runs cpplint on the current changelist.""" |
tzik@chromium.org | f204d4b | 2014-03-13 07:40:55 +0000 | [diff] [blame] | 1546 | parser.add_option('--filter', action='append', metavar='-x,+y', |
| 1547 | help='Comma-separated list of cpplint\'s category-filters') |
| 1548 | (options, args) = parser.parse_args(args) |
thestig@chromium.org | 44202a2 | 2014-03-11 19:22:18 +0000 | [diff] [blame] | 1549 | |
| 1550 | # Access to a protected member _XX of a client class |
| 1551 | # pylint: disable=W0212 |
| 1552 | try: |
| 1553 | import cpplint |
| 1554 | import cpplint_chromium |
| 1555 | except ImportError: |
| 1556 | print "Your depot_tools is missing cpplint.py and/or cpplint_chromium.py." |
| 1557 | return 1 |
| 1558 | |
| 1559 | # Change the current working directory before calling lint so that it |
| 1560 | # shows the correct base. |
| 1561 | previous_cwd = os.getcwd() |
| 1562 | os.chdir(settings.GetRoot()) |
| 1563 | try: |
| 1564 | cl = Changelist() |
| 1565 | change = cl.GetChange(cl.GetCommonAncestorWithUpstream(), None) |
| 1566 | files = [f.LocalPath() for f in change.AffectedFiles()] |
thestig@chromium.org | 5839eb5 | 2014-05-30 16:20:51 +0000 | [diff] [blame] | 1567 | if not files: |
| 1568 | print "Cannot lint an empty CL" |
| 1569 | return 1 |
thestig@chromium.org | 44202a2 | 2014-03-11 19:22:18 +0000 | [diff] [blame] | 1570 | |
| 1571 | # Process cpplints arguments if any. |
tzik@chromium.org | f204d4b | 2014-03-13 07:40:55 +0000 | [diff] [blame] | 1572 | command = args + files |
| 1573 | if options.filter: |
| 1574 | command = ['--filter=' + ','.join(options.filter)] + command |
| 1575 | filenames = cpplint.ParseArguments(command) |
thestig@chromium.org | 44202a2 | 2014-03-11 19:22:18 +0000 | [diff] [blame] | 1576 | |
| 1577 | white_regex = re.compile(settings.GetLintRegex()) |
| 1578 | black_regex = re.compile(settings.GetLintIgnoreRegex()) |
| 1579 | extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace] |
| 1580 | for filename in filenames: |
| 1581 | if white_regex.match(filename): |
| 1582 | if black_regex.match(filename): |
| 1583 | print "Ignoring file %s" % filename |
| 1584 | else: |
| 1585 | cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level, |
| 1586 | extra_check_functions) |
| 1587 | else: |
| 1588 | print "Skipping file %s" % filename |
| 1589 | finally: |
| 1590 | os.chdir(previous_cwd) |
| 1591 | print "Total errors found: %d\n" % cpplint._cpplint_state.error_count |
| 1592 | if cpplint._cpplint_state.error_count != 0: |
| 1593 | return 1 |
| 1594 | return 0 |
| 1595 | |
| 1596 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1597 | def CMDpresubmit(parser, args): |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 1598 | """Runs presubmit tests on the current changelist.""" |
ilevy@chromium.org | 375a902 | 2013-01-07 01:12:05 +0000 | [diff] [blame] | 1599 | parser.add_option('-u', '--upload', action='store_true', |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1600 | help='Run upload hook instead of the push/dcommit hook') |
ilevy@chromium.org | 375a902 | 2013-01-07 01:12:05 +0000 | [diff] [blame] | 1601 | parser.add_option('-f', '--force', action='store_true', |
sbc@chromium.org | 495ad15 | 2012-09-04 23:07:42 +0000 | [diff] [blame] | 1602 | help='Run checks even if tree is dirty') |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1603 | (options, args) = parser.parse_args(args) |
| 1604 | |
ukai@chromium.org | 259e468 | 2012-10-25 07:36:33 +0000 | [diff] [blame] | 1605 | if not options.force and is_dirty_git_tree('presubmit'): |
| 1606 | print 'use --force to check even if tree is dirty.' |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1607 | return 1 |
| 1608 | |
dpranke@chromium.org | 970c522 | 2011-03-12 00:32:24 +0000 | [diff] [blame] | 1609 | cl = Changelist() |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1610 | if args: |
| 1611 | base_branch = args[0] |
| 1612 | else: |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 1613 | # Default to diffing against the common ancestor of the upstream branch. |
thestig@chromium.org | 8b0553c | 2014-02-11 00:33:37 +0000 | [diff] [blame] | 1614 | base_branch = cl.GetCommonAncestorWithUpstream() |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1615 | |
ilevy@chromium.org | 051ad0e | 2013-03-04 21:57:34 +0000 | [diff] [blame] | 1616 | cl.RunHook( |
| 1617 | committing=not options.upload, |
| 1618 | may_prompt=False, |
| 1619 | verbose=options.verbose, |
| 1620 | change=cl.GetChange(base_branch, None)) |
dpranke@chromium.org | 0a2bb37 | 2011-03-25 01:16:22 +0000 | [diff] [blame] | 1621 | return 0 |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1622 | |
| 1623 | |
sivachandra@chromium.org | aebe87f | 2012-10-22 20:34:21 +0000 | [diff] [blame] | 1624 | def AddChangeIdToCommitMessage(options, args): |
| 1625 | """Re-commits using the current message, assumes the commit hook is in |
| 1626 | place. |
| 1627 | """ |
| 1628 | log_desc = options.message or CreateDescriptionFromLog(args) |
| 1629 | git_command = ['commit', '--amend', '-m', log_desc] |
| 1630 | RunGit(git_command) |
| 1631 | new_log_desc = CreateDescriptionFromLog(args) |
| 1632 | if CHANGE_ID in new_log_desc: |
| 1633 | print 'git-cl: Added Change-Id to commit message.' |
| 1634 | else: |
| 1635 | print >> sys.stderr, 'ERROR: Gerrit commit-msg hook not available.' |
| 1636 | |
| 1637 | |
piman@chromium.org | 336f912 | 2014-09-04 02:16:55 +0000 | [diff] [blame] | 1638 | def GerritUpload(options, args, cl, change): |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 1639 | """upload the current branch to gerrit.""" |
| 1640 | # We assume the remote called "origin" is the one we want. |
| 1641 | # It is probably not worthwhile to support different workflows. |
bauerb@chromium.org | 27386dd | 2015-02-16 10:45:39 +0000 | [diff] [blame] | 1642 | gerrit_remote = 'origin' |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 1643 | branch = 'master' |
| 1644 | if options.target_branch: |
| 1645 | branch = options.target_branch |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1646 | |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 1647 | change_desc = ChangeDescription( |
| 1648 | options.message or CreateDescriptionFromLog(args)) |
| 1649 | if not change_desc.description: |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 1650 | print "Description is empty; aborting." |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1651 | return 1 |
bauerb@chromium.org | f75c230 | 2014-05-01 08:19:30 +0000 | [diff] [blame] | 1652 | |
bauerb@chromium.org | 27386dd | 2015-02-16 10:45:39 +0000 | [diff] [blame] | 1653 | if options.squash: |
| 1654 | # Try to get the message from a previous upload. |
| 1655 | shadow_branch = 'refs/heads/git_cl_uploads/' + cl.GetBranch() |
| 1656 | message = RunGitSilent(['show', '--format=%s\n\n%b', '-s', shadow_branch]) |
| 1657 | if not message: |
| 1658 | if not options.force: |
| 1659 | change_desc.prompt() |
| 1660 | |
| 1661 | if CHANGE_ID not in change_desc.description: |
| 1662 | # Run the commit-msg hook without modifying the head commit by writing |
| 1663 | # the commit message to a temporary file and running the hook over it, |
| 1664 | # then reading the file back in. |
| 1665 | commit_msg_hook = os.path.join(settings.GetRoot(), '.git', 'hooks', |
| 1666 | 'commit-msg') |
| 1667 | file_handle, msg_file = tempfile.mkstemp(text=True, |
| 1668 | prefix='commit_msg') |
| 1669 | try: |
| 1670 | try: |
| 1671 | with os.fdopen(file_handle, 'w') as fileobj: |
| 1672 | fileobj.write(change_desc.description) |
| 1673 | finally: |
| 1674 | os.close(file_handle) |
| 1675 | RunCommand([commit_msg_hook, msg_file]) |
| 1676 | change_desc.set_description(gclient_utils.FileRead(msg_file)) |
| 1677 | finally: |
| 1678 | os.remove(msg_file) |
| 1679 | |
| 1680 | if not change_desc.description: |
| 1681 | print "Description is empty; aborting." |
| 1682 | return 1 |
| 1683 | |
| 1684 | message = change_desc.description |
| 1685 | |
| 1686 | remote, upstream_branch = cl.FetchUpstreamTuple(cl.GetBranch()) |
| 1687 | if remote is '.': |
| 1688 | # If our upstream branch is local, we base our squashed commit on its |
| 1689 | # squashed version. |
| 1690 | parent = ('refs/heads/git_cl_uploads/' + |
| 1691 | scm.GIT.ShortBranchName(upstream_branch)) |
| 1692 | |
| 1693 | # Verify that the upstream branch has been uploaded too, otherwise Gerrit |
| 1694 | # will create additional CLs when uploading. |
| 1695 | if (RunGitSilent(['rev-parse', upstream_branch + ':']) != |
| 1696 | RunGitSilent(['rev-parse', parent + ':'])): |
| 1697 | print 'Upload upstream branch ' + upstream_branch + ' first.' |
| 1698 | return 1 |
| 1699 | else: |
| 1700 | parent = cl.GetCommonAncestorWithUpstream() |
| 1701 | |
| 1702 | tree = RunGit(['rev-parse', 'HEAD:']).strip() |
| 1703 | ref_to_push = RunGit(['commit-tree', tree, '-p', parent, |
| 1704 | '-m', message]).strip() |
| 1705 | else: |
| 1706 | if CHANGE_ID not in change_desc.description: |
| 1707 | AddChangeIdToCommitMessage(options, args) |
| 1708 | ref_to_push = 'HEAD' |
| 1709 | parent = '%s/%s' % (gerrit_remote, branch) |
| 1710 | |
| 1711 | commits = RunGitSilent(['rev-list', '%s..%s' % (parent, |
| 1712 | ref_to_push)]).splitlines() |
bauerb@chromium.org | f75c230 | 2014-05-01 08:19:30 +0000 | [diff] [blame] | 1713 | if len(commits) > 1: |
| 1714 | print('WARNING: This will upload %d commits. Run the following command ' |
| 1715 | 'to see which commits will be uploaded: ' % len(commits)) |
bauerb@chromium.org | 27386dd | 2015-02-16 10:45:39 +0000 | [diff] [blame] | 1716 | print('git log %s..%s' % (parent, ref_to_push)) |
| 1717 | print('You can also use `git squash-branch` to squash these into a single ' |
bauerb@chromium.org | f75c230 | 2014-05-01 08:19:30 +0000 | [diff] [blame] | 1718 | 'commit.') |
| 1719 | ask_for_data('About to upload; enter to confirm.') |
| 1720 | |
piman@chromium.org | 336f912 | 2014-09-04 02:16:55 +0000 | [diff] [blame] | 1721 | if options.reviewers or options.tbr_owners: |
| 1722 | change_desc.update_reviewers(options.reviewers, options.tbr_owners, change) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1723 | |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 1724 | receive_options = [] |
| 1725 | cc = cl.GetCCList().split(',') |
| 1726 | if options.cc: |
maruel@chromium.org | eb52a5c | 2013-04-10 23:17:09 +0000 | [diff] [blame] | 1727 | cc.extend(options.cc) |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 1728 | cc = filter(None, cc) |
| 1729 | if cc: |
| 1730 | receive_options += ['--cc=' + email for email in cc] |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 1731 | if change_desc.get_reviewers(): |
| 1732 | receive_options.extend( |
| 1733 | '--reviewer=' + email for email in change_desc.get_reviewers()) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1734 | |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 1735 | git_command = ['push'] |
| 1736 | if receive_options: |
ukai@chromium.org | 19bbfa2 | 2012-02-03 16:18:11 +0000 | [diff] [blame] | 1737 | git_command.append('--receive-pack=git receive-pack %s' % |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 1738 | ' '.join(receive_options)) |
bauerb@chromium.org | 27386dd | 2015-02-16 10:45:39 +0000 | [diff] [blame] | 1739 | git_command += [gerrit_remote, ref_to_push + ':refs/for/' + branch] |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 1740 | RunGit(git_command) |
bauerb@chromium.org | 27386dd | 2015-02-16 10:45:39 +0000 | [diff] [blame] | 1741 | |
| 1742 | if options.squash: |
| 1743 | head = RunGit(['rev-parse', 'HEAD']).strip() |
| 1744 | RunGit(['update-ref', '-m', 'Uploaded ' + head, shadow_branch, ref_to_push]) |
| 1745 | |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 1746 | # TODO(ukai): parse Change-Id: and set issue number? |
| 1747 | return 0 |
dpranke@chromium.org | 970c522 | 2011-03-12 00:32:24 +0000 | [diff] [blame] | 1748 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1749 | |
wittman@chromium.org | 455dc92 | 2015-01-26 20:15:50 +0000 | [diff] [blame] | 1750 | def GetTargetRef(remote, remote_branch, target_branch, pending_prefix): |
| 1751 | """Computes the remote branch ref to use for the CL. |
| 1752 | |
| 1753 | Args: |
| 1754 | remote (str): The git remote for the CL. |
| 1755 | remote_branch (str): The git remote branch for the CL. |
| 1756 | target_branch (str): The target branch specified by the user. |
| 1757 | pending_prefix (str): The pending prefix from the settings. |
| 1758 | """ |
| 1759 | if not (remote and remote_branch): |
| 1760 | return None |
bauerb@chromium.org | 27386dd | 2015-02-16 10:45:39 +0000 | [diff] [blame] | 1761 | |
wittman@chromium.org | 455dc92 | 2015-01-26 20:15:50 +0000 | [diff] [blame] | 1762 | if target_branch: |
| 1763 | # Cannonicalize branch references to the equivalent local full symbolic |
| 1764 | # refs, which are then translated into the remote full symbolic refs |
| 1765 | # below. |
| 1766 | if '/' not in target_branch: |
| 1767 | remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch) |
| 1768 | else: |
| 1769 | prefix_replacements = ( |
| 1770 | ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'), |
| 1771 | ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote), |
| 1772 | ('^(refs/)?heads/', 'refs/remotes/%s/' % remote), |
| 1773 | ) |
| 1774 | match = None |
| 1775 | for regex, replacement in prefix_replacements: |
| 1776 | match = re.search(regex, target_branch) |
| 1777 | if match: |
| 1778 | remote_branch = target_branch.replace(match.group(0), replacement) |
| 1779 | break |
| 1780 | if not match: |
| 1781 | # This is a branch path but not one we recognize; use as-is. |
| 1782 | remote_branch = target_branch |
| 1783 | elif (not remote_branch.startswith('refs/remotes/branch-heads') and |
| 1784 | not remote_branch.startswith('refs/remotes/%s/refs' % remote)): |
| 1785 | # Default to master for refs that are not branches. |
| 1786 | remote_branch = 'refs/remotes/%s/master' % remote |
bauerb@chromium.org | 27386dd | 2015-02-16 10:45:39 +0000 | [diff] [blame] | 1787 | |
wittman@chromium.org | 455dc92 | 2015-01-26 20:15:50 +0000 | [diff] [blame] | 1788 | # Create the true path to the remote branch. |
| 1789 | # Does the following translation: |
| 1790 | # * refs/remotes/origin/refs/diff/test -> refs/diff/test |
| 1791 | # * refs/remotes/origin/master -> refs/heads/master |
| 1792 | # * refs/remotes/branch-heads/test -> refs/branch-heads/test |
| 1793 | if remote_branch.startswith('refs/remotes/%s/refs/' % remote): |
| 1794 | remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '') |
| 1795 | elif remote_branch.startswith('refs/remotes/%s/' % remote): |
| 1796 | remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, |
| 1797 | 'refs/heads/') |
| 1798 | elif remote_branch.startswith('refs/remotes/branch-heads'): |
| 1799 | remote_branch = remote_branch.replace('refs/remotes/', 'refs/') |
| 1800 | # If a pending prefix exists then replace refs/ with it. |
| 1801 | if pending_prefix: |
| 1802 | remote_branch = remote_branch.replace('refs/', pending_prefix) |
| 1803 | return remote_branch |
| 1804 | |
| 1805 | |
piman@chromium.org | 336f912 | 2014-09-04 02:16:55 +0000 | [diff] [blame] | 1806 | def RietveldUpload(options, args, cl, change): |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 1807 | """upload the patch to rietveld.""" |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1808 | upload_args = ['--assume_yes'] # Don't ask about untracked files. |
| 1809 | upload_args.extend(['--server', cl.GetRietveldServer()]) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1810 | if options.emulate_svn_auto_props: |
| 1811 | upload_args.append('--emulate_svn_auto_props') |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1812 | |
| 1813 | change_desc = None |
| 1814 | |
pgervais@chromium.org | 9114137 | 2014-01-09 23:27:20 +0000 | [diff] [blame] | 1815 | if options.email is not None: |
| 1816 | upload_args.extend(['--email', options.email]) |
| 1817 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1818 | if cl.GetIssue(): |
rogerta@chromium.org | 420d3b8 | 2012-05-14 18:41:38 +0000 | [diff] [blame] | 1819 | if options.title: |
| 1820 | upload_args.extend(['--title', options.title]) |
rogerta@chromium.org | afadfca | 2013-05-29 14:15:53 +0000 | [diff] [blame] | 1821 | if options.message: |
| 1822 | upload_args.extend(['--message', options.message]) |
maruel@chromium.org | 5242430 | 2012-08-29 15:14:30 +0000 | [diff] [blame] | 1823 | upload_args.extend(['--issue', str(cl.GetIssue())]) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1824 | print ("This branch is associated with issue %s. " |
| 1825 | "Adding patch to that issue." % cl.GetIssue()) |
| 1826 | else: |
rogerta@chromium.org | 420d3b8 | 2012-05-14 18:41:38 +0000 | [diff] [blame] | 1827 | if options.title: |
| 1828 | upload_args.extend(['--title', options.title]) |
rogerta@chromium.org | 43e34f0 | 2013-03-25 14:52:48 +0000 | [diff] [blame] | 1829 | message = options.title or options.message or CreateDescriptionFromLog(args) |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 1830 | change_desc = ChangeDescription(message) |
piman@chromium.org | 336f912 | 2014-09-04 02:16:55 +0000 | [diff] [blame] | 1831 | if options.reviewers or options.tbr_owners: |
| 1832 | change_desc.update_reviewers(options.reviewers, |
| 1833 | options.tbr_owners, |
| 1834 | change) |
maruel@chromium.org | 71e12a9 | 2012-02-14 02:34:15 +0000 | [diff] [blame] | 1835 | if not options.force: |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 1836 | change_desc.prompt() |
dpranke@chromium.org | 970c522 | 2011-03-12 00:32:24 +0000 | [diff] [blame] | 1837 | |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 1838 | if not change_desc.description: |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1839 | print "Description is empty; aborting." |
| 1840 | return 1 |
dpranke@chromium.org | 970c522 | 2011-03-12 00:32:24 +0000 | [diff] [blame] | 1841 | |
maruel@chromium.org | 71e12a9 | 2012-02-14 02:34:15 +0000 | [diff] [blame] | 1842 | upload_args.extend(['--message', change_desc.description]) |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 1843 | if change_desc.get_reviewers(): |
| 1844 | upload_args.append('--reviewers=' + ','.join(change_desc.get_reviewers())) |
maruel@chromium.org | a335365 | 2011-11-30 14:26:57 +0000 | [diff] [blame] | 1845 | if options.send_mail: |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 1846 | if not change_desc.get_reviewers(): |
maruel@chromium.org | a335365 | 2011-11-30 14:26:57 +0000 | [diff] [blame] | 1847 | DieWithError("Must specify reviewers to send email.") |
| 1848 | upload_args.append('--send_mail') |
tyoshino@chromium.org | 99918ab | 2013-09-30 06:17:28 +0000 | [diff] [blame] | 1849 | |
| 1850 | # We check this before applying rietveld.private assuming that in |
| 1851 | # rietveld.cc only addresses which we can send private CLs to are listed |
| 1852 | # if rietveld.private is set, and so we should ignore rietveld.cc only when |
| 1853 | # --private is specified explicitly on the command line. |
| 1854 | if options.private: |
| 1855 | logging.warn('rietveld.cc is ignored since private flag is specified. ' |
| 1856 | 'You need to review and add them manually if necessary.') |
| 1857 | cc = cl.GetCCListWithoutDefault() |
| 1858 | else: |
| 1859 | cc = cl.GetCCList() |
| 1860 | cc = ','.join(filter(None, (cc, ','.join(options.cc)))) |
maruel@chromium.org | b2a7c33 | 2011-02-25 20:30:37 +0000 | [diff] [blame] | 1861 | if cc: |
| 1862 | upload_args.extend(['--cc', cc]) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1863 | |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 1864 | if options.private or settings.GetDefaultPrivateFlag() == "True": |
| 1865 | upload_args.append('--private') |
| 1866 | |
iannucci@chromium.org | 53937ba | 2012-10-02 18:20:43 +0000 | [diff] [blame] | 1867 | upload_args.extend(['--git_similarity', str(options.similarity)]) |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 1868 | if not options.find_copies: |
| 1869 | upload_args.extend(['--git_no_find_copies']) |
iannucci@chromium.org | 53937ba | 2012-10-02 18:20:43 +0000 | [diff] [blame] | 1870 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1871 | # Include the upstream repo's URL in the change -- this is useful for |
| 1872 | # projects that have their source spread across multiple repos. |
kalmard@homejinni.com | 6b0051e | 2012-04-03 15:45:08 +0000 | [diff] [blame] | 1873 | remote_url = cl.GetGitBaseUrlFromConfig() |
| 1874 | if not remote_url: |
| 1875 | if settings.GetIsGitSvn(): |
kjellander@chromium.org | 6abc652 | 2014-12-02 07:34:49 +0000 | [diff] [blame] | 1876 | remote_url = cl.GetGitSvnRemoteUrl() |
kalmard@homejinni.com | 6b0051e | 2012-04-03 15:45:08 +0000 | [diff] [blame] | 1877 | else: |
jam@chromium.org | 80c51ae | 2014-10-17 18:43:02 +0000 | [diff] [blame] | 1878 | if cl.GetRemoteUrl() and '/' in cl.GetUpstreamBranch(): |
| 1879 | remote_url = (cl.GetRemoteUrl() + '@' |
| 1880 | + cl.GetUpstreamBranch().split('/')[-1]) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1881 | if remote_url: |
| 1882 | upload_args.extend(['--base_url', remote_url]) |
rmistry@google.com | d1e3758 | 2014-12-10 20:58:24 +0000 | [diff] [blame] | 1883 | remote, remote_branch = cl.GetRemoteBranch() |
wittman@chromium.org | 455dc92 | 2015-01-26 20:15:50 +0000 | [diff] [blame] | 1884 | target_ref = GetTargetRef(remote, remote_branch, options.target_branch, |
| 1885 | settings.GetPendingRefPrefix()) |
| 1886 | if target_ref: |
| 1887 | upload_args.extend(['--target_ref', target_ref]) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1888 | |
sheyang@chromium.org | 152cf83 | 2014-06-11 21:37:49 +0000 | [diff] [blame] | 1889 | project = settings.GetProject() |
| 1890 | if project: |
| 1891 | upload_args.extend(['--project', project]) |
| 1892 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1893 | try: |
ilevy@chromium.org | 8288019 | 2012-11-26 15:41:57 +0000 | [diff] [blame] | 1894 | upload_args = ['upload'] + upload_args + args |
| 1895 | logging.info('upload.RealMain(%s)', upload_args) |
| 1896 | issue, patchset = upload.RealMain(upload_args) |
maruel@chromium.org | 911fce1 | 2013-07-29 23:01:13 +0000 | [diff] [blame] | 1897 | issue = int(issue) |
| 1898 | patchset = int(patchset) |
maruel@chromium.org | 9ce0dff | 2011-04-04 17:56:50 +0000 | [diff] [blame] | 1899 | except KeyboardInterrupt: |
| 1900 | sys.exit(1) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1901 | except: |
| 1902 | # If we got an exception after the user typed a description for their |
| 1903 | # change, back up the description before re-raising. |
| 1904 | if change_desc: |
| 1905 | backup_path = os.path.expanduser(DESCRIPTION_BACKUP_FILE) |
| 1906 | print '\nGot exception while uploading -- saving description to %s\n' \ |
| 1907 | % backup_path |
| 1908 | backup_file = open(backup_path, 'w') |
dpranke@chromium.org | 970c522 | 2011-03-12 00:32:24 +0000 | [diff] [blame] | 1909 | backup_file.write(change_desc.description) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1910 | backup_file.close() |
| 1911 | raise |
| 1912 | |
| 1913 | if not cl.GetIssue(): |
| 1914 | cl.SetIssue(issue) |
| 1915 | cl.SetPatchset(patchset) |
maruel@chromium.org | 27bb387 | 2011-05-30 20:33:19 +0000 | [diff] [blame] | 1916 | |
| 1917 | if options.use_commit_queue: |
| 1918 | cl.SetFlag('commit', '1') |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1919 | return 0 |
| 1920 | |
| 1921 | |
maruel@chromium.org | eb52a5c | 2013-04-10 23:17:09 +0000 | [diff] [blame] | 1922 | def cleanup_list(l): |
| 1923 | """Fixes a list so that comma separated items are put as individual items. |
| 1924 | |
| 1925 | So that "--reviewers joe@c,john@c --reviewers joa@c" results in |
| 1926 | options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']). |
| 1927 | """ |
| 1928 | items = sum((i.split(',') for i in l), []) |
| 1929 | stripped_items = (i.strip() for i in items) |
| 1930 | return sorted(filter(None, stripped_items)) |
| 1931 | |
| 1932 | |
maruel@chromium.org | 0633fb4 | 2013-08-16 20:06:14 +0000 | [diff] [blame] | 1933 | @subcommand.usage('[args to "git diff"]') |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 1934 | def CMDupload(parser, args): |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 1935 | """Uploads the current changelist to codereview.""" |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 1936 | parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks', |
| 1937 | help='bypass upload presubmit hook') |
brettw@chromium.org | b65c43c | 2013-06-10 22:04:49 +0000 | [diff] [blame] | 1938 | parser.add_option('--bypass-watchlists', action='store_true', |
| 1939 | dest='bypass_watchlists', |
| 1940 | help='bypass watchlists auto CC-ing reviewers') |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 1941 | parser.add_option('-f', action='store_true', dest='force', |
| 1942 | help="force yes to questions (don't prompt)") |
rogerta@chromium.org | 420d3b8 | 2012-05-14 18:41:38 +0000 | [diff] [blame] | 1943 | parser.add_option('-m', dest='message', help='message for patchset') |
| 1944 | parser.add_option('-t', dest='title', help='title for patchset') |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 1945 | parser.add_option('-r', '--reviewers', |
maruel@chromium.org | eb52a5c | 2013-04-10 23:17:09 +0000 | [diff] [blame] | 1946 | action='append', default=[], |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 1947 | help='reviewer email addresses') |
| 1948 | parser.add_option('--cc', |
maruel@chromium.org | eb52a5c | 2013-04-10 23:17:09 +0000 | [diff] [blame] | 1949 | action='append', default=[], |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 1950 | help='cc email addresses') |
adamk@chromium.org | 36f4730 | 2013-04-05 01:08:31 +0000 | [diff] [blame] | 1951 | parser.add_option('-s', '--send-mail', action='store_true', |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 1952 | help='send email to reviewer immediately') |
pgervais@chromium.org | b9f2751 | 2014-08-08 15:52:33 +0000 | [diff] [blame] | 1953 | parser.add_option('--emulate_svn_auto_props', |
| 1954 | '--emulate-svn-auto-props', |
| 1955 | action="store_true", |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 1956 | dest="emulate_svn_auto_props", |
| 1957 | help="Emulate Subversion's auto properties feature.") |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 1958 | parser.add_option('-c', '--use-commit-queue', action='store_true', |
| 1959 | help='tell the commit queue to commit this patchset') |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 1960 | parser.add_option('--private', action='store_true', |
| 1961 | help='set the review private (rietveld only)') |
ukai@chromium.org | 8ef7ab2 | 2012-11-28 04:24:52 +0000 | [diff] [blame] | 1962 | parser.add_option('--target_branch', |
pgervais@chromium.org | b9f2751 | 2014-08-08 15:52:33 +0000 | [diff] [blame] | 1963 | '--target-branch', |
wittman@chromium.org | 455dc92 | 2015-01-26 20:15:50 +0000 | [diff] [blame] | 1964 | metavar='TARGET', |
| 1965 | help='Apply CL to remote ref TARGET. ' + |
| 1966 | 'Default: remote branch head, or master') |
bauerb@chromium.org | 27386dd | 2015-02-16 10:45:39 +0000 | [diff] [blame] | 1967 | parser.add_option('--squash', action='store_true', |
| 1968 | help='Squash multiple commits into one (Gerrit only)') |
pgervais@chromium.org | 9114137 | 2014-01-09 23:27:20 +0000 | [diff] [blame] | 1969 | parser.add_option('--email', default=None, |
| 1970 | help='email address to use to connect to Rietveld') |
piman@chromium.org | 336f912 | 2014-09-04 02:16:55 +0000 | [diff] [blame] | 1971 | parser.add_option('--tbr-owners', dest='tbr_owners', action='store_true', |
| 1972 | help='add a set of OWNERS to TBR') |
pgervais@chromium.org | 9114137 | 2014-01-09 23:27:20 +0000 | [diff] [blame] | 1973 | |
iannucci@chromium.org | 53937ba | 2012-10-02 18:20:43 +0000 | [diff] [blame] | 1974 | add_git_similarity(parser) |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 1975 | (options, args) = parser.parse_args(args) |
| 1976 | |
ukai@chromium.org | 259e468 | 2012-10-25 07:36:33 +0000 | [diff] [blame] | 1977 | if is_dirty_git_tree('upload'): |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 1978 | return 1 |
| 1979 | |
maruel@chromium.org | eb52a5c | 2013-04-10 23:17:09 +0000 | [diff] [blame] | 1980 | options.reviewers = cleanup_list(options.reviewers) |
| 1981 | options.cc = cleanup_list(options.cc) |
| 1982 | |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 1983 | cl = Changelist() |
| 1984 | if args: |
| 1985 | # TODO(ukai): is it ok for gerrit case? |
| 1986 | base_branch = args[0] |
| 1987 | else: |
luqui@chromium.org | 64e1436 | 2015-01-07 00:29:29 +0000 | [diff] [blame] | 1988 | if cl.GetBranch() is None: |
| 1989 | DieWithError('Can\'t upload from detached HEAD state. Get on a branch!') |
| 1990 | |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 1991 | # Default to diffing against common ancestor of upstream branch |
thestig@chromium.org | 8b0553c | 2014-02-11 00:33:37 +0000 | [diff] [blame] | 1992 | base_branch = cl.GetCommonAncestorWithUpstream() |
sbc@chromium.org | 5e07e06 | 2013-02-28 23:55:44 +0000 | [diff] [blame] | 1993 | args = [base_branch, 'HEAD'] |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 1994 | |
ilevy@chromium.org | 051ad0e | 2013-03-04 21:57:34 +0000 | [diff] [blame] | 1995 | # Apply watchlists on upload. |
| 1996 | change = cl.GetChange(base_branch, None) |
| 1997 | watchlist = watchlists.Watchlists(change.RepositoryRoot()) |
| 1998 | files = [f.LocalPath() for f in change.AffectedFiles()] |
brettw@chromium.org | b65c43c | 2013-06-10 22:04:49 +0000 | [diff] [blame] | 1999 | if not options.bypass_watchlists: |
| 2000 | cl.SetWatchers(watchlist.GetWatchersForPaths(files)) |
ilevy@chromium.org | 051ad0e | 2013-03-04 21:57:34 +0000 | [diff] [blame] | 2001 | |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 2002 | if not options.bypass_hooks: |
piman@chromium.org | 336f912 | 2014-09-04 02:16:55 +0000 | [diff] [blame] | 2003 | if options.reviewers or options.tbr_owners: |
isherman@chromium.org | b5cded6 | 2014-03-25 17:47:57 +0000 | [diff] [blame] | 2004 | # Set the reviewer list now so that presubmit checks can access it. |
| 2005 | change_description = ChangeDescription(change.FullDescriptionText()) |
piman@chromium.org | 336f912 | 2014-09-04 02:16:55 +0000 | [diff] [blame] | 2006 | change_description.update_reviewers(options.reviewers, |
| 2007 | options.tbr_owners, |
| 2008 | change) |
isherman@chromium.org | b5cded6 | 2014-03-25 17:47:57 +0000 | [diff] [blame] | 2009 | change.SetDescriptionText(change_description.description) |
ilevy@chromium.org | 051ad0e | 2013-03-04 21:57:34 +0000 | [diff] [blame] | 2010 | hook_results = cl.RunHook(committing=False, |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 2011 | may_prompt=not options.force, |
| 2012 | verbose=options.verbose, |
ilevy@chromium.org | 051ad0e | 2013-03-04 21:57:34 +0000 | [diff] [blame] | 2013 | change=change) |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 2014 | if not hook_results.should_continue(): |
| 2015 | return 1 |
| 2016 | if not options.reviewers and hook_results.reviewers: |
maruel@chromium.org | eb52a5c | 2013-04-10 23:17:09 +0000 | [diff] [blame] | 2017 | options.reviewers = hook_results.reviewers.split(',') |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 2018 | |
koz@chromium.org | 5974d7a | 2013-04-02 20:50:37 +0000 | [diff] [blame] | 2019 | if cl.GetIssue(): |
maruel@chromium.org | 1033efd | 2013-07-23 23:25:09 +0000 | [diff] [blame] | 2020 | latest_patchset = cl.GetMostRecentPatchset() |
koz@chromium.org | 5974d7a | 2013-04-02 20:50:37 +0000 | [diff] [blame] | 2021 | local_patchset = cl.GetPatchset() |
dmikurube@chromium.org | 07d149f | 2013-04-03 11:40:23 +0000 | [diff] [blame] | 2022 | if latest_patchset and local_patchset and local_patchset != latest_patchset: |
koz@chromium.org | 5974d7a | 2013-04-02 20:50:37 +0000 | [diff] [blame] | 2023 | print ('The last upload made from this repository was patchset #%d but ' |
| 2024 | 'the most recent patchset on the server is #%d.' |
| 2025 | % (local_patchset, latest_patchset)) |
koz@chromium.org | c719278 | 2013-04-09 23:28:46 +0000 | [diff] [blame] | 2026 | print ('Uploading will still work, but if you\'ve uploaded to this issue ' |
| 2027 | 'from another machine or branch the patch you\'re uploading now ' |
| 2028 | 'might not include those changes.') |
koz@chromium.org | 5974d7a | 2013-04-02 20:50:37 +0000 | [diff] [blame] | 2029 | ask_for_data('About to upload; enter to confirm.') |
| 2030 | |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 2031 | print_stats(options.similarity, options.find_copies, args) |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 2032 | if settings.GetIsGerrit(): |
piman@chromium.org | 336f912 | 2014-09-04 02:16:55 +0000 | [diff] [blame] | 2033 | return GerritUpload(options, args, cl, change) |
| 2034 | ret = RietveldUpload(options, args, cl, change) |
rogerta@chromium.org | caa1655 | 2013-03-18 20:45:05 +0000 | [diff] [blame] | 2035 | if not ret: |
rogerta@chromium.org | 4a6cd04 | 2013-04-12 15:40:42 +0000 | [diff] [blame] | 2036 | git_set_branch_value('last-upload-hash', |
| 2037 | RunGit(['rev-parse', 'HEAD']).strip()) |
rogerta@chromium.org | caa1655 | 2013-03-18 20:45:05 +0000 | [diff] [blame] | 2038 | |
| 2039 | return ret |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 2040 | |
| 2041 | |
szager@chromium.org | 9bb85e2 | 2012-06-13 20:28:23 +0000 | [diff] [blame] | 2042 | def IsSubmoduleMergeCommit(ref): |
| 2043 | # When submodules are added to the repo, we expect there to be a single |
| 2044 | # non-git-svn merge commit at remote HEAD with a signature comment. |
| 2045 | pattern = '^SVN changes up to revision [0-9]*$' |
szager@chromium.org | e84b754 | 2012-06-15 21:26:58 +0000 | [diff] [blame] | 2046 | cmd = ['rev-list', '--merges', '--grep=%s' % pattern, '%s^!' % ref] |
szager@chromium.org | 9bb85e2 | 2012-06-13 20:28:23 +0000 | [diff] [blame] | 2047 | return RunGit(cmd) != '' |
| 2048 | |
| 2049 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 2050 | def SendUpstream(parser, args, cmd): |
pgervais@chromium.org | cee6dc4 | 2014-05-07 17:04:03 +0000 | [diff] [blame] | 2051 | """Common code for CMDland and CmdDCommit |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 2052 | |
iannucci@chromium.org | 5724c96 | 2014-04-11 09:32:56 +0000 | [diff] [blame] | 2053 | Squashes branch into a single commit. |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 2054 | Updates changelog with metadata (e.g. pointer to review). |
| 2055 | Pushes/dcommits the code upstream. |
| 2056 | Updates review and closes. |
| 2057 | """ |
| 2058 | parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks', |
| 2059 | help='bypass upload presubmit hook') |
| 2060 | parser.add_option('-m', dest='message', |
| 2061 | help="override review description") |
| 2062 | parser.add_option('-f', action='store_true', dest='force', |
| 2063 | help="force yes to questions (don't prompt)") |
| 2064 | parser.add_option('-c', dest='contributor', |
| 2065 | help="external contributor for patch (appended to " + |
| 2066 | "description and used as author for git). Should be " + |
| 2067 | "formatted as 'First Last <email@example.com>'") |
iannucci@chromium.org | 53937ba | 2012-10-02 18:20:43 +0000 | [diff] [blame] | 2068 | add_git_similarity(parser) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 2069 | (options, args) = parser.parse_args(args) |
| 2070 | cl = Changelist() |
| 2071 | |
iannucci@chromium.org | 5724c96 | 2014-04-11 09:32:56 +0000 | [diff] [blame] | 2072 | current = cl.GetBranch() |
| 2073 | remote, upstream_branch = cl.FetchUpstreamTuple(cl.GetBranch()) |
| 2074 | if not settings.GetIsGitSvn() and remote == '.': |
| 2075 | print |
| 2076 | print 'Attempting to push branch %r into another local branch!' % current |
| 2077 | print |
| 2078 | print 'Either reparent this branch on top of origin/master:' |
| 2079 | print ' git reparent-branch --root' |
| 2080 | print |
| 2081 | print 'OR run `git rebase-update` if you think the parent branch is already' |
| 2082 | print 'committed.' |
| 2083 | print |
| 2084 | print ' Current parent: %r' % upstream_branch |
| 2085 | return 1 |
| 2086 | |
vadimsh@chromium.org | 566a02a | 2014-08-22 01:34:13 +0000 | [diff] [blame] | 2087 | if not args or cmd == 'land': |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 2088 | # Default to merging against our best guess of the upstream branch. |
| 2089 | args = [cl.GetUpstreamBranch()] |
| 2090 | |
maruel@chromium.org | 13f623c | 2011-07-22 16:02:23 +0000 | [diff] [blame] | 2091 | if options.contributor: |
| 2092 | if not re.match('^.*\s<\S+@\S+>$', options.contributor): |
| 2093 | print "Please provide contibutor as 'First Last <email@example.com>'" |
| 2094 | return 1 |
| 2095 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 2096 | base_branch = args[0] |
szager@chromium.org | 9bb85e2 | 2012-06-13 20:28:23 +0000 | [diff] [blame] | 2097 | base_has_submodules = IsSubmoduleMergeCommit(base_branch) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 2098 | |
ukai@chromium.org | 259e468 | 2012-10-25 07:36:33 +0000 | [diff] [blame] | 2099 | if is_dirty_git_tree(cmd): |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 2100 | return 1 |
| 2101 | |
| 2102 | # This rev-list syntax means "show all commits not in my branch that |
| 2103 | # are in base_branch". |
| 2104 | upstream_commits = RunGit(['rev-list', '^' + cl.GetBranchRef(), |
| 2105 | base_branch]).splitlines() |
| 2106 | if upstream_commits: |
| 2107 | print ('Base branch "%s" has %d commits ' |
| 2108 | 'not in this branch.' % (base_branch, len(upstream_commits))) |
| 2109 | print 'Run "git merge %s" before attempting to %s.' % (base_branch, cmd) |
| 2110 | return 1 |
| 2111 | |
szager@chromium.org | 9bb85e2 | 2012-06-13 20:28:23 +0000 | [diff] [blame] | 2112 | # This is the revision `svn dcommit` will commit on top of. |
vadimsh@chromium.org | 566a02a | 2014-08-22 01:34:13 +0000 | [diff] [blame] | 2113 | svn_head = None |
| 2114 | if cmd == 'dcommit' or base_has_submodules: |
| 2115 | svn_head = RunGit(['log', '--grep=^git-svn-id:', '-1', |
| 2116 | '--pretty=format:%H']) |
szager@chromium.org | 9bb85e2 | 2012-06-13 20:28:23 +0000 | [diff] [blame] | 2117 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 2118 | if cmd == 'dcommit': |
szager@chromium.org | 9bb85e2 | 2012-06-13 20:28:23 +0000 | [diff] [blame] | 2119 | # If the base_head is a submodule merge commit, the first parent of the |
| 2120 | # base_head should be a git-svn commit, which is what we're interested in. |
| 2121 | base_svn_head = base_branch |
| 2122 | if base_has_submodules: |
| 2123 | base_svn_head += '^1' |
| 2124 | |
| 2125 | extra_commits = RunGit(['rev-list', '^' + svn_head, base_svn_head]) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 2126 | if extra_commits: |
| 2127 | print ('This branch has %d additional commits not upstreamed yet.' |
| 2128 | % len(extra_commits.splitlines())) |
| 2129 | print ('Upstream "%s" or rebase this branch on top of the upstream trunk ' |
| 2130 | 'before attempting to %s.' % (base_branch, cmd)) |
| 2131 | return 1 |
| 2132 | |
iannucci@chromium.org | e6896b5 | 2014-08-29 01:38:03 +0000 | [diff] [blame] | 2133 | merge_base = RunGit(['merge-base', base_branch, 'HEAD']).strip() |
maruel@chromium.org | b0a6391 | 2012-01-17 18:10:16 +0000 | [diff] [blame] | 2134 | if not options.bypass_hooks: |
maruel@chromium.org | 13f623c | 2011-07-22 16:02:23 +0000 | [diff] [blame] | 2135 | author = None |
| 2136 | if options.contributor: |
| 2137 | author = re.search(r'\<(.*)\>', options.contributor).group(1) |
maruel@chromium.org | b0a6391 | 2012-01-17 18:10:16 +0000 | [diff] [blame] | 2138 | hook_results = cl.RunHook( |
| 2139 | committing=True, |
maruel@chromium.org | b0a6391 | 2012-01-17 18:10:16 +0000 | [diff] [blame] | 2140 | may_prompt=not options.force, |
| 2141 | verbose=options.verbose, |
iannucci@chromium.org | e6896b5 | 2014-08-29 01:38:03 +0000 | [diff] [blame] | 2142 | change=cl.GetChange(merge_base, author)) |
maruel@chromium.org | b0a6391 | 2012-01-17 18:10:16 +0000 | [diff] [blame] | 2143 | if not hook_results.should_continue(): |
| 2144 | return 1 |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 2145 | |
vadimsh@chromium.org | 566a02a | 2014-08-22 01:34:13 +0000 | [diff] [blame] | 2146 | # Check the tree status if the tree status URL is set. |
| 2147 | status = GetTreeStatus() |
| 2148 | if 'closed' == status: |
| 2149 | print('The tree is closed. Please wait for it to reopen. Use ' |
| 2150 | '"git cl %s --bypass-hooks" to commit on a closed tree.' % cmd) |
| 2151 | return 1 |
| 2152 | elif 'unknown' == status: |
| 2153 | print('Unable to determine tree status. Please verify manually and ' |
| 2154 | 'use "git cl %s --bypass-hooks" to commit on a closed tree.' % cmd) |
| 2155 | return 1 |
maruel@chromium.org | ac63715 | 2012-01-16 14:19:54 +0000 | [diff] [blame] | 2156 | else: |
| 2157 | breakpad.SendStack( |
| 2158 | 'GitClHooksBypassedCommit', |
jochen@chromium.org | 3ec0d54 | 2014-01-14 20:00:03 +0000 | [diff] [blame] | 2159 | 'Issue %s/%s bypassed hook when committing (tree status was "%s")' % |
| 2160 | (cl.GetRietveldServer(), cl.GetIssue(), GetTreeStatus()), |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 2161 | verbose=False) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 2162 | |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 2163 | change_desc = ChangeDescription(options.message) |
| 2164 | if not change_desc.description and cl.GetIssue(): |
| 2165 | change_desc = ChangeDescription(cl.GetDescription()) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 2166 | |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 2167 | if not change_desc.description: |
erg@chromium.org | 1a17398 | 2012-08-29 20:43:05 +0000 | [diff] [blame] | 2168 | if not cl.GetIssue() and options.bypass_hooks: |
iannucci@chromium.org | e6896b5 | 2014-08-29 01:38:03 +0000 | [diff] [blame] | 2169 | change_desc = ChangeDescription(CreateDescriptionFromLog([merge_base])) |
erg@chromium.org | 1a17398 | 2012-08-29 20:43:05 +0000 | [diff] [blame] | 2170 | else: |
| 2171 | print 'No description set.' |
| 2172 | print 'Visit %s/edit to set it.' % (cl.GetIssueURL()) |
| 2173 | return 1 |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 2174 | |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 2175 | # Keep a separate copy for the commit message, because the commit message |
| 2176 | # contains the link to the Rietveld issue, while the Rietveld message contains |
| 2177 | # the commit viewvc url. |
maruel@chromium.org | e52678e | 2013-04-26 18:34:44 +0000 | [diff] [blame] | 2178 | # Keep a separate copy for the commit message. |
| 2179 | if cl.GetIssue(): |
maruel@chromium.org | cf08778 | 2013-07-23 13:08:48 +0000 | [diff] [blame] | 2180 | change_desc.update_reviewers(cl.GetApprovingReviewers()) |
maruel@chromium.org | e52678e | 2013-04-26 18:34:44 +0000 | [diff] [blame] | 2181 | |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 2182 | commit_desc = ChangeDescription(change_desc.description) |
maruel@chromium.org | cc73ad6 | 2011-07-06 17:39:26 +0000 | [diff] [blame] | 2183 | if cl.GetIssue(): |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 2184 | commit_desc.append_footer('Review URL: %s' % cl.GetIssueURL()) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 2185 | if options.contributor: |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 2186 | commit_desc.append_footer('Patch from %s.' % options.contributor) |
| 2187 | |
agable@chromium.org | eec3ea3 | 2013-08-15 20:31:39 +0000 | [diff] [blame] | 2188 | print('Description:') |
| 2189 | print(commit_desc.description) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 2190 | |
iannucci@chromium.org | e6896b5 | 2014-08-29 01:38:03 +0000 | [diff] [blame] | 2191 | branches = [merge_base, cl.GetBranchRef()] |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 2192 | if not options.force: |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 2193 | print_stats(options.similarity, options.find_copies, branches) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 2194 | |
szager@chromium.org | 9bb85e2 | 2012-06-13 20:28:23 +0000 | [diff] [blame] | 2195 | # We want to squash all this branch's commits into one commit with the proper |
| 2196 | # description. We do this by doing a "reset --soft" to the base branch (which |
| 2197 | # keeps the working copy the same), then dcommitting that. If origin/master |
| 2198 | # has a submodule merge commit, we'll also need to cherry-pick the squashed |
| 2199 | # commit onto a branch based on the git-svn head. |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 2200 | MERGE_BRANCH = 'git-cl-commit' |
szager@chromium.org | 9bb85e2 | 2012-06-13 20:28:23 +0000 | [diff] [blame] | 2201 | CHERRY_PICK_BRANCH = 'git-cl-cherry-pick' |
| 2202 | # Delete the branches if they exist. |
| 2203 | for branch in [MERGE_BRANCH, CHERRY_PICK_BRANCH]: |
| 2204 | showref_cmd = ['show-ref', '--quiet', '--verify', 'refs/heads/%s' % branch] |
| 2205 | result = RunGitWithCode(showref_cmd) |
| 2206 | if result[0] == 0: |
| 2207 | RunGit(['branch', '-D', branch]) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 2208 | |
| 2209 | # We might be in a directory that's present in this branch but not in the |
| 2210 | # trunk. Move up to the top of the tree so that git commands that expect a |
| 2211 | # 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] | 2212 | rel_base_path = settings.GetRelativeRoot() |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 2213 | if rel_base_path: |
| 2214 | os.chdir(rel_base_path) |
| 2215 | |
| 2216 | # Stuff our change into the merge branch. |
| 2217 | # We wrap in a try...finally block so if anything goes wrong, |
| 2218 | # we clean up the branches. |
maruel@chromium.org | 0ba7f96 | 2011-01-11 22:13:58 +0000 | [diff] [blame] | 2219 | retcode = -1 |
iannucci@chromium.org | e6896b5 | 2014-08-29 01:38:03 +0000 | [diff] [blame] | 2220 | pushed_to_pending = False |
vadimsh@chromium.org | 566a02a | 2014-08-22 01:34:13 +0000 | [diff] [blame] | 2221 | pending_ref = None |
iannucci@chromium.org | e6896b5 | 2014-08-29 01:38:03 +0000 | [diff] [blame] | 2222 | revision = None |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 2223 | try: |
bauerb@chromium.org | b4a75c4 | 2011-03-08 08:35:38 +0000 | [diff] [blame] | 2224 | RunGit(['checkout', '-q', '-b', MERGE_BRANCH]) |
iannucci@chromium.org | e6896b5 | 2014-08-29 01:38:03 +0000 | [diff] [blame] | 2225 | RunGit(['reset', '--soft', merge_base]) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 2226 | if options.contributor: |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 2227 | RunGit( |
| 2228 | [ |
| 2229 | 'commit', '--author', options.contributor, |
| 2230 | '-m', commit_desc.description, |
| 2231 | ]) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 2232 | else: |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 2233 | RunGit(['commit', '-m', commit_desc.description]) |
szager@chromium.org | 9bb85e2 | 2012-06-13 20:28:23 +0000 | [diff] [blame] | 2234 | if base_has_submodules: |
| 2235 | cherry_pick_commit = RunGit(['rev-list', 'HEAD^!']).rstrip() |
| 2236 | RunGit(['branch', CHERRY_PICK_BRANCH, svn_head]) |
| 2237 | RunGit(['checkout', CHERRY_PICK_BRANCH]) |
| 2238 | RunGit(['cherry-pick', cherry_pick_commit]) |
vadimsh@chromium.org | 566a02a | 2014-08-22 01:34:13 +0000 | [diff] [blame] | 2239 | if cmd == 'land': |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 2240 | remote, branch = cl.FetchUpstreamTuple(cl.GetBranch()) |
vadimsh@chromium.org | 566a02a | 2014-08-22 01:34:13 +0000 | [diff] [blame] | 2241 | pending_prefix = settings.GetPendingRefPrefix() |
| 2242 | if not pending_prefix or branch.startswith(pending_prefix): |
| 2243 | # If not using refs/pending/heads/* at all, or target ref is already set |
| 2244 | # to pending, then push to the target ref directly. |
| 2245 | retcode, output = RunGitWithCode( |
| 2246 | ['push', '--porcelain', remote, 'HEAD:%s' % branch]) |
iannucci@chromium.org | e6896b5 | 2014-08-29 01:38:03 +0000 | [diff] [blame] | 2247 | pushed_to_pending = pending_prefix and branch.startswith(pending_prefix) |
vadimsh@chromium.org | 566a02a | 2014-08-22 01:34:13 +0000 | [diff] [blame] | 2248 | else: |
| 2249 | # Cherry-pick the change on top of pending ref and then push it. |
| 2250 | assert branch.startswith('refs/'), branch |
| 2251 | assert pending_prefix[-1] == '/', pending_prefix |
| 2252 | pending_ref = pending_prefix + branch[len('refs/'):] |
| 2253 | retcode, output = PushToGitPending(remote, pending_ref, branch) |
iannucci@chromium.org | e6896b5 | 2014-08-29 01:38:03 +0000 | [diff] [blame] | 2254 | pushed_to_pending = (retcode == 0) |
iannucci@chromium.org | 34504a1 | 2014-08-29 23:51:37 +0000 | [diff] [blame] | 2255 | if retcode == 0: |
| 2256 | revision = RunGit(['rev-parse', 'HEAD']).strip() |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 2257 | else: |
| 2258 | # dcommit the merge branch. |
iannucci@chromium.org | a1950c4 | 2014-12-05 22:15:56 +0000 | [diff] [blame] | 2259 | cmd_args = [ |
kjellander@chromium.org | 6abc652 | 2014-12-02 07:34:49 +0000 | [diff] [blame] | 2260 | 'svn', 'dcommit', |
| 2261 | '-C%s' % options.similarity, |
| 2262 | '--no-rebase', '--rmdir', |
| 2263 | ] |
| 2264 | if settings.GetForceHttpsCommitUrl(): |
| 2265 | # Allow forcing https commit URLs for some projects that don't allow |
| 2266 | # committing to http URLs (like Google Code). |
| 2267 | remote_url = cl.GetGitSvnRemoteUrl() |
| 2268 | if urlparse.urlparse(remote_url).scheme == 'http': |
| 2269 | remote_url = remote_url.replace('http://', 'https://') |
iannucci@chromium.org | a1950c4 | 2014-12-05 22:15:56 +0000 | [diff] [blame] | 2270 | cmd_args.append('--commit-url=%s' % remote_url) |
| 2271 | _, output = RunGitWithCode(cmd_args) |
iannucci@chromium.org | 34504a1 | 2014-08-29 23:51:37 +0000 | [diff] [blame] | 2272 | if 'Committed r' in output: |
| 2273 | revision = re.match( |
| 2274 | '.*?\nCommitted r(\\d+)', output, re.DOTALL).group(1) |
| 2275 | logging.debug(output) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 2276 | finally: |
| 2277 | # And then swap back to the original branch and clean up. |
| 2278 | RunGit(['checkout', '-q', cl.GetBranch()]) |
| 2279 | RunGit(['branch', '-D', MERGE_BRANCH]) |
szager@chromium.org | 9bb85e2 | 2012-06-13 20:28:23 +0000 | [diff] [blame] | 2280 | if base_has_submodules: |
| 2281 | RunGit(['branch', '-D', CHERRY_PICK_BRANCH]) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 2282 | |
iannucci@chromium.org | 34504a1 | 2014-08-29 23:51:37 +0000 | [diff] [blame] | 2283 | if not revision: |
iannucci@chromium.org | 6c217b1 | 2014-08-29 22:10:59 +0000 | [diff] [blame] | 2284 | print 'Failed to push. If this persists, please file a bug.' |
iannucci@chromium.org | 34504a1 | 2014-08-29 23:51:37 +0000 | [diff] [blame] | 2285 | return 1 |
iannucci@chromium.org | 6c217b1 | 2014-08-29 22:10:59 +0000 | [diff] [blame] | 2286 | |
iannucci@chromium.org | bbe9cc5 | 2014-09-05 18:25:51 +0000 | [diff] [blame] | 2287 | killed = False |
iannucci@chromium.org | 6c217b1 | 2014-08-29 22:10:59 +0000 | [diff] [blame] | 2288 | if pushed_to_pending: |
iannucci@chromium.org | e6896b5 | 2014-08-29 01:38:03 +0000 | [diff] [blame] | 2289 | try: |
| 2290 | revision = WaitForRealCommit(remote, revision, base_branch, branch) |
| 2291 | # We set pushed_to_pending to False, since it made it all the way to the |
| 2292 | # real ref. |
| 2293 | pushed_to_pending = False |
| 2294 | except KeyboardInterrupt: |
iannucci@chromium.org | bbe9cc5 | 2014-09-05 18:25:51 +0000 | [diff] [blame] | 2295 | killed = True |
iannucci@chromium.org | e6896b5 | 2014-08-29 01:38:03 +0000 | [diff] [blame] | 2296 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 2297 | if cl.GetIssue(): |
iannucci@chromium.org | e6896b5 | 2014-08-29 01:38:03 +0000 | [diff] [blame] | 2298 | to_pending = ' to pending queue' if pushed_to_pending else '' |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 2299 | viewvc_url = settings.GetViewVCUrl() |
iannucci@chromium.org | e6896b5 | 2014-08-29 01:38:03 +0000 | [diff] [blame] | 2300 | if not to_pending: |
| 2301 | if viewvc_url and revision: |
| 2302 | change_desc.append_footer( |
| 2303 | 'Committed: %s%s' % (viewvc_url, revision)) |
| 2304 | elif revision: |
| 2305 | change_desc.append_footer('Committed: %s' % (revision,)) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 2306 | print ('Closing issue ' |
| 2307 | '(you may be prompted for your codereview password)...') |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 2308 | cl.UpdateDescription(change_desc.description) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 2309 | cl.CloseIssue() |
maruel@chromium.org | 1033efd | 2013-07-23 23:25:09 +0000 | [diff] [blame] | 2310 | props = cl.GetIssueProperties() |
sadrul@chromium.org | 34b5d82 | 2013-02-18 01:39:24 +0000 | [diff] [blame] | 2311 | patch_num = len(props['patchsets']) |
rmistry@google.com | 52d224a | 2014-08-27 14:44:41 +0000 | [diff] [blame] | 2312 | comment = "Committed patchset #%d (id:%d)%s manually as %s" % ( |
mark@chromium.org | 782570c | 2014-09-26 21:48:02 +0000 | [diff] [blame] | 2313 | patch_num, props['patchsets'][-1], to_pending, revision) |
jochen@chromium.org | 3ec0d54 | 2014-01-14 20:00:03 +0000 | [diff] [blame] | 2314 | if options.bypass_hooks: |
| 2315 | comment += ' (tree was closed).' if GetTreeStatus() == 'closed' else '.' |
| 2316 | else: |
| 2317 | comment += ' (presubmit successful).' |
iannucci@chromium.org | b85a316 | 2013-01-26 01:11:13 +0000 | [diff] [blame] | 2318 | cl.RpcServer().add_comment(cl.GetIssue(), comment) |
maruel@chromium.org | 1033efd | 2013-07-23 23:25:09 +0000 | [diff] [blame] | 2319 | cl.SetIssue(None) |
maruel@chromium.org | 0ba7f96 | 2011-01-11 22:13:58 +0000 | [diff] [blame] | 2320 | |
iannucci@chromium.org | 6c217b1 | 2014-08-29 22:10:59 +0000 | [diff] [blame] | 2321 | if pushed_to_pending: |
vadimsh@chromium.org | 566a02a | 2014-08-22 01:34:13 +0000 | [diff] [blame] | 2322 | _, branch = cl.FetchUpstreamTuple(cl.GetBranch()) |
| 2323 | print 'The commit is in the pending queue (%s).' % pending_ref |
| 2324 | print ( |
thakis@chromium.org | 5f32a96 | 2014-09-05 21:33:23 +0000 | [diff] [blame] | 2325 | 'It will show up on %s in ~1 min, once it gets a Cr-Commit-Position ' |
vadimsh@chromium.org | 566a02a | 2014-08-22 01:34:13 +0000 | [diff] [blame] | 2326 | 'footer.' % branch) |
| 2327 | |
iannucci@chromium.org | 6c217b1 | 2014-08-29 22:10:59 +0000 | [diff] [blame] | 2328 | hook = POSTUPSTREAM_HOOK_PATTERN % cmd |
| 2329 | if os.path.isfile(hook): |
| 2330 | RunCommand([hook, merge_base], error_ok=True) |
maruel@chromium.org | 0ba7f96 | 2011-01-11 22:13:58 +0000 | [diff] [blame] | 2331 | |
iannucci@chromium.org | bbe9cc5 | 2014-09-05 18:25:51 +0000 | [diff] [blame] | 2332 | return 1 if killed else 0 |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 2333 | |
| 2334 | |
iannucci@chromium.org | e6896b5 | 2014-08-29 01:38:03 +0000 | [diff] [blame] | 2335 | def WaitForRealCommit(remote, pushed_commit, local_base_ref, real_ref): |
| 2336 | print |
| 2337 | print 'Waiting for commit to be landed on %s...' % real_ref |
| 2338 | print '(If you are impatient, you may Ctrl-C once without harm)' |
| 2339 | target_tree = RunGit(['rev-parse', '%s:' % pushed_commit]).strip() |
| 2340 | current_rev = RunGit(['rev-parse', local_base_ref]).strip() |
| 2341 | |
| 2342 | loop = 0 |
| 2343 | while True: |
| 2344 | sys.stdout.write('fetching (%d)... \r' % loop) |
| 2345 | sys.stdout.flush() |
| 2346 | loop += 1 |
| 2347 | |
| 2348 | RunGit(['retry', 'fetch', remote, real_ref], stderr=subprocess2.VOID) |
| 2349 | to_rev = RunGit(['rev-parse', 'FETCH_HEAD']).strip() |
| 2350 | commits = RunGit(['rev-list', '%s..%s' % (current_rev, to_rev)]) |
| 2351 | for commit in commits.splitlines(): |
| 2352 | if RunGit(['rev-parse', '%s:' % commit]).strip() == target_tree: |
| 2353 | print 'Found commit on %s' % real_ref |
| 2354 | return commit |
| 2355 | |
| 2356 | current_rev = to_rev |
| 2357 | |
| 2358 | |
vadimsh@chromium.org | 566a02a | 2014-08-22 01:34:13 +0000 | [diff] [blame] | 2359 | def PushToGitPending(remote, pending_ref, upstream_ref): |
| 2360 | """Fetches pending_ref, cherry-picks current HEAD on top of it, pushes. |
| 2361 | |
| 2362 | Returns: |
| 2363 | (retcode of last operation, output log of last operation). |
| 2364 | """ |
| 2365 | assert pending_ref.startswith('refs/'), pending_ref |
| 2366 | local_pending_ref = 'refs/git-cl/' + pending_ref[len('refs/'):] |
| 2367 | cherry = RunGit(['rev-parse', 'HEAD']).strip() |
| 2368 | code = 0 |
| 2369 | out = '' |
vadimsh@chromium.org | 749fbd9 | 2014-08-26 21:57:53 +0000 | [diff] [blame] | 2370 | max_attempts = 3 |
| 2371 | attempts_left = max_attempts |
| 2372 | while attempts_left: |
| 2373 | if attempts_left != max_attempts: |
| 2374 | print 'Retrying, %d attempts left...' % (attempts_left - 1,) |
| 2375 | attempts_left -= 1 |
vadimsh@chromium.org | 566a02a | 2014-08-22 01:34:13 +0000 | [diff] [blame] | 2376 | |
| 2377 | # Fetch. Retry fetch errors. |
vadimsh@chromium.org | 749fbd9 | 2014-08-26 21:57:53 +0000 | [diff] [blame] | 2378 | print 'Fetching pending ref %s...' % pending_ref |
vadimsh@chromium.org | 566a02a | 2014-08-22 01:34:13 +0000 | [diff] [blame] | 2379 | code, out = RunGitWithCode( |
vadimsh@chromium.org | 749fbd9 | 2014-08-26 21:57:53 +0000 | [diff] [blame] | 2380 | ['retry', 'fetch', remote, '+%s:%s' % (pending_ref, local_pending_ref)]) |
vadimsh@chromium.org | 566a02a | 2014-08-22 01:34:13 +0000 | [diff] [blame] | 2381 | if code: |
vadimsh@chromium.org | 749fbd9 | 2014-08-26 21:57:53 +0000 | [diff] [blame] | 2382 | print 'Fetch failed with exit code %d.' % code |
| 2383 | if out.strip(): |
| 2384 | print out.strip() |
vadimsh@chromium.org | 566a02a | 2014-08-22 01:34:13 +0000 | [diff] [blame] | 2385 | continue |
| 2386 | |
| 2387 | # Try to cherry pick. Abort on merge conflicts. |
vadimsh@chromium.org | 749fbd9 | 2014-08-26 21:57:53 +0000 | [diff] [blame] | 2388 | print 'Cherry-picking commit on top of pending ref...' |
vadimsh@chromium.org | 566a02a | 2014-08-22 01:34:13 +0000 | [diff] [blame] | 2389 | RunGitWithCode(['checkout', local_pending_ref], suppress_stderr=True) |
vadimsh@chromium.org | 749fbd9 | 2014-08-26 21:57:53 +0000 | [diff] [blame] | 2390 | code, out = RunGitWithCode(['cherry-pick', cherry]) |
vadimsh@chromium.org | 566a02a | 2014-08-22 01:34:13 +0000 | [diff] [blame] | 2391 | if code: |
| 2392 | print ( |
vadimsh@chromium.org | 749fbd9 | 2014-08-26 21:57:53 +0000 | [diff] [blame] | 2393 | 'Your patch doesn\'t apply cleanly to ref \'%s\', ' |
| 2394 | 'the following files have merge conflicts:' % pending_ref) |
vadimsh@chromium.org | 566a02a | 2014-08-22 01:34:13 +0000 | [diff] [blame] | 2395 | print RunGit(['diff', '--name-status', '--diff-filter=U']).strip() |
| 2396 | print 'Please rebase your patch and try again.' |
vadimsh@chromium.org | 749fbd9 | 2014-08-26 21:57:53 +0000 | [diff] [blame] | 2397 | RunGitWithCode(['cherry-pick', '--abort']) |
vadimsh@chromium.org | 566a02a | 2014-08-22 01:34:13 +0000 | [diff] [blame] | 2398 | return code, out |
| 2399 | |
| 2400 | # Applied cleanly, try to push now. Retry on error (flake or non-ff push). |
vadimsh@chromium.org | 749fbd9 | 2014-08-26 21:57:53 +0000 | [diff] [blame] | 2401 | 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] | 2402 | code, out = RunGitWithCode( |
| 2403 | ['retry', 'push', '--porcelain', remote, 'HEAD:%s' % pending_ref]) |
| 2404 | if code == 0: |
| 2405 | # Success. |
iannucci@chromium.org | e6896b5 | 2014-08-29 01:38:03 +0000 | [diff] [blame] | 2406 | print 'Commit pushed to pending ref successfully!' |
vadimsh@chromium.org | 566a02a | 2014-08-22 01:34:13 +0000 | [diff] [blame] | 2407 | return code, out |
| 2408 | |
vadimsh@chromium.org | 749fbd9 | 2014-08-26 21:57:53 +0000 | [diff] [blame] | 2409 | print 'Push failed with exit code %d.' % code |
| 2410 | if out.strip(): |
| 2411 | print out.strip() |
| 2412 | if IsFatalPushFailure(out): |
| 2413 | print ( |
| 2414 | 'Fatal push error. Make sure your .netrc credentials and git ' |
| 2415 | 'user.email are correct and you have push access to the repo.') |
| 2416 | return code, out |
| 2417 | |
| 2418 | print 'All attempts to push to pending ref failed.' |
vadimsh@chromium.org | 566a02a | 2014-08-22 01:34:13 +0000 | [diff] [blame] | 2419 | return code, out |
| 2420 | |
| 2421 | |
vadimsh@chromium.org | 749fbd9 | 2014-08-26 21:57:53 +0000 | [diff] [blame] | 2422 | def IsFatalPushFailure(push_stdout): |
| 2423 | """True if retrying push won't help.""" |
| 2424 | return '(prohibited by Gerrit)' in push_stdout |
| 2425 | |
| 2426 | |
maruel@chromium.org | 0633fb4 | 2013-08-16 20:06:14 +0000 | [diff] [blame] | 2427 | @subcommand.usage('[upstream branch to apply against]') |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 2428 | def CMDdcommit(parser, args): |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 2429 | """Commits the current changelist via git-svn.""" |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 2430 | if not settings.GetIsGitSvn(): |
thakis@chromium.org | cde3bb6 | 2011-01-20 01:16:14 +0000 | [diff] [blame] | 2431 | message = """This doesn't appear to be an SVN repository. |
| 2432 | If your project has a git mirror with an upstream SVN master, you probably need |
| 2433 | to run 'git svn init', see your project's git mirror documentation. |
| 2434 | If your project has a true writeable upstream repository, you probably want |
mark@chromium.org | 671c7a3 | 2014-07-31 17:09:36 +0000 | [diff] [blame] | 2435 | to run 'git cl land' instead. |
thakis@chromium.org | cde3bb6 | 2011-01-20 01:16:14 +0000 | [diff] [blame] | 2436 | Choose wisely, if you get this wrong, your commit might appear to succeed but |
| 2437 | will instead be silently ignored.""" |
| 2438 | print(message) |
maruel@chromium.org | 9054173 | 2011-04-01 17:54:18 +0000 | [diff] [blame] | 2439 | ask_for_data('[Press enter to dcommit or ctrl-C to quit]') |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 2440 | return SendUpstream(parser, args, 'dcommit') |
| 2441 | |
| 2442 | |
maruel@chromium.org | 0633fb4 | 2013-08-16 20:06:14 +0000 | [diff] [blame] | 2443 | @subcommand.usage('[upstream branch to apply against]') |
pgervais@chromium.org | cee6dc4 | 2014-05-07 17:04:03 +0000 | [diff] [blame] | 2444 | def CMDland(parser, args): |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 2445 | """Commits the current changelist via git.""" |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 2446 | if settings.GetIsGitSvn(): |
| 2447 | print('This appears to be an SVN repository.') |
| 2448 | print('Are you sure you didn\'t mean \'git cl dcommit\'?') |
maruel@chromium.org | 9054173 | 2011-04-01 17:54:18 +0000 | [diff] [blame] | 2449 | 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] | 2450 | return SendUpstream(parser, args, 'land') |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 2451 | |
| 2452 | |
maruel@chromium.org | 0633fb4 | 2013-08-16 20:06:14 +0000 | [diff] [blame] | 2453 | @subcommand.usage('<patch url or issue id>') |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 2454 | def CMDpatch(parser, args): |
marq@chromium.org | e5e5900 | 2013-10-02 23:21:25 +0000 | [diff] [blame] | 2455 | """Patches in a code review.""" |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 2456 | parser.add_option('-b', dest='newbranch', |
| 2457 | help='create a new branch off trunk for the patch') |
qsr@chromium.org | 1ef44af | 2013-10-16 16:24:32 +0000 | [diff] [blame] | 2458 | parser.add_option('-f', '--force', action='store_true', |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 2459 | help='with -b, clobber any existing branch') |
qsr@chromium.org | 1ef44af | 2013-10-16 16:24:32 +0000 | [diff] [blame] | 2460 | parser.add_option('-d', '--directory', action='store', metavar='DIR', |
| 2461 | help='Change to the directory DIR immediately, ' |
| 2462 | 'before doing anything else.') |
| 2463 | parser.add_option('--reject', action='store_true', |
tapted@chromium.org | 6a0b07c | 2013-07-10 01:29:19 +0000 | [diff] [blame] | 2464 | help='failed patches spew .rej files rather than ' |
| 2465 | 'attempting a 3-way merge') |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 2466 | parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit', |
| 2467 | help="don't commit after patch applies") |
| 2468 | (options, args) = parser.parse_args(args) |
| 2469 | if len(args) != 1: |
| 2470 | parser.print_help() |
| 2471 | return 1 |
dpranke@chromium.org | 97ae58e | 2011-03-18 00:29:20 +0000 | [diff] [blame] | 2472 | issue_arg = args[0] |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 2473 | |
maruel@chromium.org | 27bb387 | 2011-05-30 20:33:19 +0000 | [diff] [blame] | 2474 | # TODO(maruel): Use apply_issue.py |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 2475 | # TODO(ukai): use gerrit-cherry-pick for gerrit repository? |
maruel@chromium.org | 27bb387 | 2011-05-30 20:33:19 +0000 | [diff] [blame] | 2476 | |
sbc@chromium.org | 87b9bf0 | 2013-09-26 20:35:15 +0000 | [diff] [blame] | 2477 | if options.newbranch: |
| 2478 | if options.force: |
| 2479 | RunGit(['branch', '-D', options.newbranch], |
| 2480 | stderr=subprocess2.PIPE, error_ok=True) |
| 2481 | RunGit(['checkout', '-b', options.newbranch, |
| 2482 | Changelist().GetUpstreamBranch()]) |
| 2483 | |
qsr@chromium.org | 1ef44af | 2013-10-16 16:24:32 +0000 | [diff] [blame] | 2484 | return PatchIssue(issue_arg, options.reject, options.nocommit, |
| 2485 | options.directory) |
sbc@chromium.org | 87b9bf0 | 2013-09-26 20:35:15 +0000 | [diff] [blame] | 2486 | |
| 2487 | |
qsr@chromium.org | 1ef44af | 2013-10-16 16:24:32 +0000 | [diff] [blame] | 2488 | def PatchIssue(issue_arg, reject, nocommit, directory): |
sbc@chromium.org | 87b9bf0 | 2013-09-26 20:35:15 +0000 | [diff] [blame] | 2489 | if type(issue_arg) is int or issue_arg.isdigit(): |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 2490 | # Input is an issue id. Figure out the URL. |
maruel@chromium.org | 5242430 | 2012-08-29 15:14:30 +0000 | [diff] [blame] | 2491 | issue = int(issue_arg) |
jochen@chromium.org | a26e047 | 2013-07-24 10:25:01 +0000 | [diff] [blame] | 2492 | cl = Changelist(issue=issue) |
maruel@chromium.org | 1033efd | 2013-07-23 23:25:09 +0000 | [diff] [blame] | 2493 | patchset = cl.GetMostRecentPatchset() |
binji@chromium.org | 0281f52 | 2012-09-14 13:37:59 +0000 | [diff] [blame] | 2494 | patch_data = cl.GetPatchSetDiff(issue, patchset) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 2495 | else: |
maruel@chromium.org | eb5edbc | 2012-01-16 17:03:28 +0000 | [diff] [blame] | 2496 | # Assume it's a URL to the patch. Default to https. |
| 2497 | issue_url = gclient_utils.UpgradeToHttps(issue_arg) |
binji@chromium.org | 0281f52 | 2012-09-14 13:37:59 +0000 | [diff] [blame] | 2498 | match = re.match(r'.*?/issue(\d+)_(\d+).diff', issue_url) |
maruel@chromium.org | e77ebbf | 2011-03-29 20:35:38 +0000 | [diff] [blame] | 2499 | if not match: |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 2500 | DieWithError('Must pass an issue ID or full URL for ' |
| 2501 | '\'Download raw patch set\'') |
maruel@chromium.org | 5242430 | 2012-08-29 15:14:30 +0000 | [diff] [blame] | 2502 | issue = int(match.group(1)) |
binji@chromium.org | 0281f52 | 2012-09-14 13:37:59 +0000 | [diff] [blame] | 2503 | patchset = int(match.group(2)) |
maruel@chromium.org | e77ebbf | 2011-03-29 20:35:38 +0000 | [diff] [blame] | 2504 | patch_data = urllib2.urlopen(issue_arg).read() |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 2505 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 2506 | # Switch up to the top-level directory, if necessary, in preparation for |
| 2507 | # applying the patch. |
thestig@chromium.org | 8b0553c | 2014-02-11 00:33:37 +0000 | [diff] [blame] | 2508 | top = settings.GetRelativeRoot() |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 2509 | if top: |
| 2510 | os.chdir(top) |
| 2511 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 2512 | # Git patches have a/ at the beginning of source paths. We strip that out |
| 2513 | # with a sed script rather than the -p flag to patch so we can feed either |
| 2514 | # Git or svn-style patches into the same apply command. |
| 2515 | # re.sub() should be used but flags=re.MULTILINE is only in python 2.7. |
maruel@chromium.org | 32f9f5e | 2011-09-14 13:41:47 +0000 | [diff] [blame] | 2516 | try: |
| 2517 | patch_data = subprocess2.check_output( |
| 2518 | ['sed', '-e', 's|^--- a/|--- |; s|^+++ b/|+++ |'], stdin=patch_data) |
| 2519 | except subprocess2.CalledProcessError: |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 2520 | DieWithError('Git patch mungling failed.') |
| 2521 | logging.info(patch_data) |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 2522 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 2523 | # We use "git apply" to apply the patch instead of "patch" so that we can |
| 2524 | # pick up file adds. |
| 2525 | # The --index flag means: also insert into the index (so we catch adds). |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 2526 | cmd = ['git', 'apply', '--index', '-p0'] |
qsr@chromium.org | 1ef44af | 2013-10-16 16:24:32 +0000 | [diff] [blame] | 2527 | if directory: |
| 2528 | cmd.extend(('--directory', directory)) |
sbc@chromium.org | 87b9bf0 | 2013-09-26 20:35:15 +0000 | [diff] [blame] | 2529 | if reject: |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 2530 | cmd.append('--reject') |
tapted@chromium.org | 6a0b07c | 2013-07-10 01:29:19 +0000 | [diff] [blame] | 2531 | elif IsGitVersionAtLeast('1.7.12'): |
| 2532 | cmd.append('--3way') |
maruel@chromium.org | 32f9f5e | 2011-09-14 13:41:47 +0000 | [diff] [blame] | 2533 | try: |
thestig@chromium.org | 8b0553c | 2014-02-11 00:33:37 +0000 | [diff] [blame] | 2534 | subprocess2.check_call(cmd, env=GetNoGitPagerEnv(), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 2535 | stdin=patch_data, stdout=subprocess2.VOID) |
maruel@chromium.org | 32f9f5e | 2011-09-14 13:41:47 +0000 | [diff] [blame] | 2536 | except subprocess2.CalledProcessError: |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 2537 | DieWithError('Failed to apply the patch') |
| 2538 | |
| 2539 | # If we had an issue, commit the current state and register the issue. |
sbc@chromium.org | 87b9bf0 | 2013-09-26 20:35:15 +0000 | [diff] [blame] | 2540 | if not nocommit: |
carlosk@chromium.org | 71284d9 | 2014-11-14 18:12:50 +0000 | [diff] [blame] | 2541 | RunGit(['commit', '-m', ('patch from issue %(i)s at patchset ' |
| 2542 | '%(p)s (http://crrev.com/%(i)s#ps%(p)s)' |
| 2543 | % {'i': issue, 'p': patchset})]) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 2544 | cl = Changelist() |
| 2545 | cl.SetIssue(issue) |
binji@chromium.org | 0281f52 | 2012-09-14 13:37:59 +0000 | [diff] [blame] | 2546 | cl.SetPatchset(patchset) |
pdr@chromium.org | 98ca662 | 2013-04-09 20:58:40 +0000 | [diff] [blame] | 2547 | print "Committed patch locally." |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 2548 | else: |
| 2549 | print "Patch applied to index." |
| 2550 | return 0 |
| 2551 | |
| 2552 | |
| 2553 | def CMDrebase(parser, args): |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 2554 | """Rebases current branch on top of svn repo.""" |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 2555 | # Provide a wrapper for git svn rebase to help avoid accidental |
| 2556 | # git svn dcommit. |
| 2557 | # It's the only command that doesn't use parser at all since we just defer |
| 2558 | # execution to git-svn. |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 2559 | |
thestig@chromium.org | 8b0553c | 2014-02-11 00:33:37 +0000 | [diff] [blame] | 2560 | return RunGitWithCode(['svn', 'rebase'] + args)[1] |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 2561 | |
| 2562 | |
jochen@chromium.org | 3ec0d54 | 2014-01-14 20:00:03 +0000 | [diff] [blame] | 2563 | def GetTreeStatus(url=None): |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 2564 | """Fetches the tree status and returns either 'open', 'closed', |
| 2565 | 'unknown' or 'unset'.""" |
jochen@chromium.org | 3ec0d54 | 2014-01-14 20:00:03 +0000 | [diff] [blame] | 2566 | url = url or settings.GetTreeStatusUrl(error_ok=True) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 2567 | if url: |
| 2568 | status = urllib2.urlopen(url).read().lower() |
| 2569 | if status.find('closed') != -1 or status == '0': |
| 2570 | return 'closed' |
| 2571 | elif status.find('open') != -1 or status == '1': |
| 2572 | return 'open' |
| 2573 | return 'unknown' |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 2574 | return 'unset' |
| 2575 | |
dpranke@chromium.org | 970c522 | 2011-03-12 00:32:24 +0000 | [diff] [blame] | 2576 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 2577 | def GetTreeStatusReason(): |
| 2578 | """Fetches the tree status from a json url and returns the message |
| 2579 | with the reason for the tree to be opened or closed.""" |
msb@chromium.org | bf1a7ba | 2011-02-01 16:21:46 +0000 | [diff] [blame] | 2580 | url = settings.GetTreeStatusUrl() |
| 2581 | json_url = urlparse.urljoin(url, '/current?format=json') |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 2582 | connection = urllib2.urlopen(json_url) |
| 2583 | status = json.loads(connection.read()) |
| 2584 | connection.close() |
| 2585 | return status['message'] |
| 2586 | |
dpranke@chromium.org | 970c522 | 2011-03-12 00:32:24 +0000 | [diff] [blame] | 2587 | |
sheyang@chromium.org | 2b34d55 | 2014-08-14 22:18:42 +0000 | [diff] [blame] | 2588 | def GetBuilderMaster(bot_list): |
| 2589 | """For a given builder, fetch the master from AE if available.""" |
| 2590 | map_url = 'https://builders-map.appspot.com/' |
| 2591 | try: |
| 2592 | master_map = json.load(urllib2.urlopen(map_url)) |
| 2593 | except urllib2.URLError as e: |
| 2594 | return None, ('Failed to fetch builder-to-master map from %s. Error: %s.' % |
| 2595 | (map_url, e)) |
| 2596 | except ValueError as e: |
| 2597 | return None, ('Invalid json string from %s. Error: %s.' % (map_url, e)) |
| 2598 | if not master_map: |
| 2599 | return None, 'Failed to build master map.' |
| 2600 | |
| 2601 | result_master = '' |
| 2602 | for bot in bot_list: |
| 2603 | builder = bot.split(':', 1)[0] |
| 2604 | master_list = master_map.get(builder, []) |
| 2605 | if not master_list: |
| 2606 | return None, ('No matching master for builder %s.' % builder) |
| 2607 | elif len(master_list) > 1: |
| 2608 | return None, ('The builder name %s exists in multiple masters %s.' % |
| 2609 | (builder, master_list)) |
| 2610 | else: |
| 2611 | cur_master = master_list[0] |
| 2612 | if not result_master: |
| 2613 | result_master = cur_master |
| 2614 | elif result_master != cur_master: |
| 2615 | return None, 'The builders do not belong to the same master.' |
| 2616 | return result_master, None |
| 2617 | |
| 2618 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 2619 | def CMDtree(parser, args): |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 2620 | """Shows the status of the tree.""" |
dpranke@chromium.org | 97ae58e | 2011-03-18 00:29:20 +0000 | [diff] [blame] | 2621 | _, args = parser.parse_args(args) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 2622 | status = GetTreeStatus() |
| 2623 | if 'unset' == status: |
| 2624 | print 'You must configure your tree status URL by running "git cl config".' |
| 2625 | return 2 |
| 2626 | |
| 2627 | print "The tree is %s" % status |
| 2628 | print |
| 2629 | print GetTreeStatusReason() |
| 2630 | if status != 'open': |
| 2631 | return 1 |
| 2632 | return 0 |
| 2633 | |
| 2634 | |
maruel@chromium.org | 1519240 | 2012-09-06 12:38:29 +0000 | [diff] [blame] | 2635 | def CMDtry(parser, args): |
| 2636 | """Triggers a try job through Rietveld.""" |
| 2637 | group = optparse.OptionGroup(parser, "Try job options") |
| 2638 | group.add_option( |
| 2639 | "-b", "--bot", action="append", |
| 2640 | help=("IMPORTANT: specify ONE builder per --bot flag. Use it multiple " |
| 2641 | "times to specify multiple builders. ex: " |
phajdan.jr@chromium.org | 5291413 | 2015-01-22 10:37:09 +0000 | [diff] [blame] | 2642 | "'-b win_rel -b win_layout'. See " |
maruel@chromium.org | 1519240 | 2012-09-06 12:38:29 +0000 | [diff] [blame] | 2643 | "the try server waterfall for the builders name and the tests " |
phajdan.jr@chromium.org | 5291413 | 2015-01-22 10:37:09 +0000 | [diff] [blame] | 2644 | "available.")) |
maruel@chromium.org | 1519240 | 2012-09-06 12:38:29 +0000 | [diff] [blame] | 2645 | group.add_option( |
machenbach@chromium.org | 58a69cb | 2014-03-01 02:08:29 +0000 | [diff] [blame] | 2646 | "-m", "--master", default='', |
iannucci@chromium.org | 9e84927 | 2014-04-04 00:31:55 +0000 | [diff] [blame] | 2647 | help=("Specify a try master where to run the tries.")) |
machenbach@chromium.org | 58a69cb | 2014-03-01 02:08:29 +0000 | [diff] [blame] | 2648 | group.add_option( |
maruel@chromium.org | 1519240 | 2012-09-06 12:38:29 +0000 | [diff] [blame] | 2649 | "-r", "--revision", |
| 2650 | help="Revision to use for the try job; default: the " |
| 2651 | "revision will be determined by the try server; see " |
| 2652 | "its waterfall for more info") |
| 2653 | group.add_option( |
| 2654 | "-c", "--clobber", action="store_true", default=False, |
| 2655 | help="Force a clobber before building; e.g. don't do an " |
| 2656 | "incremental build") |
| 2657 | group.add_option( |
| 2658 | "--project", |
| 2659 | help="Override which project to use. Projects are defined " |
| 2660 | "server-side to define what default bot set to use") |
| 2661 | group.add_option( |
maruel@chromium.org | 1519240 | 2012-09-06 12:38:29 +0000 | [diff] [blame] | 2662 | "-n", "--name", help="Try job name; default to current branch name") |
| 2663 | parser.add_option_group(group) |
| 2664 | options, args = parser.parse_args(args) |
| 2665 | |
| 2666 | if args: |
| 2667 | parser.error('Unknown arguments: %s' % args) |
| 2668 | |
| 2669 | cl = Changelist() |
| 2670 | if not cl.GetIssue(): |
| 2671 | parser.error('Need to upload first') |
| 2672 | |
jrobbins@chromium.org | 16f10f7 | 2014-06-24 22:14:36 +0000 | [diff] [blame] | 2673 | props = cl.GetIssueProperties() |
agable@chromium.org | 787e306 | 2014-08-20 16:31:19 +0000 | [diff] [blame] | 2674 | if props.get('closed'): |
| 2675 | parser.error('Cannot send tryjobs for a closed CL') |
| 2676 | |
jrobbins@chromium.org | 16f10f7 | 2014-06-24 22:14:36 +0000 | [diff] [blame] | 2677 | if props.get('private'): |
| 2678 | parser.error('Cannot use trybots with private issue') |
| 2679 | |
maruel@chromium.org | 1519240 | 2012-09-06 12:38:29 +0000 | [diff] [blame] | 2680 | if not options.name: |
| 2681 | options.name = cl.GetBranch() |
| 2682 | |
phajdan.jr@chromium.org | 8da7f27 | 2014-03-14 01:28:39 +0000 | [diff] [blame] | 2683 | if options.bot and not options.master: |
sheyang@chromium.org | 2b34d55 | 2014-08-14 22:18:42 +0000 | [diff] [blame] | 2684 | options.master, err_msg = GetBuilderMaster(options.bot) |
| 2685 | if err_msg: |
| 2686 | parser.error('Tryserver master cannot be found because: %s\n' |
| 2687 | 'Please manually specify the tryserver master' |
| 2688 | ', e.g. "-m tryserver.chromium.linux".' % err_msg) |
phajdan.jr@chromium.org | 8da7f27 | 2014-03-14 01:28:39 +0000 | [diff] [blame] | 2689 | |
machenbach@chromium.org | 58a69cb | 2014-03-01 02:08:29 +0000 | [diff] [blame] | 2690 | def GetMasterMap(): |
phajdan.jr@chromium.org | 5291413 | 2015-01-22 10:37:09 +0000 | [diff] [blame] | 2691 | # Process --bot. |
machenbach@chromium.org | 58a69cb | 2014-03-01 02:08:29 +0000 | [diff] [blame] | 2692 | if not options.bot: |
| 2693 | change = cl.GetChange(cl.GetCommonAncestorWithUpstream(), None) |
maruel@chromium.org | 1519240 | 2012-09-06 12:38:29 +0000 | [diff] [blame] | 2694 | |
machenbach@chromium.org | 58a69cb | 2014-03-01 02:08:29 +0000 | [diff] [blame] | 2695 | # Get try masters from PRESUBMIT.py files. |
| 2696 | masters = presubmit_support.DoGetTryMasters( |
| 2697 | change, |
| 2698 | change.LocalPaths(), |
| 2699 | settings.GetRoot(), |
| 2700 | None, |
| 2701 | None, |
| 2702 | options.verbose, |
| 2703 | sys.stdout) |
| 2704 | if masters: |
| 2705 | return masters |
stip@chromium.org | 43064fd | 2013-12-18 20:07:44 +0000 | [diff] [blame] | 2706 | |
machenbach@chromium.org | 58a69cb | 2014-03-01 02:08:29 +0000 | [diff] [blame] | 2707 | # Fall back to deprecated method: get try slaves from PRESUBMIT.py files. |
| 2708 | options.bot = presubmit_support.DoGetTrySlaves( |
| 2709 | change, |
| 2710 | change.LocalPaths(), |
| 2711 | settings.GetRoot(), |
| 2712 | None, |
| 2713 | None, |
| 2714 | options.verbose, |
| 2715 | sys.stdout) |
| 2716 | if not options.bot: |
| 2717 | parser.error('No default try builder to try, use --bot') |
maruel@chromium.org | 1519240 | 2012-09-06 12:38:29 +0000 | [diff] [blame] | 2718 | |
machenbach@chromium.org | 58a69cb | 2014-03-01 02:08:29 +0000 | [diff] [blame] | 2719 | builders_and_tests = {} |
| 2720 | # TODO(machenbach): The old style command-line options don't support |
| 2721 | # multiple try masters yet. |
| 2722 | old_style = filter(lambda x: isinstance(x, basestring), options.bot) |
| 2723 | new_style = filter(lambda x: isinstance(x, tuple), options.bot) |
| 2724 | |
| 2725 | for bot in old_style: |
| 2726 | if ':' in bot: |
phajdan.jr@chromium.org | 5291413 | 2015-01-22 10:37:09 +0000 | [diff] [blame] | 2727 | parser.error('Specifying testfilter is no longer supported') |
machenbach@chromium.org | 58a69cb | 2014-03-01 02:08:29 +0000 | [diff] [blame] | 2728 | elif ',' in bot: |
| 2729 | parser.error('Specify one bot per --bot flag') |
| 2730 | else: |
| 2731 | builders_and_tests.setdefault(bot, []).append('defaulttests') |
| 2732 | |
| 2733 | for bot, tests in new_style: |
| 2734 | builders_and_tests.setdefault(bot, []).extend(tests) |
| 2735 | |
| 2736 | # Return a master map with one master to be backwards compatible. The |
| 2737 | # master name defaults to an empty string, which will cause the master |
| 2738 | # not to be set on rietveld (deprecated). |
| 2739 | return {options.master: builders_and_tests} |
| 2740 | |
| 2741 | masters = GetMasterMap() |
stip@chromium.org | 43064fd | 2013-12-18 20:07:44 +0000 | [diff] [blame] | 2742 | |
machenbach@chromium.org | 58a69cb | 2014-03-01 02:08:29 +0000 | [diff] [blame] | 2743 | for builders in masters.itervalues(): |
| 2744 | if any('triggered' in b for b in builders): |
| 2745 | print >> sys.stderr, ( |
| 2746 | 'ERROR You are trying to send a job to a triggered bot. This type of' |
| 2747 | ' bot requires an\ninitial job from a parent (usually a builder). ' |
| 2748 | 'Instead send your job to the parent.\n' |
| 2749 | 'Bot list: %s' % builders) |
| 2750 | return 1 |
ilevy@chromium.org | f3b2123 | 2012-09-24 20:48:55 +0000 | [diff] [blame] | 2751 | |
ilevy@chromium.org | 36e420b | 2013-08-06 23:21:12 +0000 | [diff] [blame] | 2752 | patchset = cl.GetMostRecentPatchset() |
| 2753 | if patchset and patchset != cl.GetPatchset(): |
| 2754 | print( |
| 2755 | '\nWARNING Mismatch between local config and server. Did a previous ' |
| 2756 | 'upload fail?\ngit-cl try always uses latest patchset from rietveld. ' |
| 2757 | 'Continuing using\npatchset %s.\n' % patchset) |
fischman@chromium.org | d246c97 | 2013-12-21 22:47:38 +0000 | [diff] [blame] | 2758 | try: |
machenbach@chromium.org | 58a69cb | 2014-03-01 02:08:29 +0000 | [diff] [blame] | 2759 | cl.RpcServer().trigger_distributed_try_jobs( |
fischman@chromium.org | d246c97 | 2013-12-21 22:47:38 +0000 | [diff] [blame] | 2760 | cl.GetIssue(), patchset, options.name, options.clobber, |
machenbach@chromium.org | 58a69cb | 2014-03-01 02:08:29 +0000 | [diff] [blame] | 2761 | options.revision, masters) |
fischman@chromium.org | d246c97 | 2013-12-21 22:47:38 +0000 | [diff] [blame] | 2762 | except urllib2.HTTPError, e: |
| 2763 | if e.code == 404: |
| 2764 | print('404 from rietveld; ' |
| 2765 | 'did you mean to use "git try" instead of "git cl try"?') |
| 2766 | return 1 |
maruel@chromium.org | 072d94b | 2012-09-20 19:20:08 +0000 | [diff] [blame] | 2767 | print('Tried jobs on:') |
machenbach@chromium.org | 58a69cb | 2014-03-01 02:08:29 +0000 | [diff] [blame] | 2768 | |
| 2769 | for (master, builders) in masters.iteritems(): |
| 2770 | if master: |
| 2771 | print 'Master: %s' % master |
| 2772 | length = max(len(builder) for builder in builders) |
| 2773 | for builder in sorted(builders): |
| 2774 | print ' %*s: %s' % (length, builder, ','.join(builders[builder])) |
maruel@chromium.org | 1519240 | 2012-09-06 12:38:29 +0000 | [diff] [blame] | 2775 | return 0 |
| 2776 | |
| 2777 | |
maruel@chromium.org | 0633fb4 | 2013-08-16 20:06:14 +0000 | [diff] [blame] | 2778 | @subcommand.usage('[new upstream branch]') |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 2779 | def CMDupstream(parser, args): |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 2780 | """Prints or sets the name of the upstream branch, if any.""" |
dpranke@chromium.org | 97ae58e | 2011-03-18 00:29:20 +0000 | [diff] [blame] | 2781 | _, args = parser.parse_args(args) |
brettw@chromium.org | ac0ba33 | 2012-08-09 23:42:53 +0000 | [diff] [blame] | 2782 | if len(args) > 1: |
maruel@chromium.org | 27bb387 | 2011-05-30 20:33:19 +0000 | [diff] [blame] | 2783 | parser.error('Unrecognized args: %s' % ' '.join(args)) |
brettw@chromium.org | ac0ba33 | 2012-08-09 23:42:53 +0000 | [diff] [blame] | 2784 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 2785 | cl = Changelist() |
brettw@chromium.org | ac0ba33 | 2012-08-09 23:42:53 +0000 | [diff] [blame] | 2786 | if args: |
| 2787 | # One arg means set upstream branch. |
bauerb@chromium.org | c9cf90a | 2014-04-28 20:32:31 +0000 | [diff] [blame] | 2788 | branch = cl.GetBranch() |
| 2789 | RunGit(['branch', '--set-upstream', branch, args[0]]) |
brettw@chromium.org | ac0ba33 | 2012-08-09 23:42:53 +0000 | [diff] [blame] | 2790 | cl = Changelist() |
| 2791 | print "Upstream branch set to " + cl.GetUpstreamBranch() |
bauerb@chromium.org | c9cf90a | 2014-04-28 20:32:31 +0000 | [diff] [blame] | 2792 | |
| 2793 | # Clear configured merge-base, if there is one. |
| 2794 | git_common.remove_merge_base(branch) |
brettw@chromium.org | ac0ba33 | 2012-08-09 23:42:53 +0000 | [diff] [blame] | 2795 | else: |
| 2796 | print cl.GetUpstreamBranch() |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 2797 | return 0 |
| 2798 | |
| 2799 | |
thestig@chromium.org | 00858c8 | 2013-12-02 23:08:03 +0000 | [diff] [blame] | 2800 | def CMDweb(parser, args): |
| 2801 | """Opens the current CL in the web browser.""" |
| 2802 | _, args = parser.parse_args(args) |
| 2803 | if args: |
| 2804 | parser.error('Unrecognized args: %s' % ' '.join(args)) |
| 2805 | |
| 2806 | issue_url = Changelist().GetIssueURL() |
| 2807 | if not issue_url: |
| 2808 | print >> sys.stderr, 'ERROR No issue to open' |
| 2809 | return 1 |
| 2810 | |
| 2811 | webbrowser.open(issue_url) |
| 2812 | return 0 |
| 2813 | |
| 2814 | |
maruel@chromium.org | 27bb387 | 2011-05-30 20:33:19 +0000 | [diff] [blame] | 2815 | def CMDset_commit(parser, args): |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 2816 | """Sets the commit bit to trigger the Commit Queue.""" |
maruel@chromium.org | 27bb387 | 2011-05-30 20:33:19 +0000 | [diff] [blame] | 2817 | _, args = parser.parse_args(args) |
| 2818 | if args: |
| 2819 | parser.error('Unrecognized args: %s' % ' '.join(args)) |
| 2820 | cl = Changelist() |
jrobbins@chromium.org | 16f10f7 | 2014-06-24 22:14:36 +0000 | [diff] [blame] | 2821 | props = cl.GetIssueProperties() |
| 2822 | if props.get('private'): |
| 2823 | parser.error('Cannot set commit on private issue') |
maruel@chromium.org | 27bb387 | 2011-05-30 20:33:19 +0000 | [diff] [blame] | 2824 | cl.SetFlag('commit', '1') |
| 2825 | return 0 |
| 2826 | |
| 2827 | |
groby@chromium.org | 411034a | 2013-02-26 15:12:01 +0000 | [diff] [blame] | 2828 | def CMDset_close(parser, args): |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 2829 | """Closes the issue.""" |
groby@chromium.org | 411034a | 2013-02-26 15:12:01 +0000 | [diff] [blame] | 2830 | _, args = parser.parse_args(args) |
| 2831 | if args: |
| 2832 | parser.error('Unrecognized args: %s' % ' '.join(args)) |
| 2833 | cl = Changelist() |
| 2834 | # Ensure there actually is an issue to close. |
| 2835 | cl.GetDescription() |
| 2836 | cl.CloseIssue() |
| 2837 | return 0 |
| 2838 | |
| 2839 | |
sbc@chromium.org | 87b9bf0 | 2013-09-26 20:35:15 +0000 | [diff] [blame] | 2840 | def CMDdiff(parser, args): |
| 2841 | """shows differences between local tree and last upload.""" |
| 2842 | cl = Changelist() |
sbc@chromium.org | 78dc984 | 2013-11-25 18:43:44 +0000 | [diff] [blame] | 2843 | issue = cl.GetIssue() |
sbc@chromium.org | 87b9bf0 | 2013-09-26 20:35:15 +0000 | [diff] [blame] | 2844 | branch = cl.GetBranch() |
sbc@chromium.org | 78dc984 | 2013-11-25 18:43:44 +0000 | [diff] [blame] | 2845 | if not issue: |
| 2846 | DieWithError('No issue found for current branch (%s)' % branch) |
sbc@chromium.org | 87b9bf0 | 2013-09-26 20:35:15 +0000 | [diff] [blame] | 2847 | TMP_BRANCH = 'git-cl-diff' |
thestig@chromium.org | 8b0553c | 2014-02-11 00:33:37 +0000 | [diff] [blame] | 2848 | base_branch = cl.GetCommonAncestorWithUpstream() |
sbc@chromium.org | 87b9bf0 | 2013-09-26 20:35:15 +0000 | [diff] [blame] | 2849 | |
| 2850 | # Create a new branch based on the merge-base |
| 2851 | RunGit(['checkout', '-q', '-b', TMP_BRANCH, base_branch]) |
| 2852 | try: |
| 2853 | # Patch in the latest changes from rietveld. |
sbc@chromium.org | 78dc984 | 2013-11-25 18:43:44 +0000 | [diff] [blame] | 2854 | rtn = PatchIssue(issue, False, False, None) |
sbc@chromium.org | 87b9bf0 | 2013-09-26 20:35:15 +0000 | [diff] [blame] | 2855 | if rtn != 0: |
| 2856 | return rtn |
| 2857 | |
wychen@chromium.org | 0692853 | 2015-02-03 02:11:29 +0000 | [diff] [blame] | 2858 | # Switch back to starting branch and diff against the temporary |
sbc@chromium.org | 87b9bf0 | 2013-09-26 20:35:15 +0000 | [diff] [blame] | 2859 | # branch containing the latest rietveld patch. |
wychen@chromium.org | 0692853 | 2015-02-03 02:11:29 +0000 | [diff] [blame] | 2860 | subprocess2.check_call(['git', 'diff', TMP_BRANCH, branch, '--']) |
sbc@chromium.org | 87b9bf0 | 2013-09-26 20:35:15 +0000 | [diff] [blame] | 2861 | finally: |
| 2862 | RunGit(['checkout', '-q', branch]) |
| 2863 | RunGit(['branch', '-D', TMP_BRANCH]) |
| 2864 | |
| 2865 | return 0 |
| 2866 | |
| 2867 | |
ikarienator@chromium.org | faf3fdf | 2013-09-20 02:11:48 +0000 | [diff] [blame] | 2868 | def CMDowners(parser, args): |
| 2869 | """interactively find the owners for reviewing""" |
| 2870 | parser.add_option( |
| 2871 | '--no-color', |
| 2872 | action='store_true', |
| 2873 | help='Use this option to disable color output') |
| 2874 | options, args = parser.parse_args(args) |
| 2875 | |
| 2876 | author = RunGit(['config', 'user.email']).strip() or None |
| 2877 | |
| 2878 | cl = Changelist() |
| 2879 | |
| 2880 | if args: |
| 2881 | if len(args) > 1: |
| 2882 | parser.error('Unknown args') |
| 2883 | base_branch = args[0] |
| 2884 | else: |
| 2885 | # Default to diffing against the common ancestor of the upstream branch. |
thestig@chromium.org | 8b0553c | 2014-02-11 00:33:37 +0000 | [diff] [blame] | 2886 | base_branch = cl.GetCommonAncestorWithUpstream() |
ikarienator@chromium.org | faf3fdf | 2013-09-20 02:11:48 +0000 | [diff] [blame] | 2887 | |
| 2888 | change = cl.GetChange(base_branch, None) |
| 2889 | return owners_finder.OwnersFinder( |
| 2890 | [f.LocalPath() for f in |
| 2891 | cl.GetChange(base_branch, None).AffectedFiles()], |
| 2892 | change.RepositoryRoot(), author, |
| 2893 | fopen=file, os_path=os.path, glob=glob.glob, |
| 2894 | disable_color=options.no_color).run() |
| 2895 | |
| 2896 | |
enne@chromium.org | 555cfe4 | 2014-01-29 18:21:39 +0000 | [diff] [blame] | 2897 | @subcommand.usage('[files or directories to diff]') |
agable@chromium.org | fab8f82 | 2013-05-06 17:43:09 +0000 | [diff] [blame] | 2898 | def CMDformat(parser, args): |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 2899 | """Runs clang-format on the diff.""" |
thakis@chromium.org | 9819b1b | 2014-12-09 21:21:53 +0000 | [diff] [blame] | 2900 | CLANG_EXTS = ['.cc', '.cpp', '.h', '.mm', '.proto', '.java'] |
enne@chromium.org | 3b7e15c | 2014-01-21 17:44:47 +0000 | [diff] [blame] | 2901 | parser.add_option('--full', action='store_true', |
| 2902 | help='Reformat the full content of all touched files') |
| 2903 | parser.add_option('--dry-run', action='store_true', |
| 2904 | help='Don\'t modify any file on disk.') |
wittman@chromium.org | 04d5a22 | 2014-03-07 18:30:42 +0000 | [diff] [blame] | 2905 | parser.add_option('--diff', action='store_true', |
| 2906 | help='Print diff to stdout rather than modifying files.') |
agable@chromium.org | fab8f82 | 2013-05-06 17:43:09 +0000 | [diff] [blame] | 2907 | opts, args = parser.parse_args(args) |
agable@chromium.org | fab8f82 | 2013-05-06 17:43:09 +0000 | [diff] [blame] | 2908 | |
enne@chromium.org | ff7a1fb | 2013-12-10 19:21:41 +0000 | [diff] [blame] | 2909 | # git diff generates paths against the root of the repository. Change |
| 2910 | # 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] | 2911 | rel_base_path = settings.GetRelativeRoot() |
enne@chromium.org | ff7a1fb | 2013-12-10 19:21:41 +0000 | [diff] [blame] | 2912 | if rel_base_path: |
| 2913 | os.chdir(rel_base_path) |
| 2914 | |
digit@chromium.org | 29e4727 | 2013-05-17 17:01:46 +0000 | [diff] [blame] | 2915 | # Generate diff for the current branch's changes. |
enne@chromium.org | 90d30c6 | 2013-05-29 16:09:49 +0000 | [diff] [blame] | 2916 | diff_cmd = ['diff', '--no-ext-diff', '--no-prefix'] |
agable@chromium.org | fab8f82 | 2013-05-06 17:43:09 +0000 | [diff] [blame] | 2917 | if opts.full: |
digit@chromium.org | 29e4727 | 2013-05-17 17:01:46 +0000 | [diff] [blame] | 2918 | # Only list the names of modified files. |
| 2919 | diff_cmd.append('--name-only') |
| 2920 | else: |
| 2921 | # Only generate context-less patches. |
| 2922 | diff_cmd.append('-U0') |
| 2923 | |
| 2924 | # Grab the merge-base commit, i.e. the upstream commit of the current |
| 2925 | # branch when it was created or the last time it was rebased. This is |
| 2926 | # to cover the case where the user may have called "git fetch origin", |
| 2927 | # moving the origin branch to a newer commit, but hasn't rebased yet. |
| 2928 | upstream_commit = None |
| 2929 | cl = Changelist() |
| 2930 | upstream_branch = cl.GetUpstreamBranch() |
| 2931 | if upstream_branch: |
| 2932 | upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch]) |
| 2933 | upstream_commit = upstream_commit.strip() |
| 2934 | |
| 2935 | if not upstream_commit: |
| 2936 | DieWithError('Could not find base commit for this branch. ' |
| 2937 | 'Are you in detached state?') |
| 2938 | |
| 2939 | diff_cmd.append(upstream_commit) |
| 2940 | |
| 2941 | # Handle source file filtering. |
| 2942 | diff_cmd.append('--') |
enne@chromium.org | 555cfe4 | 2014-01-29 18:21:39 +0000 | [diff] [blame] | 2943 | if args: |
| 2944 | for arg in args: |
| 2945 | if os.path.isdir(arg): |
| 2946 | diff_cmd += [os.path.join(arg, '*' + ext) for ext in CLANG_EXTS] |
| 2947 | elif os.path.isfile(arg): |
| 2948 | diff_cmd.append(arg) |
| 2949 | else: |
| 2950 | DieWithError('Argument "%s" is not a file or a directory' % arg) |
| 2951 | else: |
| 2952 | diff_cmd += ['*' + ext for ext in CLANG_EXTS] |
digit@chromium.org | 29e4727 | 2013-05-17 17:01:46 +0000 | [diff] [blame] | 2953 | diff_output = RunGit(diff_cmd) |
| 2954 | |
nick@chromium.org | 3ac1c4e | 2014-01-16 02:44:42 +0000 | [diff] [blame] | 2955 | top_dir = os.path.normpath( |
| 2956 | RunGit(["rev-parse", "--show-toplevel"]).rstrip('\n')) |
| 2957 | |
| 2958 | # Locate the clang-format binary in the checkout |
| 2959 | try: |
| 2960 | clang_format_tool = clang_format.FindClangFormatToolInChromiumTree() |
| 2961 | except clang_format.NotFoundError, e: |
| 2962 | DieWithError(e) |
mdempsky@google.com | c3b3dc0 | 2013-08-05 23:09:49 +0000 | [diff] [blame] | 2963 | |
digit@chromium.org | 29e4727 | 2013-05-17 17:01:46 +0000 | [diff] [blame] | 2964 | if opts.full: |
| 2965 | # diff_output is a list of files to send to clang-format. |
| 2966 | files = diff_output.splitlines() |
agable@chromium.org | fab8f82 | 2013-05-06 17:43:09 +0000 | [diff] [blame] | 2967 | if not files: |
| 2968 | print "Nothing to format." |
| 2969 | return 0 |
enne@chromium.org | 3b7e15c | 2014-01-21 17:44:47 +0000 | [diff] [blame] | 2970 | cmd = [clang_format_tool] |
wittman@chromium.org | 04d5a22 | 2014-03-07 18:30:42 +0000 | [diff] [blame] | 2971 | if not opts.dry_run and not opts.diff: |
enne@chromium.org | 3b7e15c | 2014-01-21 17:44:47 +0000 | [diff] [blame] | 2972 | cmd.append('-i') |
| 2973 | stdout = RunCommand(cmd + files, cwd=top_dir) |
wittman@chromium.org | 04d5a22 | 2014-03-07 18:30:42 +0000 | [diff] [blame] | 2974 | if opts.diff: |
| 2975 | sys.stdout.write(stdout) |
agable@chromium.org | fab8f82 | 2013-05-06 17:43:09 +0000 | [diff] [blame] | 2976 | else: |
nick@chromium.org | 3ac1c4e | 2014-01-16 02:44:42 +0000 | [diff] [blame] | 2977 | env = os.environ.copy() |
thakis@chromium.org | bd2a9b9 | 2014-09-05 18:54:22 +0000 | [diff] [blame] | 2978 | env['PATH'] = str(os.path.dirname(clang_format_tool)) |
digit@chromium.org | 29e4727 | 2013-05-17 17:01:46 +0000 | [diff] [blame] | 2979 | # diff_output is a patch to send to clang-format-diff.py |
nick@chromium.org | 3ac1c4e | 2014-01-16 02:44:42 +0000 | [diff] [blame] | 2980 | try: |
| 2981 | script = clang_format.FindClangFormatScriptInChromiumTree( |
| 2982 | 'clang-format-diff.py') |
| 2983 | except clang_format.NotFoundError, e: |
| 2984 | DieWithError(e) |
digit@chromium.org | d6ddc1c | 2013-10-25 15:36:32 +0000 | [diff] [blame] | 2985 | |
enne@chromium.org | 3b7e15c | 2014-01-21 17:44:47 +0000 | [diff] [blame] | 2986 | cmd = [sys.executable, script, '-p0'] |
wittman@chromium.org | 04d5a22 | 2014-03-07 18:30:42 +0000 | [diff] [blame] | 2987 | if not opts.dry_run and not opts.diff: |
enne@chromium.org | 3b7e15c | 2014-01-21 17:44:47 +0000 | [diff] [blame] | 2988 | cmd.append('-i') |
digit@chromium.org | d6ddc1c | 2013-10-25 15:36:32 +0000 | [diff] [blame] | 2989 | |
enne@chromium.org | 3b7e15c | 2014-01-21 17:44:47 +0000 | [diff] [blame] | 2990 | stdout = RunCommand(cmd, stdin=diff_output, cwd=top_dir, env=env) |
wittman@chromium.org | 04d5a22 | 2014-03-07 18:30:42 +0000 | [diff] [blame] | 2991 | if opts.diff: |
| 2992 | sys.stdout.write(stdout) |
enne@chromium.org | 3b7e15c | 2014-01-21 17:44:47 +0000 | [diff] [blame] | 2993 | if opts.dry_run and len(stdout) > 0: |
| 2994 | return 2 |
agable@chromium.org | fab8f82 | 2013-05-06 17:43:09 +0000 | [diff] [blame] | 2995 | |
| 2996 | return 0 |
| 2997 | |
| 2998 | |
maruel@chromium.org | 29404b5 | 2014-09-08 22:58:00 +0000 | [diff] [blame] | 2999 | def CMDlol(parser, args): |
| 3000 | # This command is intentionally undocumented. |
thakis@chromium.org | 3421c99 | 2014-11-02 02:20:32 +0000 | [diff] [blame] | 3001 | print zlib.decompress(base64.b64decode( |
| 3002 | 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE' |
| 3003 | 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9' |
| 3004 | 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W' |
| 3005 | 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')) |
maruel@chromium.org | 29404b5 | 2014-09-08 22:58:00 +0000 | [diff] [blame] | 3006 | return 0 |
| 3007 | |
| 3008 | |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 3009 | class OptionParser(optparse.OptionParser): |
| 3010 | """Creates the option parse and add --verbose support.""" |
| 3011 | def __init__(self, *args, **kwargs): |
maruel@chromium.org | 0633fb4 | 2013-08-16 20:06:14 +0000 | [diff] [blame] | 3012 | optparse.OptionParser.__init__( |
| 3013 | self, *args, prog='git cl', version=__version__, **kwargs) |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 3014 | self.add_option( |
| 3015 | '-v', '--verbose', action='count', default=0, |
| 3016 | help='Use 2 times for more debugging info') |
| 3017 | |
| 3018 | def parse_args(self, args=None, values=None): |
| 3019 | options, args = optparse.OptionParser.parse_args(self, args, values) |
| 3020 | levels = [logging.WARNING, logging.INFO, logging.DEBUG] |
| 3021 | logging.basicConfig(level=levels[min(options.verbose, len(levels) - 1)]) |
| 3022 | return options, args |
| 3023 | |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 3024 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3025 | def main(argv): |
maruel@chromium.org | 82798cb | 2012-02-23 18:16:12 +0000 | [diff] [blame] | 3026 | if sys.hexversion < 0x02060000: |
| 3027 | print >> sys.stderr, ( |
| 3028 | '\nYour python version %s is unsupported, please upgrade.\n' % |
| 3029 | sys.version.split(' ', 1)[0]) |
| 3030 | return 2 |
maruel@chromium.org | 2e23ce3 | 2013-05-07 12:42:28 +0000 | [diff] [blame] | 3031 | |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 3032 | # Reload settings. |
| 3033 | global settings |
| 3034 | settings = Settings() |
| 3035 | |
maruel@chromium.org | 39c0b22 | 2013-08-17 16:57:01 +0000 | [diff] [blame] | 3036 | colorize_CMDstatus_doc() |
maruel@chromium.org | 0633fb4 | 2013-08-16 20:06:14 +0000 | [diff] [blame] | 3037 | dispatcher = subcommand.CommandDispatcher(__name__) |
| 3038 | try: |
| 3039 | return dispatcher.execute(OptionParser(), argv) |
| 3040 | except urllib2.HTTPError, e: |
| 3041 | if e.code != 500: |
| 3042 | raise |
| 3043 | DieWithError( |
| 3044 | ('AppEngine is misbehaving and returned HTTP %d, again. Keep faith ' |
| 3045 | 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e))) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3046 | |
| 3047 | |
| 3048 | if __name__ == '__main__': |
maruel@chromium.org | 2e23ce3 | 2013-05-07 12:42:28 +0000 | [diff] [blame] | 3049 | # These affect sys.stdout so do it outside of main() to simplify mocks in |
| 3050 | # unit testing. |
maruel@chromium.org | 6f09cd9 | 2011-04-01 16:38:12 +0000 | [diff] [blame] | 3051 | fix_encoding.fix_encoding() |
maruel@chromium.org | 2e23ce3 | 2013-05-07 12:42:28 +0000 | [diff] [blame] | 3052 | colorama.init() |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3053 | sys.exit(main(sys.argv[1:])) |