[email protected] | 7d65467 | 2012-01-05 19:07:23 | [diff] [blame] | 1 | # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
[email protected] | d5800f1 | 2009-11-12 20:03:43 | [diff] [blame] | 2 | # Use of this source code is governed by a BSD-style license that can be |
| 3 | # found in the LICENSE file. |
| 4 | |
[email protected] | 5aeb7dd | 2009-11-17 18:09:01 | [diff] [blame] | 5 | """SCM-specific utility classes.""" |
[email protected] | d5800f1 | 2009-11-12 20:03:43 | [diff] [blame] | 6 | |
[email protected] | 3c55d98 | 2010-05-06 14:25:44 | [diff] [blame] | 7 | import cStringIO |
[email protected] | fd9cbbb | 2010-01-08 23:04:03 | [diff] [blame] | 8 | import glob |
[email protected] | 07ab60e | 2011-02-08 21:54:00 | [diff] [blame] | 9 | import logging |
[email protected] | d5800f1 | 2009-11-12 20:03:43 | [diff] [blame] | 10 | import os |
| 11 | import re |
[email protected] | d5800f1 | 2009-11-12 20:03:43 | [diff] [blame] | 12 | import sys |
[email protected] | 4755b58 | 2013-04-18 21:38:40 | [diff] [blame] | 13 | import tempfile |
[email protected] | fd87617 | 2010-04-30 14:01:05 | [diff] [blame] | 14 | import time |
[email protected] | ade9c59 | 2011-04-07 15:59:11 | [diff] [blame] | 15 | from xml.etree import ElementTree |
[email protected] | d5800f1 | 2009-11-12 20:03:43 | [diff] [blame] | 16 | |
| 17 | import gclient_utils |
[email protected] | 31cb48a | 2011-04-04 18:01:36 | [diff] [blame] | 18 | import subprocess2 |
| 19 | |
[email protected] | d5800f1 | 2009-11-12 20:03:43 | [diff] [blame] | 20 | |
[email protected] | b24a8e1 | 2009-12-22 13:45:48 | [diff] [blame] | 21 | def ValidateEmail(email): |
[email protected] | 6e29d57 | 2010-06-04 17:32:20 | [diff] [blame] | 22 | return (re.match(r"^[a-zA-Z0-9._%-+]+@[a-zA-Z0-9._%-]+.[a-zA-Z]{2,6}$", email) |
| 23 | is not None) |
[email protected] | b24a8e1 | 2009-12-22 13:45:48 | [diff] [blame] | 24 | |
[email protected] | d5800f1 | 2009-11-12 20:03:43 | [diff] [blame] | 25 | |
[email protected] | fd9cbbb | 2010-01-08 23:04:03 | [diff] [blame] | 26 | def GetCasedPath(path): |
| 27 | """Elcheapos way to get the real path case on Windows.""" |
| 28 | if sys.platform.startswith('win') and os.path.exists(path): |
| 29 | # Reconstruct the path. |
| 30 | path = os.path.abspath(path) |
| 31 | paths = path.split('\\') |
| 32 | for i in range(len(paths)): |
| 33 | if i == 0: |
| 34 | # Skip drive letter. |
| 35 | continue |
| 36 | subpath = '\\'.join(paths[:i+1]) |
| 37 | prev = len('\\'.join(paths[:i])) |
| 38 | # glob.glob will return the cased path for the last item only. This is why |
| 39 | # we are calling it in a loop. Extract the data we want and put it back |
| 40 | # into the list. |
| 41 | paths[i] = glob.glob(subpath + '*')[0][prev+1:len(subpath)] |
| 42 | path = '\\'.join(paths) |
| 43 | return path |
| 44 | |
| 45 | |
[email protected] | 3c55d98 | 2010-05-06 14:25:44 | [diff] [blame] | 46 | def GenFakeDiff(filename): |
| 47 | """Generates a fake diff from a file.""" |
| 48 | file_content = gclient_utils.FileRead(filename, 'rb').splitlines(True) |
[email protected] | c6d170e | 2010-06-03 00:06:00 | [diff] [blame] | 49 | filename = filename.replace(os.sep, '/') |
[email protected] | 3c55d98 | 2010-05-06 14:25:44 | [diff] [blame] | 50 | nb_lines = len(file_content) |
| 51 | # We need to use / since patch on unix will fail otherwise. |
| 52 | data = cStringIO.StringIO() |
| 53 | data.write("Index: %s\n" % filename) |
| 54 | data.write('=' * 67 + '\n') |
| 55 | # Note: Should we use /dev/null instead? |
| 56 | data.write("--- %s\n" % filename) |
| 57 | data.write("+++ %s\n" % filename) |
| 58 | data.write("@@ -0,0 +1,%d @@\n" % nb_lines) |
| 59 | # Prepend '+' to every lines. |
| 60 | for line in file_content: |
| 61 | data.write('+') |
| 62 | data.write(line) |
| 63 | result = data.getvalue() |
| 64 | data.close() |
| 65 | return result |
| 66 | |
| 67 | |
[email protected] | 5c8c6de | 2011-03-18 16:20:18 | [diff] [blame] | 68 | def determine_scm(root): |
| 69 | """Similar to upload.py's version but much simpler. |
| 70 | |
| 71 | Returns 'svn', 'git' or None. |
| 72 | """ |
| 73 | if os.path.isdir(os.path.join(root, '.svn')): |
| 74 | return 'svn' |
[email protected] | c98c0c5 | 2011-04-06 13:39:43 | [diff] [blame] | 75 | elif os.path.isdir(os.path.join(root, '.git')): |
[email protected] | 5c8c6de | 2011-03-18 16:20:18 | [diff] [blame] | 76 | return 'git' |
| 77 | else: |
[email protected] | c98c0c5 | 2011-04-06 13:39:43 | [diff] [blame] | 78 | try: |
[email protected] | 91def9b | 2011-09-14 16:28:07 | [diff] [blame] | 79 | subprocess2.check_call( |
[email protected] | 5c8c6de | 2011-03-18 16:20:18 | [diff] [blame] | 80 | ['git', 'rev-parse', '--show-cdup'], |
[email protected] | c98c0c5 | 2011-04-06 13:39:43 | [diff] [blame] | 81 | stdout=subprocess2.VOID, |
[email protected] | 87e6d33 | 2011-09-09 19:01:28 | [diff] [blame] | 82 | stderr=subprocess2.VOID, |
[email protected] | c98c0c5 | 2011-04-06 13:39:43 | [diff] [blame] | 83 | cwd=root) |
[email protected] | 5c8c6de | 2011-03-18 16:20:18 | [diff] [blame] | 84 | return 'git' |
[email protected] | c98c0c5 | 2011-04-06 13:39:43 | [diff] [blame] | 85 | except (OSError, subprocess2.CalledProcessError): |
[email protected] | 5c8c6de | 2011-03-18 16:20:18 | [diff] [blame] | 86 | return None |
| 87 | |
| 88 | |
[email protected] | 36ac239 | 2011-10-12 16:36:11 | [diff] [blame] | 89 | def only_int(val): |
| 90 | if val.isdigit(): |
| 91 | return int(val) |
| 92 | else: |
| 93 | return 0 |
| 94 | |
| 95 | |
[email protected] | 5aeb7dd | 2009-11-17 18:09:01 | [diff] [blame] | 96 | class GIT(object): |
[email protected] | 36ac239 | 2011-10-12 16:36:11 | [diff] [blame] | 97 | current_version = None |
| 98 | |
[email protected] | 5aeb7dd | 2009-11-17 18:09:01 | [diff] [blame] | 99 | @staticmethod |
[email protected] | 6d8115d | 2014-04-23 20:59:23 | [diff] [blame] | 100 | def ApplyEnvVars(kwargs): |
| 101 | env = kwargs.pop('env', None) or os.environ.copy() |
| 102 | # Don't prompt for passwords; just fail quickly and noisily. |
| 103 | # By default, git will use an interactive terminal prompt when a username/ |
| 104 | # password is needed. That shouldn't happen in the chromium workflow, |
| 105 | # and if it does, then gclient may hide the prompt in the midst of a flood |
| 106 | # of terminal spew. The only indication that something has gone wrong |
| 107 | # will be when gclient hangs unresponsively. Instead, we disable the |
| 108 | # password prompt and simply allow git to fail noisily. The error |
| 109 | # message produced by git will be copied to gclient's output. |
| 110 | env.setdefault('GIT_ASKPASS', 'true') |
| 111 | env.setdefault('SSH_ASKPASS', 'true') |
[email protected] | 82b91cd | 2013-07-09 06:33:41 | [diff] [blame] | 112 | # 'cat' is a magical git string that disables pagers on all platforms. |
[email protected] | 6d8115d | 2014-04-23 20:59:23 | [diff] [blame] | 113 | env.setdefault('GIT_PAGER', 'cat') |
| 114 | return env |
| 115 | |
| 116 | @staticmethod |
| 117 | def Capture(args, cwd, strip_out=True, **kwargs): |
| 118 | env = GIT.ApplyEnvVars(kwargs) |
[email protected] | 4380c80 | 2013-07-12 23:38:41 | [diff] [blame] | 119 | output = subprocess2.check_output( |
[email protected] | 82b91cd | 2013-07-09 06:33:41 | [diff] [blame] | 120 | ['git'] + args, |
[email protected] | 4380c80 | 2013-07-12 23:38:41 | [diff] [blame] | 121 | cwd=cwd, stderr=subprocess2.PIPE, env=env, **kwargs) |
| 122 | return output.strip() if strip_out else output |
[email protected] | d5800f1 | 2009-11-12 20:03:43 | [diff] [blame] | 123 | |
[email protected] | 5aeb7dd | 2009-11-17 18:09:01 | [diff] [blame] | 124 | @staticmethod |
[email protected] | 80a9ef1 | 2011-12-13 20:44:10 | [diff] [blame] | 125 | def CaptureStatus(files, cwd, upstream_branch): |
[email protected] | 5aeb7dd | 2009-11-17 18:09:01 | [diff] [blame] | 126 | """Returns git status. |
[email protected] | d5800f1 | 2009-11-12 20:03:43 | [diff] [blame] | 127 | |
[email protected] | 5aeb7dd | 2009-11-17 18:09:01 | [diff] [blame] | 128 | @files can be a string (one file) or a list of files. |
[email protected] | d5800f1 | 2009-11-12 20:03:43 | [diff] [blame] | 129 | |
[email protected] | 5aeb7dd | 2009-11-17 18:09:01 | [diff] [blame] | 130 | Returns an array of (status, file) tuples.""" |
[email protected] | 786fb68 | 2010-06-02 15:16:23 | [diff] [blame] | 131 | if upstream_branch is None: |
[email protected] | 80a9ef1 | 2011-12-13 20:44:10 | [diff] [blame] | 132 | upstream_branch = GIT.GetUpstreamBranch(cwd) |
[email protected] | 786fb68 | 2010-06-02 15:16:23 | [diff] [blame] | 133 | if upstream_branch is None: |
[email protected] | ad80e3b | 2010-09-09 14:18:28 | [diff] [blame] | 134 | raise gclient_utils.Error('Cannot determine upstream branch') |
[email protected] | 9249f64 | 2013-06-03 21:36:18 | [diff] [blame] | 135 | command = ['diff', '--name-status', '--no-renames', |
| 136 | '-r', '%s...' % upstream_branch] |
[email protected] | 5aeb7dd | 2009-11-17 18:09:01 | [diff] [blame] | 137 | if not files: |
| 138 | pass |
| 139 | elif isinstance(files, basestring): |
| 140 | command.append(files) |
| 141 | else: |
| 142 | command.extend(files) |
[email protected] | a41249c | 2013-07-03 00:09:12 | [diff] [blame] | 143 | status = GIT.Capture(command, cwd) |
[email protected] | 5aeb7dd | 2009-11-17 18:09:01 | [diff] [blame] | 144 | results = [] |
| 145 | if status: |
[email protected] | ad80e3b | 2010-09-09 14:18:28 | [diff] [blame] | 146 | for statusline in status.splitlines(): |
[email protected] | cc1614b | 2010-09-20 17:13:17 | [diff] [blame] | 147 | # 3-way merges can cause the status can be 'MMM' instead of 'M'. This |
| 148 | # can happen when the user has 2 local branches and he diffs between |
| 149 | # these 2 branches instead diffing to upstream. |
| 150 | m = re.match('^(\w)+\t(.+)$', statusline) |
[email protected] | 5aeb7dd | 2009-11-17 18:09:01 | [diff] [blame] | 151 | if not m: |
[email protected] | ad80e3b | 2010-09-09 14:18:28 | [diff] [blame] | 152 | raise gclient_utils.Error( |
| 153 | 'status currently unsupported: %s' % statusline) |
[email protected] | cc1614b | 2010-09-20 17:13:17 | [diff] [blame] | 154 | # Only grab the first letter. |
| 155 | results.append(('%s ' % m.group(1)[0], m.group(2))) |
[email protected] | 5aeb7dd | 2009-11-17 18:09:01 | [diff] [blame] | 156 | return results |
[email protected] | d5800f1 | 2009-11-12 20:03:43 | [diff] [blame] | 157 | |
[email protected] | c78f246 | 2009-11-21 01:20:57 | [diff] [blame] | 158 | @staticmethod |
[email protected] | ead4c7e | 2014-04-03 01:01:06 | [diff] [blame] | 159 | def IsWorkTreeDirty(cwd): |
| 160 | return GIT.Capture(['status', '-s'], cwd=cwd) != '' |
| 161 | |
| 162 | @staticmethod |
[email protected] | ad80e3b | 2010-09-09 14:18:28 | [diff] [blame] | 163 | def GetEmail(cwd): |
[email protected] | c78f246 | 2009-11-21 01:20:57 | [diff] [blame] | 164 | """Retrieves the user email address if known.""" |
| 165 | # We could want to look at the svn cred when it has a svn remote but it |
| 166 | # should be fine for now, users should simply configure their git settings. |
[email protected] | ad80e3b | 2010-09-09 14:18:28 | [diff] [blame] | 167 | try: |
[email protected] | a41249c | 2013-07-03 00:09:12 | [diff] [blame] | 168 | return GIT.Capture(['config', 'user.email'], cwd=cwd) |
[email protected] | da64d63 | 2011-09-08 17:41:15 | [diff] [blame] | 169 | except subprocess2.CalledProcessError: |
[email protected] | ad80e3b | 2010-09-09 14:18:28 | [diff] [blame] | 170 | return '' |
[email protected] | f2f9d55 | 2009-12-22 00:12:57 | [diff] [blame] | 171 | |
| 172 | @staticmethod |
| 173 | def ShortBranchName(branch): |
| 174 | """Converts a name like 'refs/heads/foo' to just 'foo'.""" |
| 175 | return branch.replace('refs/heads/', '') |
| 176 | |
| 177 | @staticmethod |
| 178 | def GetBranchRef(cwd): |
[email protected] | b24a8e1 | 2009-12-22 13:45:48 | [diff] [blame] | 179 | """Returns the full branch reference, e.g. 'refs/heads/master'.""" |
[email protected] | a41249c | 2013-07-03 00:09:12 | [diff] [blame] | 180 | return GIT.Capture(['symbolic-ref', 'HEAD'], cwd=cwd) |
[email protected] | f2f9d55 | 2009-12-22 00:12:57 | [diff] [blame] | 181 | |
| 182 | @staticmethod |
[email protected] | b24a8e1 | 2009-12-22 13:45:48 | [diff] [blame] | 183 | def GetBranch(cwd): |
| 184 | """Returns the short branch name, e.g. 'master'.""" |
[email protected] | c308a74 | 2009-12-22 18:29:33 | [diff] [blame] | 185 | return GIT.ShortBranchName(GIT.GetBranchRef(cwd)) |
[email protected] | b24a8e1 | 2009-12-22 13:45:48 | [diff] [blame] | 186 | |
| 187 | @staticmethod |
[email protected] | 6c2b49d | 2014-02-26 23:57:38 | [diff] [blame] | 188 | def IsGitSvn(cwd): |
[email protected] | b09097a | 2014-04-09 19:09:08 | [diff] [blame] | 189 | """Returns True if this repo looks like it's using git-svn.""" |
[email protected] | f2f9d55 | 2009-12-22 00:12:57 | [diff] [blame] | 190 | # If you have any "svn-remote.*" config keys, we think you're using svn. |
| 191 | try: |
[email protected] | a41249c | 2013-07-03 00:09:12 | [diff] [blame] | 192 | GIT.Capture(['config', '--local', '--get-regexp', r'^svn-remote\.'], |
[email protected] | 6c2b49d | 2014-02-26 23:57:38 | [diff] [blame] | 193 | cwd=cwd) |
[email protected] | f2f9d55 | 2009-12-22 00:12:57 | [diff] [blame] | 194 | return True |
[email protected] | da64d63 | 2011-09-08 17:41:15 | [diff] [blame] | 195 | except subprocess2.CalledProcessError: |
[email protected] | f2f9d55 | 2009-12-22 00:12:57 | [diff] [blame] | 196 | return False |
| 197 | |
| 198 | @staticmethod |
[email protected] | 866276c | 2011-03-18 20:09:31 | [diff] [blame] | 199 | def MatchSvnGlob(url, base_url, glob_spec, allow_wildcards): |
| 200 | """Return the corresponding git ref if |base_url| together with |glob_spec| |
| 201 | matches the full |url|. |
| 202 | |
| 203 | If |allow_wildcards| is true, |glob_spec| can contain wildcards (see below). |
| 204 | """ |
| 205 | fetch_suburl, as_ref = glob_spec.split(':') |
| 206 | if allow_wildcards: |
| 207 | glob_match = re.match('(.+/)?(\*|{[^/]*})(/.+)?', fetch_suburl) |
| 208 | if glob_match: |
| 209 | # Parse specs like "branches/*/src:refs/remotes/svn/*" or |
| 210 | # "branches/{472,597,648}/src:refs/remotes/svn/*". |
| 211 | branch_re = re.escape(base_url) |
| 212 | if glob_match.group(1): |
| 213 | branch_re += '/' + re.escape(glob_match.group(1)) |
| 214 | wildcard = glob_match.group(2) |
| 215 | if wildcard == '*': |
| 216 | branch_re += '([^/]*)' |
| 217 | else: |
| 218 | # Escape and replace surrounding braces with parentheses and commas |
| 219 | # with pipe symbols. |
| 220 | wildcard = re.escape(wildcard) |
| 221 | wildcard = re.sub('^\\\\{', '(', wildcard) |
| 222 | wildcard = re.sub('\\\\,', '|', wildcard) |
| 223 | wildcard = re.sub('\\\\}$', ')', wildcard) |
| 224 | branch_re += wildcard |
| 225 | if glob_match.group(3): |
| 226 | branch_re += re.escape(glob_match.group(3)) |
| 227 | match = re.match(branch_re, url) |
| 228 | if match: |
| 229 | return re.sub('\*$', match.group(1), as_ref) |
| 230 | |
| 231 | # Parse specs like "trunk/src:refs/remotes/origin/trunk". |
| 232 | if fetch_suburl: |
| 233 | full_url = base_url + '/' + fetch_suburl |
| 234 | else: |
| 235 | full_url = base_url |
| 236 | if full_url == url: |
| 237 | return as_ref |
| 238 | return None |
| 239 | |
| 240 | @staticmethod |
[email protected] | f2f9d55 | 2009-12-22 00:12:57 | [diff] [blame] | 241 | def GetSVNBranch(cwd): |
| 242 | """Returns the svn branch name if found.""" |
| 243 | # Try to figure out which remote branch we're based on. |
| 244 | # Strategy: |
[email protected] | ade368c | 2011-03-01 08:57:50 | [diff] [blame] | 245 | # 1) iterate through our branch history and find the svn URL. |
| 246 | # 2) find the svn-remote that fetches from the URL. |
[email protected] | f2f9d55 | 2009-12-22 00:12:57 | [diff] [blame] | 247 | |
| 248 | # regexp matching the git-svn line that contains the URL. |
| 249 | git_svn_re = re.compile(r'^\s*git-svn-id: (\S+)@', re.MULTILINE) |
| 250 | |
[email protected] | ade368c | 2011-03-01 08:57:50 | [diff] [blame] | 251 | # We don't want to go through all of history, so read a line from the |
| 252 | # pipe at a time. |
| 253 | # The -100 is an arbitrary limit so we don't search forever. |
| 254 | cmd = ['git', 'log', '-100', '--pretty=medium'] |
[email protected] | f94e3f1 | 2011-12-13 21:03:46 | [diff] [blame] | 255 | proc = subprocess2.Popen(cmd, cwd=cwd, stdout=subprocess2.PIPE) |
[email protected] | e8c2862 | 2011-04-05 14:41:44 | [diff] [blame] | 256 | url = None |
[email protected] | ade368c | 2011-03-01 08:57:50 | [diff] [blame] | 257 | for line in proc.stdout: |
| 258 | match = git_svn_re.match(line) |
| 259 | if match: |
| 260 | url = match.group(1) |
| 261 | proc.stdout.close() # Cut pipe. |
| 262 | break |
[email protected] | f2f9d55 | 2009-12-22 00:12:57 | [diff] [blame] | 263 | |
[email protected] | ade368c | 2011-03-01 08:57:50 | [diff] [blame] | 264 | if url: |
| 265 | svn_remote_re = re.compile(r'^svn-remote\.([^.]+)\.url (.*)$') |
[email protected] | 80a9ef1 | 2011-12-13 20:44:10 | [diff] [blame] | 266 | remotes = GIT.Capture( |
[email protected] | a41249c | 2013-07-03 00:09:12 | [diff] [blame] | 267 | ['config', '--local', '--get-regexp', r'^svn-remote\..*\.url'], |
[email protected] | 80a9ef1 | 2011-12-13 20:44:10 | [diff] [blame] | 268 | cwd=cwd).splitlines() |
[email protected] | ade368c | 2011-03-01 08:57:50 | [diff] [blame] | 269 | for remote in remotes: |
| 270 | match = svn_remote_re.match(remote) |
[email protected] | f2f9d55 | 2009-12-22 00:12:57 | [diff] [blame] | 271 | if match: |
[email protected] | ade368c | 2011-03-01 08:57:50 | [diff] [blame] | 272 | remote = match.group(1) |
| 273 | base_url = match.group(2) |
[email protected] | 866276c | 2011-03-18 20:09:31 | [diff] [blame] | 274 | try: |
| 275 | fetch_spec = GIT.Capture( |
[email protected] | a41249c | 2013-07-03 00:09:12 | [diff] [blame] | 276 | ['config', '--local', 'svn-remote.%s.fetch' % remote], |
| 277 | cwd=cwd) |
[email protected] | 866276c | 2011-03-18 20:09:31 | [diff] [blame] | 278 | branch = GIT.MatchSvnGlob(url, base_url, fetch_spec, False) |
[email protected] | da64d63 | 2011-09-08 17:41:15 | [diff] [blame] | 279 | except subprocess2.CalledProcessError: |
[email protected] | 866276c | 2011-03-18 20:09:31 | [diff] [blame] | 280 | branch = None |
| 281 | if branch: |
| 282 | return branch |
| 283 | try: |
| 284 | branch_spec = GIT.Capture( |
[email protected] | a41249c | 2013-07-03 00:09:12 | [diff] [blame] | 285 | ['config', '--local', 'svn-remote.%s.branches' % remote], |
| 286 | cwd=cwd) |
[email protected] | 866276c | 2011-03-18 20:09:31 | [diff] [blame] | 287 | branch = GIT.MatchSvnGlob(url, base_url, branch_spec, True) |
[email protected] | da64d63 | 2011-09-08 17:41:15 | [diff] [blame] | 288 | except subprocess2.CalledProcessError: |
[email protected] | 866276c | 2011-03-18 20:09:31 | [diff] [blame] | 289 | branch = None |
| 290 | if branch: |
| 291 | return branch |
| 292 | try: |
| 293 | tag_spec = GIT.Capture( |
[email protected] | a41249c | 2013-07-03 00:09:12 | [diff] [blame] | 294 | ['config', '--local', 'svn-remote.%s.tags' % remote], |
| 295 | cwd=cwd) |
[email protected] | 866276c | 2011-03-18 20:09:31 | [diff] [blame] | 296 | branch = GIT.MatchSvnGlob(url, base_url, tag_spec, True) |
[email protected] | da64d63 | 2011-09-08 17:41:15 | [diff] [blame] | 297 | except subprocess2.CalledProcessError: |
[email protected] | 866276c | 2011-03-18 20:09:31 | [diff] [blame] | 298 | branch = None |
| 299 | if branch: |
| 300 | return branch |
[email protected] | f2f9d55 | 2009-12-22 00:12:57 | [diff] [blame] | 301 | |
| 302 | @staticmethod |
| 303 | def FetchUpstreamTuple(cwd): |
| 304 | """Returns a tuple containg remote and remote ref, |
| 305 | e.g. 'origin', 'refs/heads/master' |
[email protected] | 81e012c | 2010-04-29 16:07:24 | [diff] [blame] | 306 | Tries to be intelligent and understand git-svn. |
[email protected] | f2f9d55 | 2009-12-22 00:12:57 | [diff] [blame] | 307 | """ |
| 308 | remote = '.' |
[email protected] | b24a8e1 | 2009-12-22 13:45:48 | [diff] [blame] | 309 | branch = GIT.GetBranch(cwd) |
[email protected] | ad80e3b | 2010-09-09 14:18:28 | [diff] [blame] | 310 | try: |
| 311 | upstream_branch = GIT.Capture( |
[email protected] | a41249c | 2013-07-03 00:09:12 | [diff] [blame] | 312 | ['config', '--local', 'branch.%s.merge' % branch], cwd=cwd) |
[email protected] | da64d63 | 2011-09-08 17:41:15 | [diff] [blame] | 313 | except subprocess2.CalledProcessError: |
[email protected] | ad80e3b | 2010-09-09 14:18:28 | [diff] [blame] | 314 | upstream_branch = None |
[email protected] | f2f9d55 | 2009-12-22 00:12:57 | [diff] [blame] | 315 | if upstream_branch: |
[email protected] | ad80e3b | 2010-09-09 14:18:28 | [diff] [blame] | 316 | try: |
| 317 | remote = GIT.Capture( |
[email protected] | a41249c | 2013-07-03 00:09:12 | [diff] [blame] | 318 | ['config', '--local', 'branch.%s.remote' % branch], cwd=cwd) |
[email protected] | da64d63 | 2011-09-08 17:41:15 | [diff] [blame] | 319 | except subprocess2.CalledProcessError: |
[email protected] | ad80e3b | 2010-09-09 14:18:28 | [diff] [blame] | 320 | pass |
[email protected] | f2f9d55 | 2009-12-22 00:12:57 | [diff] [blame] | 321 | else: |
[email protected] | ade368c | 2011-03-01 08:57:50 | [diff] [blame] | 322 | try: |
| 323 | upstream_branch = GIT.Capture( |
[email protected] | a41249c | 2013-07-03 00:09:12 | [diff] [blame] | 324 | ['config', '--local', 'rietveld.upstream-branch'], cwd=cwd) |
[email protected] | da64d63 | 2011-09-08 17:41:15 | [diff] [blame] | 325 | except subprocess2.CalledProcessError: |
[email protected] | ade368c | 2011-03-01 08:57:50 | [diff] [blame] | 326 | upstream_branch = None |
| 327 | if upstream_branch: |
| 328 | try: |
| 329 | remote = GIT.Capture( |
[email protected] | a41249c | 2013-07-03 00:09:12 | [diff] [blame] | 330 | ['config', '--local', 'rietveld.upstream-remote'], cwd=cwd) |
[email protected] | da64d63 | 2011-09-08 17:41:15 | [diff] [blame] | 331 | except subprocess2.CalledProcessError: |
[email protected] | ade368c | 2011-03-01 08:57:50 | [diff] [blame] | 332 | pass |
[email protected] | 81e012c | 2010-04-29 16:07:24 | [diff] [blame] | 333 | else: |
[email protected] | ade368c | 2011-03-01 08:57:50 | [diff] [blame] | 334 | # Fall back on trying a git-svn upstream branch. |
| 335 | if GIT.IsGitSvn(cwd): |
| 336 | upstream_branch = GIT.GetSVNBranch(cwd) |
[email protected] | a630bd7 | 2010-04-29 23:32:34 | [diff] [blame] | 337 | else: |
[email protected] | ade368c | 2011-03-01 08:57:50 | [diff] [blame] | 338 | # Else, try to guess the origin remote. |
| 339 | remote_branches = GIT.Capture(['branch', '-r'], cwd=cwd).split() |
| 340 | if 'origin/master' in remote_branches: |
| 341 | # Fall back on origin/master if it exits. |
| 342 | remote = 'origin' |
| 343 | upstream_branch = 'refs/heads/master' |
| 344 | elif 'origin/trunk' in remote_branches: |
| 345 | # Fall back on origin/trunk if it exists. Generally a shared |
| 346 | # git-svn clone |
| 347 | remote = 'origin' |
| 348 | upstream_branch = 'refs/heads/trunk' |
| 349 | else: |
| 350 | # Give up. |
| 351 | remote = None |
| 352 | upstream_branch = None |
[email protected] | f2f9d55 | 2009-12-22 00:12:57 | [diff] [blame] | 353 | return remote, upstream_branch |
| 354 | |
| 355 | @staticmethod |
[email protected] | 6e7202b | 2014-09-09 18:23:39 | [diff] [blame] | 356 | def RefToRemoteRef(ref, remote=None): |
| 357 | """Convert a checkout ref to the equivalent remote ref. |
| 358 | |
| 359 | Returns: |
| 360 | A tuple of the remote ref's (common prefix, unique suffix), or None if it |
| 361 | doesn't appear to refer to a remote ref (e.g. it's a commit hash). |
| 362 | """ |
| 363 | # TODO(mmoss): This is just a brute-force mapping based of the expected git |
| 364 | # config. It's a bit better than the even more brute-force replace('heads', |
| 365 | # ...), but could still be smarter (like maybe actually using values gleaned |
| 366 | # from the git config). |
| 367 | m = re.match('^(refs/(remotes/)?)?branch-heads/', ref or '') |
| 368 | if m: |
| 369 | return ('refs/remotes/branch-heads/', ref.replace(m.group(0), '')) |
| 370 | if remote: |
| 371 | m = re.match('^((refs/)?remotes/)?%s/|(refs/)?heads/' % remote, ref or '') |
| 372 | if m: |
| 373 | return ('refs/remotes/%s/' % remote, ref.replace(m.group(0), '')) |
| 374 | return None |
| 375 | |
| 376 | @staticmethod |
[email protected] | 81e012c | 2010-04-29 16:07:24 | [diff] [blame] | 377 | def GetUpstreamBranch(cwd): |
[email protected] | f2f9d55 | 2009-12-22 00:12:57 | [diff] [blame] | 378 | """Gets the current branch's upstream branch.""" |
| 379 | remote, upstream_branch = GIT.FetchUpstreamTuple(cwd) |
[email protected] | a630bd7 | 2010-04-29 23:32:34 | [diff] [blame] | 380 | if remote != '.' and upstream_branch: |
[email protected] | 6e7202b | 2014-09-09 18:23:39 | [diff] [blame] | 381 | remote_ref = GIT.RefToRemoteRef(upstream_branch, remote) |
| 382 | if remote_ref: |
| 383 | upstream_branch = ''.join(remote_ref) |
[email protected] | f2f9d55 | 2009-12-22 00:12:57 | [diff] [blame] | 384 | return upstream_branch |
| 385 | |
| 386 | @staticmethod |
[email protected] | 8ede00e | 2010-01-12 14:35:28 | [diff] [blame] | 387 | def GenerateDiff(cwd, branch=None, branch_head='HEAD', full_move=False, |
| 388 | files=None): |
[email protected] | a937176 | 2009-12-22 18:27:38 | [diff] [blame] | 389 | """Diffs against the upstream branch or optionally another branch. |
| 390 | |
| 391 | full_move means that move or copy operations should completely recreate the |
| 392 | files, usually in the prospect to apply the patch for a try job.""" |
[email protected] | f2f9d55 | 2009-12-22 00:12:57 | [diff] [blame] | 393 | if not branch: |
[email protected] | 81e012c | 2010-04-29 16:07:24 | [diff] [blame] | 394 | branch = GIT.GetUpstreamBranch(cwd) |
[email protected] | 3316733 | 2012-02-23 21:15:30 | [diff] [blame] | 395 | command = ['diff', '-p', '--no-color', '--no-prefix', '--no-ext-diff', |
[email protected] | 400f3e7 | 2010-05-19 14:23:36 | [diff] [blame] | 396 | branch + "..." + branch_head] |
[email protected] | 9249f64 | 2013-06-03 21:36:18 | [diff] [blame] | 397 | if full_move: |
| 398 | command.append('--no-renames') |
| 399 | else: |
[email protected] | a937176 | 2009-12-22 18:27:38 | [diff] [blame] | 400 | command.append('-C') |
[email protected] | 8ede00e | 2010-01-12 14:35:28 | [diff] [blame] | 401 | # TODO(maruel): --binary support. |
| 402 | if files: |
| 403 | command.append('--') |
| 404 | command.extend(files) |
[email protected] | 4380c80 | 2013-07-12 23:38:41 | [diff] [blame] | 405 | diff = GIT.Capture(command, cwd=cwd, strip_out=False).splitlines(True) |
[email protected] | f2f9d55 | 2009-12-22 00:12:57 | [diff] [blame] | 406 | for i in range(len(diff)): |
| 407 | # In the case of added files, replace /dev/null with the path to the |
| 408 | # file being added. |
| 409 | if diff[i].startswith('--- /dev/null'): |
| 410 | diff[i] = '--- %s' % diff[i+1][4:] |
| 411 | return ''.join(diff) |
[email protected] | c78f246 | 2009-11-21 01:20:57 | [diff] [blame] | 412 | |
[email protected] | b24a8e1 | 2009-12-22 13:45:48 | [diff] [blame] | 413 | @staticmethod |
[email protected] | 8ede00e | 2010-01-12 14:35:28 | [diff] [blame] | 414 | def GetDifferentFiles(cwd, branch=None, branch_head='HEAD'): |
| 415 | """Returns the list of modified files between two branches.""" |
| 416 | if not branch: |
[email protected] | 81e012c | 2010-04-29 16:07:24 | [diff] [blame] | 417 | branch = GIT.GetUpstreamBranch(cwd) |
[email protected] | 838f0f2 | 2010-04-09 17:02:50 | [diff] [blame] | 418 | command = ['diff', '--name-only', branch + "..." + branch_head] |
[email protected] | ad80e3b | 2010-09-09 14:18:28 | [diff] [blame] | 419 | return GIT.Capture(command, cwd=cwd).splitlines(False) |
[email protected] | 8ede00e | 2010-01-12 14:35:28 | [diff] [blame] | 420 | |
| 421 | @staticmethod |
[email protected] | b24a8e1 | 2009-12-22 13:45:48 | [diff] [blame] | 422 | def GetPatchName(cwd): |
| 423 | """Constructs a name for this patch.""" |
[email protected] | a41249c | 2013-07-03 00:09:12 | [diff] [blame] | 424 | short_sha = GIT.Capture(['rev-parse', '--short=4', 'HEAD'], cwd=cwd) |
[email protected] | 862ff8e | 2010-08-06 15:29:16 | [diff] [blame] | 425 | return "%s#%s" % (GIT.GetBranch(cwd), short_sha) |
[email protected] | b24a8e1 | 2009-12-22 13:45:48 | [diff] [blame] | 426 | |
| 427 | @staticmethod |
[email protected] | ad80e3b | 2010-09-09 14:18:28 | [diff] [blame] | 428 | def GetCheckoutRoot(cwd): |
[email protected] | 01d8c1d | 2010-01-07 01:56:59 | [diff] [blame] | 429 | """Returns the top level directory of a git checkout as an absolute path. |
[email protected] | b24a8e1 | 2009-12-22 13:45:48 | [diff] [blame] | 430 | """ |
[email protected] | a41249c | 2013-07-03 00:09:12 | [diff] [blame] | 431 | root = GIT.Capture(['rev-parse', '--show-cdup'], cwd=cwd) |
[email protected] | ad80e3b | 2010-09-09 14:18:28 | [diff] [blame] | 432 | return os.path.abspath(os.path.join(cwd, root)) |
[email protected] | b24a8e1 | 2009-12-22 13:45:48 | [diff] [blame] | 433 | |
[email protected] | e5d1e61 | 2011-12-19 19:49:19 | [diff] [blame] | 434 | @staticmethod |
[email protected] | ead4c7e | 2014-04-03 01:01:06 | [diff] [blame] | 435 | def GetGitDir(cwd): |
| 436 | return os.path.abspath(GIT.Capture(['rev-parse', '--git-dir'], cwd=cwd)) |
| 437 | |
| 438 | @staticmethod |
| 439 | def IsInsideWorkTree(cwd): |
| 440 | try: |
| 441 | return GIT.Capture(['rev-parse', '--is-inside-work-tree'], cwd=cwd) |
| 442 | except (OSError, subprocess2.CalledProcessError): |
| 443 | return False |
| 444 | |
| 445 | @staticmethod |
[email protected] | 1c12738 | 2015-02-17 11:15:40 | [diff] [blame] | 446 | def IsDirectoryVersioned(cwd, relative_dir): |
| 447 | """Checks whether the given |relative_dir| is part of cwd's repo.""" |
| 448 | return bool(GIT.Capture(['ls-tree', 'HEAD', relative_dir], cwd=cwd)) |
| 449 | |
| 450 | @staticmethod |
| 451 | def CleanupDir(cwd, relative_dir): |
| 452 | """Cleans up untracked file inside |relative_dir|.""" |
| 453 | return bool(GIT.Capture(['clean', '-df', relative_dir], cwd=cwd)) |
| 454 | |
| 455 | @staticmethod |
[email protected] | e5d1e61 | 2011-12-19 19:49:19 | [diff] [blame] | 456 | def GetGitSvnHeadRev(cwd): |
| 457 | """Gets the most recently pulled git-svn revision.""" |
| 458 | try: |
| 459 | output = GIT.Capture(['svn', 'info'], cwd=cwd) |
| 460 | match = re.search(r'^Revision: ([0-9]+)$', output, re.MULTILINE) |
| 461 | return int(match.group(1)) if match else None |
| 462 | except (subprocess2.CalledProcessError, ValueError): |
| 463 | return None |
| 464 | |
| 465 | @staticmethod |
[email protected] | 492a368 | 2012-08-10 00:28:28 | [diff] [blame] | 466 | def ParseGitSvnSha1(output): |
| 467 | """Parses git-svn output for the first sha1.""" |
| 468 | match = re.search(r'[0-9a-fA-F]{40}', output) |
| 469 | return match.group(0) if match else None |
| 470 | |
| 471 | @staticmethod |
[email protected] | e5d1e61 | 2011-12-19 19:49:19 | [diff] [blame] | 472 | def GetSha1ForSvnRev(cwd, rev): |
| 473 | """Returns a corresponding git sha1 for a SVN revision.""" |
[email protected] | 6c2b49d | 2014-02-26 23:57:38 | [diff] [blame] | 474 | if not GIT.IsGitSvn(cwd=cwd): |
[email protected] | e5d1e61 | 2011-12-19 19:49:19 | [diff] [blame] | 475 | return None |
| 476 | try: |
[email protected] | c51def3 | 2012-10-15 18:50:37 | [diff] [blame] | 477 | output = GIT.Capture(['svn', 'find-rev', 'r' + str(rev)], cwd=cwd) |
| 478 | return GIT.ParseGitSvnSha1(output) |
| 479 | except subprocess2.CalledProcessError: |
| 480 | return None |
| 481 | |
| 482 | @staticmethod |
| 483 | def GetBlessedSha1ForSvnRev(cwd, rev): |
| 484 | """Returns a git commit hash from the master branch history that has |
| 485 | accurate .DEPS.git and git submodules. To understand why this is more |
| 486 | complicated than a simple call to `git svn find-rev`, refer to: |
| 487 | |
| 488 | http://www.chromium.org/developers/how-tos/git-repo |
| 489 | """ |
| 490 | git_svn_rev = GIT.GetSha1ForSvnRev(cwd, rev) |
| 491 | if not git_svn_rev: |
| 492 | return None |
| 493 | try: |
[email protected] | 312a6a4 | 2012-10-11 21:19:42 | [diff] [blame] | 494 | output = GIT.Capture( |
| 495 | ['rev-list', '--ancestry-path', '--reverse', |
| 496 | '--grep', 'SVN changes up to revision [0-9]*', |
| 497 | '%s..refs/remotes/origin/master' % git_svn_rev], cwd=cwd) |
| 498 | if not output: |
| 499 | return None |
| 500 | sha1 = output.splitlines()[0] |
| 501 | if not sha1: |
| 502 | return None |
| 503 | output = GIT.Capture(['rev-list', '-n', '1', '%s^1' % sha1], cwd=cwd) |
| 504 | if git_svn_rev != output.rstrip(): |
| 505 | raise gclient_utils.Error(sha1) |
| 506 | return sha1 |
[email protected] | e5d1e61 | 2011-12-19 19:49:19 | [diff] [blame] | 507 | except subprocess2.CalledProcessError: |
| 508 | return None |
| 509 | |
| 510 | @staticmethod |
[email protected] | a41249c | 2013-07-03 00:09:12 | [diff] [blame] | 511 | def IsValidRevision(cwd, rev, sha_only=False): |
| 512 | """Verifies the revision is a proper git revision. |
| 513 | |
| 514 | sha_only: Fail unless rev is a sha hash. |
| 515 | """ |
[email protected] | 8147386 | 2012-06-27 17:30:56 | [diff] [blame] | 516 | # 'git rev-parse foo' where foo is *any* 40 character hex string will return |
| 517 | # the string and return code 0. So strip one character to force 'git |
| 518 | # rev-parse' to do a hash table look-up and returns 128 if the hash is not |
| 519 | # present. |
[email protected] | a41249c | 2013-07-03 00:09:12 | [diff] [blame] | 520 | lookup_rev = rev |
[email protected] | 8147386 | 2012-06-27 17:30:56 | [diff] [blame] | 521 | if re.match(r'^[0-9a-fA-F]{40}$', rev): |
[email protected] | a41249c | 2013-07-03 00:09:12 | [diff] [blame] | 522 | lookup_rev = rev[:-1] |
[email protected] | e5d1e61 | 2011-12-19 19:49:19 | [diff] [blame] | 523 | try: |
[email protected] | 224ba24 | 2013-07-08 22:02:31 | [diff] [blame] | 524 | sha = GIT.Capture(['rev-parse', lookup_rev], cwd=cwd).lower() |
[email protected] | a41249c | 2013-07-03 00:09:12 | [diff] [blame] | 525 | if lookup_rev != rev: |
| 526 | # Make sure we get the original 40 chars back. |
[email protected] | 6895317 | 2014-06-11 22:14:35 | [diff] [blame] | 527 | return rev.lower() == sha |
[email protected] | a41249c | 2013-07-03 00:09:12 | [diff] [blame] | 528 | if sha_only: |
[email protected] | 6895317 | 2014-06-11 22:14:35 | [diff] [blame] | 529 | return sha.startswith(rev.lower()) |
| 530 | return True |
[email protected] | e5d1e61 | 2011-12-19 19:49:19 | [diff] [blame] | 531 | except subprocess2.CalledProcessError: |
| 532 | return False |
| 533 | |
[email protected] | 36ac239 | 2011-10-12 16:36:11 | [diff] [blame] | 534 | @classmethod |
| 535 | def AssertVersion(cls, min_version): |
[email protected] | d0f854a | 2010-03-11 19:35:53 | [diff] [blame] | 536 | """Asserts git's version is at least min_version.""" |
[email protected] | 36ac239 | 2011-10-12 16:36:11 | [diff] [blame] | 537 | if cls.current_version is None: |
[email protected] | fcffd48 | 2012-02-24 01:47:00 | [diff] [blame] | 538 | current_version = cls.Capture(['--version'], '.') |
| 539 | matched = re.search(r'version ([0-9\.]+)', current_version) |
| 540 | cls.current_version = matched.group(1) |
[email protected] | 36ac239 | 2011-10-12 16:36:11 | [diff] [blame] | 541 | current_version_list = map(only_int, cls.current_version.split('.')) |
[email protected] | d0f854a | 2010-03-11 19:35:53 | [diff] [blame] | 542 | for min_ver in map(int, min_version.split('.')): |
| 543 | ver = current_version_list.pop(0) |
| 544 | if ver < min_ver: |
[email protected] | 36ac239 | 2011-10-12 16:36:11 | [diff] [blame] | 545 | return (False, cls.current_version) |
[email protected] | d0f854a | 2010-03-11 19:35:53 | [diff] [blame] | 546 | elif ver > min_ver: |
[email protected] | 36ac239 | 2011-10-12 16:36:11 | [diff] [blame] | 547 | return (True, cls.current_version) |
| 548 | return (True, cls.current_version) |
[email protected] | d0f854a | 2010-03-11 19:35:53 | [diff] [blame] | 549 | |
[email protected] | d5800f1 | 2009-11-12 20:03:43 | [diff] [blame] | 550 | |
[email protected] | 5aeb7dd | 2009-11-17 18:09:01 | [diff] [blame] | 551 | class SVN(object): |
[email protected] | 5756466 | 2010-04-14 02:35:12 | [diff] [blame] | 552 | current_version = None |
[email protected] | d5800f1 | 2009-11-12 20:03:43 | [diff] [blame] | 553 | |
[email protected] | 5aeb7dd | 2009-11-17 18:09:01 | [diff] [blame] | 554 | @staticmethod |
[email protected] | d579fcf | 2011-12-13 20:36:03 | [diff] [blame] | 555 | def Capture(args, cwd, **kwargs): |
[email protected] | 54019f3 | 2010-09-09 13:50:11 | [diff] [blame] | 556 | """Always redirect stderr. |
[email protected] | d5800f1 | 2009-11-12 20:03:43 | [diff] [blame] | 557 | |
[email protected] | da64d63 | 2011-09-08 17:41:15 | [diff] [blame] | 558 | Throws an exception if non-0 is returned. |
| 559 | """ |
[email protected] | 904af08 | 2011-09-08 22:06:09 | [diff] [blame] | 560 | return subprocess2.check_output( |
[email protected] | d579fcf | 2011-12-13 20:36:03 | [diff] [blame] | 561 | ['svn'] + args, stderr=subprocess2.PIPE, cwd=cwd, **kwargs) |
[email protected] | d5800f1 | 2009-11-12 20:03:43 | [diff] [blame] | 562 | |
[email protected] | 5aeb7dd | 2009-11-17 18:09:01 | [diff] [blame] | 563 | @staticmethod |
[email protected] | 2b9aa8e | 2010-08-25 20:01:42 | [diff] [blame] | 564 | def RunAndGetFileList(verbose, args, cwd, file_list, stdout=None): |
[email protected] | 5aeb7dd | 2009-11-17 18:09:01 | [diff] [blame] | 565 | """Runs svn checkout, update, or status, output to stdout. |
[email protected] | d5800f1 | 2009-11-12 20:03:43 | [diff] [blame] | 566 | |
[email protected] | 5aeb7dd | 2009-11-17 18:09:01 | [diff] [blame] | 567 | The first item in args must be either "checkout", "update", or "status". |
[email protected] | d5800f1 | 2009-11-12 20:03:43 | [diff] [blame] | 568 | |
[email protected] | 5aeb7dd | 2009-11-17 18:09:01 | [diff] [blame] | 569 | svn's stdout is parsed to collect a list of files checked out or updated. |
| 570 | These files are appended to file_list. svn's stdout is also printed to |
| 571 | sys.stdout as in Run. |
[email protected] | d5800f1 | 2009-11-12 20:03:43 | [diff] [blame] | 572 | |
[email protected] | 5aeb7dd | 2009-11-17 18:09:01 | [diff] [blame] | 573 | Args: |
[email protected] | 0380707 | 2010-08-16 17:18:44 | [diff] [blame] | 574 | verbose: If True, uses verbose output |
[email protected] | 5aeb7dd | 2009-11-17 18:09:01 | [diff] [blame] | 575 | args: A sequence of command line parameters to be passed to svn. |
[email protected] | 2b9aa8e | 2010-08-25 20:01:42 | [diff] [blame] | 576 | cwd: The directory where svn is to be run. |
[email protected] | d5800f1 | 2009-11-12 20:03:43 | [diff] [blame] | 577 | |
[email protected] | 5aeb7dd | 2009-11-17 18:09:01 | [diff] [blame] | 578 | Raises: |
| 579 | Error: An error occurred while running the svn command. |
| 580 | """ |
[email protected] | 2b9aa8e | 2010-08-25 20:01:42 | [diff] [blame] | 581 | stdout = stdout or sys.stdout |
[email protected] | 396e1a6 | 2013-07-03 19:41:04 | [diff] [blame] | 582 | if file_list is None: |
| 583 | # Even if our caller doesn't care about file_list, we use it internally. |
| 584 | file_list = [] |
[email protected] | d5800f1 | 2009-11-12 20:03:43 | [diff] [blame] | 585 | |
[email protected] | 5aeb7dd | 2009-11-17 18:09:01 | [diff] [blame] | 586 | # svn update and svn checkout use the same pattern: the first three columns |
| 587 | # are for file status, property status, and lock status. This is followed |
| 588 | # by two spaces, and then the path to the file. |
| 589 | update_pattern = '^... (.*)$' |
[email protected] | d5800f1 | 2009-11-12 20:03:43 | [diff] [blame] | 590 | |
[email protected] | 5aeb7dd | 2009-11-17 18:09:01 | [diff] [blame] | 591 | # The first three columns of svn status are the same as for svn update and |
| 592 | # svn checkout. The next three columns indicate addition-with-history, |
| 593 | # switch, and remote lock status. This is followed by one space, and then |
| 594 | # the path to the file. |
| 595 | status_pattern = '^...... (.*)$' |
[email protected] | d5800f1 | 2009-11-12 20:03:43 | [diff] [blame] | 596 | |
[email protected] | 5aeb7dd | 2009-11-17 18:09:01 | [diff] [blame] | 597 | # args[0] must be a supported command. This will blow up if it's something |
| 598 | # else, which is good. Note that the patterns are only effective when |
| 599 | # these commands are used in their ordinary forms, the patterns are invalid |
| 600 | # for "svn status --show-updates", for example. |
| 601 | pattern = { |
| 602 | 'checkout': update_pattern, |
| 603 | 'status': status_pattern, |
| 604 | 'update': update_pattern, |
| 605 | }[args[0]] |
[email protected] | 5aeb7dd | 2009-11-17 18:09:01 | [diff] [blame] | 606 | compiled_pattern = re.compile(pattern) |
[email protected] | b71b67e | 2009-11-24 20:48:19 | [diff] [blame] | 607 | # Place an upper limit. |
[email protected] | 2aee2298 | 2010-09-03 14:15:25 | [diff] [blame] | 608 | backoff_time = 5 |
[email protected] | bec588d | 2010-10-26 13:50:25 | [diff] [blame] | 609 | retries = 0 |
[email protected] | 0350706 | 2010-10-26 00:58:27 | [diff] [blame] | 610 | while True: |
[email protected] | bec588d | 2010-10-26 13:50:25 | [diff] [blame] | 611 | retries += 1 |
[email protected] | b71b67e | 2009-11-24 20:48:19 | [diff] [blame] | 612 | previous_list_len = len(file_list) |
| 613 | failure = [] |
[email protected] | 54d1f1a | 2010-01-08 19:53:47 | [diff] [blame] | 614 | |
[email protected] | b71b67e | 2009-11-24 20:48:19 | [diff] [blame] | 615 | def CaptureMatchingLines(line): |
| 616 | match = compiled_pattern.search(line) |
| 617 | if match: |
| 618 | file_list.append(match.group(1)) |
| 619 | if line.startswith('svn: '): |
[email protected] | 8599aa7 | 2010-02-08 20:27:14 | [diff] [blame] | 620 | failure.append(line) |
[email protected] | 54d1f1a | 2010-01-08 19:53:47 | [diff] [blame] | 621 | |
[email protected] | b71b67e | 2009-11-24 20:48:19 | [diff] [blame] | 622 | try: |
[email protected] | 17d0179 | 2010-09-01 18:07:10 | [diff] [blame] | 623 | gclient_utils.CheckCallAndFilterAndHeader( |
| 624 | ['svn'] + args, |
| 625 | cwd=cwd, |
| 626 | always=verbose, |
| 627 | filter_fn=CaptureMatchingLines, |
| 628 | stdout=stdout) |
[email protected] | da64d63 | 2011-09-08 17:41:15 | [diff] [blame] | 629 | except subprocess2.CalledProcessError: |
[email protected] | 6133c5b | 2010-08-18 18:34:48 | [diff] [blame] | 630 | def IsKnownFailure(): |
| 631 | for x in failure: |
| 632 | if (x.startswith('svn: OPTIONS of') or |
| 633 | x.startswith('svn: PROPFIND of') or |
| 634 | x.startswith('svn: REPORT of') or |
[email protected] | f61fc93 | 2010-08-19 13:05:24 | [diff] [blame] | 635 | x.startswith('svn: Unknown hostname') or |
[email protected] | 7d8b97d | 2011-10-11 23:32:30 | [diff] [blame] | 636 | x.startswith('svn: Server sent unexpected return value') or |
| 637 | x.startswith('svn: Can\'t connect to host')): |
[email protected] | 6133c5b | 2010-08-18 18:34:48 | [diff] [blame] | 638 | return True |
| 639 | return False |
| 640 | |
[email protected] | 953586a | 2010-06-15 14:22:24 | [diff] [blame] | 641 | # Subversion client is really misbehaving with Google Code. |
| 642 | if args[0] == 'checkout': |
| 643 | # Ensure at least one file was checked out, otherwise *delete* the |
| 644 | # directory. |
| 645 | if len(file_list) == previous_list_len: |
[email protected] | 6133c5b | 2010-08-18 18:34:48 | [diff] [blame] | 646 | if not IsKnownFailure(): |
[email protected] | 953586a | 2010-06-15 14:22:24 | [diff] [blame] | 647 | # No known svn error was found, bail out. |
| 648 | raise |
[email protected] | 6133c5b | 2010-08-18 18:34:48 | [diff] [blame] | 649 | # No file were checked out, so make sure the directory is |
| 650 | # deleted in case it's messed up and try again. |
| 651 | # Warning: It's bad, it assumes args[2] is the directory |
| 652 | # argument. |
| 653 | if os.path.isdir(args[2]): |
[email protected] | dc112ac | 2013-04-24 13:00:19 | [diff] [blame] | 654 | gclient_utils.rmtree(args[2]) |
[email protected] | 953586a | 2010-06-15 14:22:24 | [diff] [blame] | 655 | else: |
| 656 | # Progress was made, convert to update since an aborted checkout |
| 657 | # is now an update. |
[email protected] | 2de1025 | 2010-02-08 01:10:39 | [diff] [blame] | 658 | args = ['update'] + args[1:] |
[email protected] | 953586a | 2010-06-15 14:22:24 | [diff] [blame] | 659 | else: |
| 660 | # It was an update or export. |
[email protected] | 6133c5b | 2010-08-18 18:34:48 | [diff] [blame] | 661 | # We enforce that some progress has been made or a known failure. |
| 662 | if len(file_list) == previous_list_len and not IsKnownFailure(): |
| 663 | # No known svn error was found and no progress, bail out. |
| 664 | raise |
[email protected] | bec588d | 2010-10-26 13:50:25 | [diff] [blame] | 665 | if retries == 10: |
[email protected] | 0350706 | 2010-10-26 00:58:27 | [diff] [blame] | 666 | raise |
[email protected] | 2aee2298 | 2010-09-03 14:15:25 | [diff] [blame] | 667 | print "Sleeping %.1f seconds and retrying...." % backoff_time |
| 668 | time.sleep(backoff_time) |
| 669 | backoff_time *= 1.3 |
[email protected] | 953586a | 2010-06-15 14:22:24 | [diff] [blame] | 670 | continue |
[email protected] | b71b67e | 2009-11-24 20:48:19 | [diff] [blame] | 671 | break |
[email protected] | d5800f1 | 2009-11-12 20:03:43 | [diff] [blame] | 672 | |
[email protected] | 5aeb7dd | 2009-11-17 18:09:01 | [diff] [blame] | 673 | @staticmethod |
[email protected] | d579fcf | 2011-12-13 20:36:03 | [diff] [blame] | 674 | def CaptureRemoteInfo(url): |
| 675 | """Returns a dictionary from the svn info output for the given url. |
| 676 | |
| 677 | Throws an exception if svn info fails. |
| 678 | """ |
| 679 | assert isinstance(url, str) |
| 680 | return SVN._CaptureInfo([url], None) |
| 681 | |
| 682 | @staticmethod |
| 683 | def CaptureLocalInfo(files, cwd): |
| 684 | """Returns a dictionary from the svn info output for the given files. |
| 685 | |
| 686 | Throws an exception if svn info fails. |
| 687 | """ |
| 688 | assert isinstance(files, (list, tuple)) |
| 689 | return SVN._CaptureInfo(files, cwd) |
| 690 | |
| 691 | @staticmethod |
| 692 | def _CaptureInfo(files, cwd): |
[email protected] | 5aeb7dd | 2009-11-17 18:09:01 | [diff] [blame] | 693 | """Returns a dictionary from the svn info output for the given file. |
[email protected] | d5800f1 | 2009-11-12 20:03:43 | [diff] [blame] | 694 | |
[email protected] | 54019f3 | 2010-09-09 13:50:11 | [diff] [blame] | 695 | Throws an exception if svn info fails.""" |
[email protected] | d25fb8f | 2011-04-07 13:40:15 | [diff] [blame] | 696 | result = {} |
[email protected] | d579fcf | 2011-12-13 20:36:03 | [diff] [blame] | 697 | info = ElementTree.XML(SVN.Capture(['info', '--xml'] + files, cwd)) |
[email protected] | ade9c59 | 2011-04-07 15:59:11 | [diff] [blame] | 698 | if info is None: |
| 699 | return result |
| 700 | entry = info.find('entry') |
[email protected] | 6f323bb | 2011-04-26 15:42:53 | [diff] [blame] | 701 | if entry is None: |
| 702 | return result |
[email protected] | ade9c59 | 2011-04-07 15:59:11 | [diff] [blame] | 703 | |
| 704 | # Use .text when the item is not optional. |
| 705 | result['Path'] = entry.attrib['path'] |
[email protected] | 7d65467 | 2012-01-05 19:07:23 | [diff] [blame] | 706 | rev = entry.attrib['revision'] |
| 707 | try: |
| 708 | result['Revision'] = int(rev) |
| 709 | except ValueError: |
| 710 | result['Revision'] = None |
[email protected] | ade9c59 | 2011-04-07 15:59:11 | [diff] [blame] | 711 | result['Node Kind'] = entry.attrib['kind'] |
| 712 | # Differs across versions. |
| 713 | if result['Node Kind'] == 'dir': |
| 714 | result['Node Kind'] = 'directory' |
| 715 | result['URL'] = entry.find('url').text |
| 716 | repository = entry.find('repository') |
| 717 | result['Repository Root'] = repository.find('root').text |
| 718 | result['UUID'] = repository.find('uuid') |
| 719 | wc_info = entry.find('wc-info') |
| 720 | if wc_info is not None: |
| 721 | result['Schedule'] = wc_info.find('schedule').text |
| 722 | result['Copied From URL'] = wc_info.find('copy-from-url') |
| 723 | result['Copied From Rev'] = wc_info.find('copy-from-rev') |
| 724 | else: |
| 725 | result['Schedule'] = None |
| 726 | result['Copied From URL'] = None |
| 727 | result['Copied From Rev'] = None |
| 728 | for key in result.keys(): |
| 729 | if isinstance(result[key], unicode): |
| 730 | # Unicode results interferes with the higher layers matching up things |
| 731 | # in the deps dictionary. |
| 732 | result[key] = result[key].encode() |
| 733 | # Automatic conversion of optional parameters. |
| 734 | result[key] = getattr(result[key], 'text', result[key]) |
[email protected] | 5aeb7dd | 2009-11-17 18:09:01 | [diff] [blame] | 735 | return result |
[email protected] | d5800f1 | 2009-11-12 20:03:43 | [diff] [blame] | 736 | |
[email protected] | 5aeb7dd | 2009-11-17 18:09:01 | [diff] [blame] | 737 | @staticmethod |
[email protected] | 54019f3 | 2010-09-09 13:50:11 | [diff] [blame] | 738 | def CaptureRevision(cwd): |
[email protected] | 5d63eb8 | 2010-03-24 23:22:09 | [diff] [blame] | 739 | """Get the base revision of a SVN repository. |
| 740 | |
| 741 | Returns: |
| 742 | Int base revision |
| 743 | """ |
[email protected] | d579fcf | 2011-12-13 20:36:03 | [diff] [blame] | 744 | return SVN.CaptureLocalInfo([], cwd).get('Revision') |
[email protected] | 5d63eb8 | 2010-03-24 23:22:09 | [diff] [blame] | 745 | |
| 746 | @staticmethod |
[email protected] | ea15cb7 | 2012-05-04 14:16:31 | [diff] [blame] | 747 | def CaptureStatus(files, cwd, no_ignore=False): |
[email protected] | 5aeb7dd | 2009-11-17 18:09:01 | [diff] [blame] | 748 | """Returns the svn 1.5 svn status emulated output. |
[email protected] | d5800f1 | 2009-11-12 20:03:43 | [diff] [blame] | 749 | |
[email protected] | 5aeb7dd | 2009-11-17 18:09:01 | [diff] [blame] | 750 | @files can be a string (one file) or a list of files. |
[email protected] | d5800f1 | 2009-11-12 20:03:43 | [diff] [blame] | 751 | |
[email protected] | 5aeb7dd | 2009-11-17 18:09:01 | [diff] [blame] | 752 | Returns an array of (status, file) tuples.""" |
| 753 | command = ["status", "--xml"] |
[email protected] | ea15cb7 | 2012-05-04 14:16:31 | [diff] [blame] | 754 | if no_ignore: |
| 755 | command.append('--no-ignore') |
[email protected] | 5aeb7dd | 2009-11-17 18:09:01 | [diff] [blame] | 756 | if not files: |
| 757 | pass |
| 758 | elif isinstance(files, basestring): |
| 759 | command.append(files) |
| 760 | else: |
| 761 | command.extend(files) |
[email protected] | d5800f1 | 2009-11-12 20:03:43 | [diff] [blame] | 762 | |
[email protected] | 5aeb7dd | 2009-11-17 18:09:01 | [diff] [blame] | 763 | status_letter = { |
| 764 | None: ' ', |
| 765 | '': ' ', |
| 766 | 'added': 'A', |
| 767 | 'conflicted': 'C', |
| 768 | 'deleted': 'D', |
| 769 | 'external': 'X', |
| 770 | 'ignored': 'I', |
| 771 | 'incomplete': '!', |
| 772 | 'merged': 'G', |
| 773 | 'missing': '!', |
| 774 | 'modified': 'M', |
| 775 | 'none': ' ', |
| 776 | 'normal': ' ', |
| 777 | 'obstructed': '~', |
| 778 | 'replaced': 'R', |
| 779 | 'unversioned': '?', |
| 780 | } |
[email protected] | d579fcf | 2011-12-13 20:36:03 | [diff] [blame] | 781 | dom = ElementTree.XML(SVN.Capture(command, cwd)) |
[email protected] | 5aeb7dd | 2009-11-17 18:09:01 | [diff] [blame] | 782 | results = [] |
[email protected] | ade9c59 | 2011-04-07 15:59:11 | [diff] [blame] | 783 | if dom is None: |
| 784 | return results |
| 785 | # /status/target/entry/(wc-status|commit|author|date) |
| 786 | for target in dom.findall('target'): |
| 787 | for entry in target.findall('entry'): |
| 788 | file_path = entry.attrib['path'] |
| 789 | wc_status = entry.find('wc-status') |
| 790 | # Emulate svn 1.5 status ouput... |
| 791 | statuses = [' '] * 7 |
| 792 | # Col 0 |
| 793 | xml_item_status = wc_status.attrib['item'] |
| 794 | if xml_item_status in status_letter: |
| 795 | statuses[0] = status_letter[xml_item_status] |
| 796 | else: |
| 797 | raise gclient_utils.Error( |
| 798 | 'Unknown item status "%s"; please implement me!' % |
| 799 | xml_item_status) |
| 800 | # Col 1 |
| 801 | xml_props_status = wc_status.attrib['props'] |
| 802 | if xml_props_status == 'modified': |
| 803 | statuses[1] = 'M' |
| 804 | elif xml_props_status == 'conflicted': |
| 805 | statuses[1] = 'C' |
| 806 | elif (not xml_props_status or xml_props_status == 'none' or |
| 807 | xml_props_status == 'normal'): |
| 808 | pass |
| 809 | else: |
| 810 | raise gclient_utils.Error( |
| 811 | 'Unknown props status "%s"; please implement me!' % |
| 812 | xml_props_status) |
| 813 | # Col 2 |
| 814 | if wc_status.attrib.get('wc-locked') == 'true': |
| 815 | statuses[2] = 'L' |
| 816 | # Col 3 |
| 817 | if wc_status.attrib.get('copied') == 'true': |
| 818 | statuses[3] = '+' |
| 819 | # Col 4 |
| 820 | if wc_status.attrib.get('switched') == 'true': |
| 821 | statuses[4] = 'S' |
| 822 | # TODO(maruel): Col 5 and 6 |
| 823 | item = (''.join(statuses), file_path) |
| 824 | results.append(item) |
[email protected] | 5aeb7dd | 2009-11-17 18:09:01 | [diff] [blame] | 825 | return results |
[email protected] | d5800f1 | 2009-11-12 20:03:43 | [diff] [blame] | 826 | |
[email protected] | 5aeb7dd | 2009-11-17 18:09:01 | [diff] [blame] | 827 | @staticmethod |
[email protected] | d579fcf | 2011-12-13 20:36:03 | [diff] [blame] | 828 | def IsMoved(filename, cwd): |
[email protected] | 5aeb7dd | 2009-11-17 18:09:01 | [diff] [blame] | 829 | """Determine if a file has been added through svn mv""" |
[email protected] | d579fcf | 2011-12-13 20:36:03 | [diff] [blame] | 830 | assert isinstance(filename, basestring) |
| 831 | return SVN.IsMovedInfo(SVN.CaptureLocalInfo([filename], cwd)) |
[email protected] | 3c55d98 | 2010-05-06 14:25:44 | [diff] [blame] | 832 | |
| 833 | @staticmethod |
| 834 | def IsMovedInfo(info): |
| 835 | """Determine if a file has been added through svn mv""" |
[email protected] | 5aeb7dd | 2009-11-17 18:09:01 | [diff] [blame] | 836 | return (info.get('Copied From URL') and |
| 837 | info.get('Copied From Rev') and |
| 838 | info.get('Schedule') == 'add') |
[email protected] | d5800f1 | 2009-11-12 20:03:43 | [diff] [blame] | 839 | |
[email protected] | 5aeb7dd | 2009-11-17 18:09:01 | [diff] [blame] | 840 | @staticmethod |
[email protected] | d579fcf | 2011-12-13 20:36:03 | [diff] [blame] | 841 | def GetFileProperty(filename, property_name, cwd): |
[email protected] | 5aeb7dd | 2009-11-17 18:09:01 | [diff] [blame] | 842 | """Returns the value of an SVN property for the given file. |
[email protected] | d5800f1 | 2009-11-12 20:03:43 | [diff] [blame] | 843 | |
[email protected] | 5aeb7dd | 2009-11-17 18:09:01 | [diff] [blame] | 844 | Args: |
[email protected] | 6e29d57 | 2010-06-04 17:32:20 | [diff] [blame] | 845 | filename: The file to check |
[email protected] | 5aeb7dd | 2009-11-17 18:09:01 | [diff] [blame] | 846 | property_name: The name of the SVN property, e.g. "svn:mime-type" |
[email protected] | d5800f1 | 2009-11-12 20:03:43 | [diff] [blame] | 847 | |
[email protected] | 5aeb7dd | 2009-11-17 18:09:01 | [diff] [blame] | 848 | Returns: |
| 849 | The value of the property, which will be the empty string if the property |
| 850 | is not set on the file. If the file is not under version control, the |
| 851 | empty string is also returned. |
| 852 | """ |
[email protected] | 54019f3 | 2010-09-09 13:50:11 | [diff] [blame] | 853 | try: |
[email protected] | d579fcf | 2011-12-13 20:36:03 | [diff] [blame] | 854 | return SVN.Capture(['propget', property_name, filename], cwd) |
[email protected] | da64d63 | 2011-09-08 17:41:15 | [diff] [blame] | 855 | except subprocess2.CalledProcessError: |
[email protected] | 54019f3 | 2010-09-09 13:50:11 | [diff] [blame] | 856 | return '' |
[email protected] | d5800f1 | 2009-11-12 20:03:43 | [diff] [blame] | 857 | |
[email protected] | 5aeb7dd | 2009-11-17 18:09:01 | [diff] [blame] | 858 | @staticmethod |
[email protected] | d579fcf | 2011-12-13 20:36:03 | [diff] [blame] | 859 | def GenerateDiff(filenames, cwd, full_move, revision): |
[email protected] | f2f9d55 | 2009-12-22 00:12:57 | [diff] [blame] | 860 | """Returns a string containing the diff for the given file list. |
| 861 | |
| 862 | The files in the list should either be absolute paths or relative to the |
| 863 | given root. If no root directory is provided, the repository root will be |
| 864 | used. |
| 865 | The diff will always use relative paths. |
| 866 | """ |
[email protected] | 00fdcb3 | 2011-02-24 01:41:02 | [diff] [blame] | 867 | assert isinstance(filenames, (list, tuple)) |
[email protected] | 0db557c | 2013-04-24 23:44:23 | [diff] [blame] | 868 | # If the user specified a custom diff command in their svn config file, |
| 869 | # then it'll be used when we do svn diff, which we don't want to happen |
| 870 | # since we want the unified diff. |
| 871 | if SVN.AssertVersion("1.7")[0]: |
| 872 | # On svn >= 1.7, the "--internal-diff" flag will solve this. |
| 873 | return SVN._GenerateDiffInternal(filenames, cwd, full_move, revision, |
| 874 | ["diff", "--internal-diff"], |
| 875 | ["diff", "--internal-diff"]) |
| 876 | else: |
| 877 | # On svn < 1.7, the "--internal-diff" flag doesn't exist. Using |
| 878 | # --diff-cmd=diff doesn't always work, since e.g. Windows cmd users may |
| 879 | # not have a "diff" executable in their path at all. So we use an empty |
| 880 | # temporary directory as the config directory, which bypasses any user |
| 881 | # settings for the diff-cmd. However, we don't pass this for the |
| 882 | # remote_safe_diff_command parameter, since when a new config-dir is |
| 883 | # specified for an svn diff against a remote URL, it triggers |
| 884 | # authentication prompts. In this case there isn't really a good |
| 885 | # alternative to svn 1.7's --internal-diff flag. |
| 886 | bogus_dir = tempfile.mkdtemp() |
| 887 | try: |
| 888 | return SVN._GenerateDiffInternal(filenames, cwd, full_move, revision, |
| 889 | ["diff", "--config-dir", bogus_dir], |
| 890 | ["diff"]) |
| 891 | finally: |
| 892 | gclient_utils.rmtree(bogus_dir) |
| 893 | |
| 894 | @staticmethod |
| 895 | def _GenerateDiffInternal(filenames, cwd, full_move, revision, diff_command, |
| 896 | remote_safe_diff_command): |
[email protected] | d579fcf | 2011-12-13 20:36:03 | [diff] [blame] | 897 | root = os.path.normcase(os.path.join(cwd, '')) |
[email protected] | f2f9d55 | 2009-12-22 00:12:57 | [diff] [blame] | 898 | def RelativePath(path, root): |
| 899 | """We must use relative paths.""" |
[email protected] | fd9cbbb | 2010-01-08 23:04:03 | [diff] [blame] | 900 | if os.path.normcase(path).startswith(root): |
[email protected] | f2f9d55 | 2009-12-22 00:12:57 | [diff] [blame] | 901 | return path[len(root):] |
| 902 | return path |
[email protected] | 0db557c | 2013-04-24 23:44:23 | [diff] [blame] | 903 | # Cleanup filenames |
| 904 | filenames = [RelativePath(f, root) for f in filenames] |
| 905 | # Get information about the modified items (files and directories) |
| 906 | data = dict((f, SVN.CaptureLocalInfo([f], root)) for f in filenames) |
| 907 | diffs = [] |
| 908 | if full_move: |
| 909 | # Eliminate modified files inside moved/copied directory. |
| 910 | for (filename, info) in data.iteritems(): |
| 911 | if SVN.IsMovedInfo(info) and info.get("Node Kind") == "directory": |
| 912 | # Remove files inside the directory. |
| 913 | filenames = [f for f in filenames |
| 914 | if not f.startswith(filename + os.path.sep)] |
| 915 | for filename in data.keys(): |
| 916 | if not filename in filenames: |
| 917 | # Remove filtered out items. |
| 918 | del data[filename] |
| 919 | else: |
| 920 | metaheaders = [] |
| 921 | for (filename, info) in data.iteritems(): |
| 922 | if SVN.IsMovedInfo(info): |
| 923 | # for now, the most common case is a head copy, |
| 924 | # so let's just encode that as a straight up cp. |
| 925 | srcurl = info.get('Copied From URL') |
| 926 | file_root = info.get('Repository Root') |
| 927 | rev = int(info.get('Copied From Rev')) |
| 928 | assert srcurl.startswith(file_root) |
| 929 | src = srcurl[len(file_root)+1:] |
| 930 | try: |
| 931 | srcinfo = SVN.CaptureRemoteInfo(srcurl) |
| 932 | except subprocess2.CalledProcessError, e: |
| 933 | if not 'Not a valid URL' in e.stderr: |
| 934 | raise |
| 935 | # Assume the file was deleted. No idea how to figure out at which |
| 936 | # revision the file was deleted. |
| 937 | srcinfo = {'Revision': rev} |
| 938 | if (srcinfo.get('Revision') != rev and |
| 939 | SVN.Capture(remote_safe_diff_command + ['-r', '%d:head' % rev, |
| 940 | srcurl], cwd)): |
| 941 | metaheaders.append("#$ svn cp -r %d %s %s " |
| 942 | "### WARNING: note non-trunk copy\n" % |
| 943 | (rev, src, filename)) |
| 944 | else: |
| 945 | metaheaders.append("#$ cp %s %s\n" % (src, |
| 946 | filename)) |
| 947 | if metaheaders: |
| 948 | diffs.append("### BEGIN SVN COPY METADATA\n") |
| 949 | diffs.extend(metaheaders) |
| 950 | diffs.append("### END SVN COPY METADATA\n") |
| 951 | # Now ready to do the actual diff. |
| 952 | for filename in sorted(data): |
| 953 | diffs.append(SVN._DiffItemInternal( |
| 954 | filename, cwd, data[filename], diff_command, full_move, revision)) |
| 955 | # Use StringIO since it can be messy when diffing a directory move with |
| 956 | # full_move=True. |
| 957 | buf = cStringIO.StringIO() |
| 958 | for d in filter(None, diffs): |
| 959 | buf.write(d) |
| 960 | result = buf.getvalue() |
| 961 | buf.close() |
| 962 | return result |
[email protected] | f2f9d55 | 2009-12-22 00:12:57 | [diff] [blame] | 963 | |
| 964 | @staticmethod |
[email protected] | 0db557c | 2013-04-24 23:44:23 | [diff] [blame] | 965 | def _DiffItemInternal(filename, cwd, info, diff_command, full_move, revision): |
[email protected] | 917ea7f | 2013-04-19 20:10:03 | [diff] [blame] | 966 | """Grabs the diff data.""" |
[email protected] | 0db557c | 2013-04-24 23:44:23 | [diff] [blame] | 967 | command = diff_command + [filename] |
[email protected] | 917ea7f | 2013-04-19 20:10:03 | [diff] [blame] | 968 | if revision: |
| 969 | command.extend(['--revision', revision]) |
| 970 | data = None |
| 971 | if SVN.IsMovedInfo(info): |
| 972 | if full_move: |
| 973 | if info.get("Node Kind") == "directory": |
| 974 | # Things become tricky here. It's a directory copy/move. We need to |
| 975 | # diff all the files inside it. |
| 976 | # This will put a lot of pressure on the heap. This is why StringIO |
| 977 | # is used and converted back into a string at the end. The reason to |
| 978 | # return a string instead of a StringIO is that StringIO.write() |
| 979 | # doesn't accept a StringIO object. *sigh*. |
| 980 | for (dirpath, dirnames, filenames) in os.walk(filename): |
| 981 | # Cleanup all files starting with a '.'. |
| 982 | for d in dirnames: |
| 983 | if d.startswith('.'): |
| 984 | dirnames.remove(d) |
| 985 | for f in filenames: |
| 986 | if f.startswith('.'): |
| 987 | filenames.remove(f) |
| 988 | for f in filenames: |
| 989 | if data is None: |
| 990 | data = cStringIO.StringIO() |
| 991 | data.write(GenFakeDiff(os.path.join(dirpath, f))) |
| 992 | if data: |
| 993 | tmp = data.getvalue() |
| 994 | data.close() |
| 995 | data = tmp |
| 996 | else: |
| 997 | data = GenFakeDiff(filename) |
| 998 | else: |
| 999 | if info.get("Node Kind") != "directory": |
| 1000 | # svn diff on a mv/cp'd file outputs nothing if there was no change. |
| 1001 | data = SVN.Capture(command, cwd) |
| 1002 | if not data: |
| 1003 | # We put in an empty Index entry so upload.py knows about them. |
| 1004 | data = "Index: %s\n" % filename.replace(os.sep, '/') |
| 1005 | # Otherwise silently ignore directories. |
| 1006 | else: |
| 1007 | if info.get("Node Kind") != "directory": |
| 1008 | # Normal simple case. |
| 1009 | try: |
| 1010 | data = SVN.Capture(command, cwd) |
| 1011 | except subprocess2.CalledProcessError: |
| 1012 | if revision: |
| 1013 | data = GenFakeDiff(filename) |
| 1014 | else: |
| 1015 | raise |
| 1016 | # Otherwise silently ignore directories. |
| 1017 | return data |
| 1018 | |
| 1019 | @staticmethod |
[email protected] | d579fcf | 2011-12-13 20:36:03 | [diff] [blame] | 1020 | def GetEmail(cwd): |
[email protected] | c78f246 | 2009-11-21 01:20:57 | [diff] [blame] | 1021 | """Retrieves the svn account which we assume is an email address.""" |
[email protected] | 54019f3 | 2010-09-09 13:50:11 | [diff] [blame] | 1022 | try: |
[email protected] | d579fcf | 2011-12-13 20:36:03 | [diff] [blame] | 1023 | infos = SVN.CaptureLocalInfo([], cwd) |
[email protected] | da64d63 | 2011-09-08 17:41:15 | [diff] [blame] | 1024 | except subprocess2.CalledProcessError: |
[email protected] | c78f246 | 2009-11-21 01:20:57 | [diff] [blame] | 1025 | return None |
| 1026 | |
| 1027 | # Should check for uuid but it is incorrectly saved for https creds. |
[email protected] | 54019f3 | 2010-09-09 13:50:11 | [diff] [blame] | 1028 | root = infos['Repository Root'] |
[email protected] | c78f246 | 2009-11-21 01:20:57 | [diff] [blame] | 1029 | realm = root.rsplit('/', 1)[0] |
[email protected] | 54019f3 | 2010-09-09 13:50:11 | [diff] [blame] | 1030 | uuid = infos['UUID'] |
[email protected] | c78f246 | 2009-11-21 01:20:57 | [diff] [blame] | 1031 | if root.startswith('https') or not uuid: |
| 1032 | regexp = re.compile(r'<%s:\d+>.*' % realm) |
| 1033 | else: |
| 1034 | regexp = re.compile(r'<%s:\d+> %s' % (realm, uuid)) |
| 1035 | if regexp is None: |
| 1036 | return None |
| 1037 | if sys.platform.startswith('win'): |
| 1038 | if not 'APPDATA' in os.environ: |
| 1039 | return None |
[email protected] | 720d9f3 | 2009-11-21 17:38:57 | [diff] [blame] | 1040 | auth_dir = os.path.join(os.environ['APPDATA'], 'Subversion', 'auth', |
| 1041 | 'svn.simple') |
[email protected] | c78f246 | 2009-11-21 01:20:57 | [diff] [blame] | 1042 | else: |
[email protected] | c349971 | 2015-11-25 01:04:01 | [diff] [blame] | 1043 | auth_dir = os.path.expanduser( |
| 1044 | os.path.join('~', '.subversion', 'auth', 'svn.simple')) |
| 1045 | if not os.path.exists(auth_dir): |
[email protected] | c78f246 | 2009-11-21 01:20:57 | [diff] [blame] | 1046 | return None |
[email protected] | c78f246 | 2009-11-21 01:20:57 | [diff] [blame] | 1047 | for credfile in os.listdir(auth_dir): |
| 1048 | cred_info = SVN.ReadSimpleAuth(os.path.join(auth_dir, credfile)) |
| 1049 | if regexp.match(cred_info.get('svn:realmstring')): |
| 1050 | return cred_info.get('username') |
| 1051 | |
| 1052 | @staticmethod |
| 1053 | def ReadSimpleAuth(filename): |
| 1054 | f = open(filename, 'r') |
| 1055 | values = {} |
[email protected] | 6e29d57 | 2010-06-04 17:32:20 | [diff] [blame] | 1056 | def ReadOneItem(item_type): |
| 1057 | m = re.match(r'%s (\d+)' % item_type, f.readline()) |
[email protected] | c78f246 | 2009-11-21 01:20:57 | [diff] [blame] | 1058 | if not m: |
| 1059 | return None |
| 1060 | data = f.read(int(m.group(1))) |
| 1061 | if f.read(1) != '\n': |
| 1062 | return None |
| 1063 | return data |
| 1064 | |
| 1065 | while True: |
| 1066 | key = ReadOneItem('K') |
| 1067 | if not key: |
| 1068 | break |
| 1069 | value = ReadOneItem('V') |
| 1070 | if not value: |
| 1071 | break |
| 1072 | values[key] = value |
| 1073 | return values |
[email protected] | 94b1ee9 | 2009-12-19 20:27:20 | [diff] [blame] | 1074 | |
| 1075 | @staticmethod |
[email protected] | d579fcf | 2011-12-13 20:36:03 | [diff] [blame] | 1076 | def GetCheckoutRoot(cwd): |
[email protected] | 94b1ee9 | 2009-12-19 20:27:20 | [diff] [blame] | 1077 | """Returns the top level directory of the current repository. |
| 1078 | |
| 1079 | The directory is returned as an absolute path. |
| 1080 | """ |
[email protected] | d579fcf | 2011-12-13 20:36:03 | [diff] [blame] | 1081 | cwd = os.path.abspath(cwd) |
[email protected] | 54019f3 | 2010-09-09 13:50:11 | [diff] [blame] | 1082 | try: |
[email protected] | d579fcf | 2011-12-13 20:36:03 | [diff] [blame] | 1083 | info = SVN.CaptureLocalInfo([], cwd) |
[email protected] | 885d6e8 | 2011-02-24 20:21:46 | [diff] [blame] | 1084 | cur_dir_repo_root = info['Repository Root'] |
| 1085 | url = info['URL'] |
[email protected] | da64d63 | 2011-09-08 17:41:15 | [diff] [blame] | 1086 | except subprocess2.CalledProcessError: |
[email protected] | 94b1ee9 | 2009-12-19 20:27:20 | [diff] [blame] | 1087 | return None |
[email protected] | 94b1ee9 | 2009-12-19 20:27:20 | [diff] [blame] | 1088 | while True: |
[email protected] | d579fcf | 2011-12-13 20:36:03 | [diff] [blame] | 1089 | parent = os.path.dirname(cwd) |
[email protected] | 54019f3 | 2010-09-09 13:50:11 | [diff] [blame] | 1090 | try: |
[email protected] | d579fcf | 2011-12-13 20:36:03 | [diff] [blame] | 1091 | info = SVN.CaptureLocalInfo([], parent) |
[email protected] | 885d6e8 | 2011-02-24 20:21:46 | [diff] [blame] | 1092 | if (info['Repository Root'] != cur_dir_repo_root or |
| 1093 | info['URL'] != os.path.dirname(url)): |
[email protected] | 54019f3 | 2010-09-09 13:50:11 | [diff] [blame] | 1094 | break |
[email protected] | 885d6e8 | 2011-02-24 20:21:46 | [diff] [blame] | 1095 | url = info['URL'] |
[email protected] | da64d63 | 2011-09-08 17:41:15 | [diff] [blame] | 1096 | except subprocess2.CalledProcessError: |
[email protected] | 94b1ee9 | 2009-12-19 20:27:20 | [diff] [blame] | 1097 | break |
[email protected] | d579fcf | 2011-12-13 20:36:03 | [diff] [blame] | 1098 | cwd = parent |
| 1099 | return GetCasedPath(cwd) |
[email protected] | 5756466 | 2010-04-14 02:35:12 | [diff] [blame] | 1100 | |
[email protected] | e5d1e61 | 2011-12-19 19:49:19 | [diff] [blame] | 1101 | @staticmethod |
| 1102 | def IsValidRevision(url): |
| 1103 | """Verifies the revision looks like an SVN revision.""" |
| 1104 | try: |
| 1105 | SVN.Capture(['info', url], cwd=None) |
| 1106 | return True |
| 1107 | except subprocess2.CalledProcessError: |
| 1108 | return False |
| 1109 | |
[email protected] | 36ac239 | 2011-10-12 16:36:11 | [diff] [blame] | 1110 | @classmethod |
| 1111 | def AssertVersion(cls, min_version): |
[email protected] | 5756466 | 2010-04-14 02:35:12 | [diff] [blame] | 1112 | """Asserts svn's version is at least min_version.""" |
[email protected] | 36ac239 | 2011-10-12 16:36:11 | [diff] [blame] | 1113 | if cls.current_version is None: |
[email protected] | 13b522c | 2012-07-20 17:16:51 | [diff] [blame] | 1114 | cls.current_version = cls.Capture(['--version', '--quiet'], None) |
[email protected] | 36ac239 | 2011-10-12 16:36:11 | [diff] [blame] | 1115 | current_version_list = map(only_int, cls.current_version.split('.')) |
[email protected] | 5756466 | 2010-04-14 02:35:12 | [diff] [blame] | 1116 | for min_ver in map(int, min_version.split('.')): |
| 1117 | ver = current_version_list.pop(0) |
| 1118 | if ver < min_ver: |
[email protected] | 36ac239 | 2011-10-12 16:36:11 | [diff] [blame] | 1119 | return (False, cls.current_version) |
[email protected] | 5756466 | 2010-04-14 02:35:12 | [diff] [blame] | 1120 | elif ver > min_ver: |
[email protected] | 36ac239 | 2011-10-12 16:36:11 | [diff] [blame] | 1121 | return (True, cls.current_version) |
| 1122 | return (True, cls.current_version) |
[email protected] | 07ab60e | 2011-02-08 21:54:00 | [diff] [blame] | 1123 | |
| 1124 | @staticmethod |
[email protected] | ea15cb7 | 2012-05-04 14:16:31 | [diff] [blame] | 1125 | def Revert(cwd, callback=None, ignore_externals=False, no_ignore=False): |
[email protected] | d579fcf | 2011-12-13 20:36:03 | [diff] [blame] | 1126 | """Reverts all svn modifications in cwd, including properties. |
[email protected] | 07ab60e | 2011-02-08 21:54:00 | [diff] [blame] | 1127 | |
| 1128 | Deletes any modified files or directory. |
| 1129 | |
| 1130 | A "svn update --revision BASE" call is required after to revive deleted |
| 1131 | files. |
| 1132 | """ |
[email protected] | ea15cb7 | 2012-05-04 14:16:31 | [diff] [blame] | 1133 | for file_status in SVN.CaptureStatus(None, cwd, no_ignore=no_ignore): |
[email protected] | d579fcf | 2011-12-13 20:36:03 | [diff] [blame] | 1134 | file_path = os.path.join(cwd, file_status[1]) |
[email protected] | 8c41512 | 2011-03-15 17:14:27 | [diff] [blame] | 1135 | if (ignore_externals and |
| 1136 | file_status[0][0] == 'X' and |
| 1137 | file_status[0][1:].isspace()): |
[email protected] | 07ab60e | 2011-02-08 21:54:00 | [diff] [blame] | 1138 | # Ignore externals. |
| 1139 | logging.info('Ignoring external %s' % file_status[1]) |
| 1140 | continue |
| 1141 | |
[email protected] | 6208757 | 2012-04-24 23:16:28 | [diff] [blame] | 1142 | # This is the case where '! L .' is returned by 'svn status'. Just |
| 1143 | # strip off the '/.'. |
| 1144 | if file_path.endswith(os.path.sep + '.'): |
| 1145 | file_path = file_path[:-2] |
| 1146 | |
[email protected] | 07ab60e | 2011-02-08 21:54:00 | [diff] [blame] | 1147 | if callback: |
| 1148 | callback(file_status) |
| 1149 | |
[email protected] | 8c41512 | 2011-03-15 17:14:27 | [diff] [blame] | 1150 | if os.path.exists(file_path): |
| 1151 | # svn revert is really stupid. It fails on inconsistent line-endings, |
| 1152 | # on switched directories, etc. So take no chance and delete everything! |
| 1153 | # In theory, it wouldn't be necessary for property-only change but then |
| 1154 | # it'd have to look for switched directories, etc so it's not worth |
| 1155 | # optimizing this use case. |
| 1156 | if os.path.isfile(file_path) or os.path.islink(file_path): |
| 1157 | logging.info('os.remove(%s)' % file_path) |
| 1158 | os.remove(file_path) |
| 1159 | elif os.path.isdir(file_path): |
[email protected] | dc112ac | 2013-04-24 13:00:19 | [diff] [blame] | 1160 | logging.info('rmtree(%s)' % file_path) |
| 1161 | gclient_utils.rmtree(file_path) |
[email protected] | 8c41512 | 2011-03-15 17:14:27 | [diff] [blame] | 1162 | else: |
| 1163 | logging.critical( |
| 1164 | ('No idea what is %s.\nYou just found a bug in gclient' |
| 1165 | ', please ping [email protected] ASAP!') % file_path) |
[email protected] | 07ab60e | 2011-02-08 21:54:00 | [diff] [blame] | 1166 | |
[email protected] | 8c41512 | 2011-03-15 17:14:27 | [diff] [blame] | 1167 | if (file_status[0][0] in ('D', 'A', '!') or |
| 1168 | not file_status[0][1:].isspace()): |
[email protected] | af45349 | 2011-03-03 21:04:09 | [diff] [blame] | 1169 | # Added, deleted file requires manual intervention and require calling |
[email protected] | 07ab60e | 2011-02-08 21:54:00 | [diff] [blame] | 1170 | # revert, like for properties. |
[email protected] | d579fcf | 2011-12-13 20:36:03 | [diff] [blame] | 1171 | if not os.path.isdir(cwd): |
[email protected] | 8b322b3 | 2011-11-01 19:05:50 | [diff] [blame] | 1172 | # '.' was deleted. It's not worth continuing. |
| 1173 | return |
[email protected] | af45349 | 2011-03-03 21:04:09 | [diff] [blame] | 1174 | try: |
[email protected] | d579fcf | 2011-12-13 20:36:03 | [diff] [blame] | 1175 | SVN.Capture(['revert', file_status[1]], cwd=cwd) |
[email protected] | da64d63 | 2011-09-08 17:41:15 | [diff] [blame] | 1176 | except subprocess2.CalledProcessError: |
[email protected] | af45349 | 2011-03-03 21:04:09 | [diff] [blame] | 1177 | if not os.path.exists(file_path): |
| 1178 | continue |
| 1179 | raise |