maruel@chromium.org | bec588d | 2010-10-26 13:50:25 +0000 | [diff] [blame] | 1 | # Copyright (c) 2010 The Chromium Authors. All rights reserved. |
maruel@chromium.org | d5800f1 | 2009-11-12 20:03:43 +0000 | [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 | |
maruel@chromium.org | 5aeb7dd | 2009-11-17 18:09:01 +0000 | [diff] [blame] | 5 | """SCM-specific utility classes.""" |
maruel@chromium.org | d5800f1 | 2009-11-12 20:03:43 +0000 | [diff] [blame] | 6 | |
maruel@chromium.org | 3c55d98 | 2010-05-06 14:25:44 +0000 | [diff] [blame] | 7 | import cStringIO |
maruel@chromium.org | fd9cbbb | 2010-01-08 23:04:03 +0000 | [diff] [blame] | 8 | import glob |
maruel@chromium.org | 07ab60e | 2011-02-08 21:54:00 +0000 | [diff] [blame] | 9 | import logging |
maruel@chromium.org | d5800f1 | 2009-11-12 20:03:43 +0000 | [diff] [blame] | 10 | import os |
| 11 | import re |
maruel@chromium.org | f2f9d55 | 2009-12-22 00:12:57 +0000 | [diff] [blame] | 12 | import shutil |
maruel@chromium.org | d5800f1 | 2009-11-12 20:03:43 +0000 | [diff] [blame] | 13 | import subprocess |
| 14 | import sys |
maruel@chromium.org | 5aeb7dd | 2009-11-17 18:09:01 +0000 | [diff] [blame] | 15 | import tempfile |
maruel@chromium.org | fd87617 | 2010-04-30 14:01:05 +0000 | [diff] [blame] | 16 | import time |
maruel@chromium.org | d5800f1 | 2009-11-12 20:03:43 +0000 | [diff] [blame] | 17 | import xml.dom.minidom |
| 18 | |
| 19 | import gclient_utils |
| 20 | |
maruel@chromium.org | b24a8e1 | 2009-12-22 13:45:48 +0000 | [diff] [blame] | 21 | def ValidateEmail(email): |
maruel@chromium.org | 6e29d57 | 2010-06-04 17:32:20 +0000 | [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) |
maruel@chromium.org | b24a8e1 | 2009-12-22 13:45:48 +0000 | [diff] [blame] | 24 | |
maruel@chromium.org | d5800f1 | 2009-11-12 20:03:43 +0000 | [diff] [blame] | 25 | |
maruel@chromium.org | fd9cbbb | 2010-01-08 23:04:03 +0000 | [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 | |
maruel@chromium.org | 3c55d98 | 2010-05-06 14:25:44 +0000 | [diff] [blame] | 46 | def GenFakeDiff(filename): |
| 47 | """Generates a fake diff from a file.""" |
| 48 | file_content = gclient_utils.FileRead(filename, 'rb').splitlines(True) |
maruel@chromium.org | c6d170e | 2010-06-03 00:06:00 +0000 | [diff] [blame] | 49 | filename = filename.replace(os.sep, '/') |
maruel@chromium.org | 3c55d98 | 2010-05-06 14:25:44 +0000 | [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 | |
maruel@chromium.org | 5c8c6de | 2011-03-18 16:20:18 +0000 | [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' |
| 75 | elif os.path.isdir(os.path.join(root, '.svn')): |
| 76 | return 'git' |
| 77 | else: |
| 78 | if (0 == subprocess.call( |
| 79 | ['git', 'rev-parse', '--show-cdup'], |
| 80 | stdout=subprocess.PIPE, cwd=root)): |
| 81 | return 'git' |
| 82 | else: |
| 83 | return None |
| 84 | |
| 85 | |
maruel@chromium.org | 5aeb7dd | 2009-11-17 18:09:01 +0000 | [diff] [blame] | 86 | class GIT(object): |
maruel@chromium.org | 5aeb7dd | 2009-11-17 18:09:01 +0000 | [diff] [blame] | 87 | @staticmethod |
maruel@chromium.org | ad80e3b | 2010-09-09 14:18:28 +0000 | [diff] [blame] | 88 | def Capture(args, **kwargs): |
| 89 | return gclient_utils.CheckCall(['git'] + args, print_error=False, |
| 90 | **kwargs)[0] |
maruel@chromium.org | d5800f1 | 2009-11-12 20:03:43 +0000 | [diff] [blame] | 91 | |
maruel@chromium.org | 5aeb7dd | 2009-11-17 18:09:01 +0000 | [diff] [blame] | 92 | @staticmethod |
msb@chromium.org | 786fb68 | 2010-06-02 15:16:23 +0000 | [diff] [blame] | 93 | def CaptureStatus(files, upstream_branch=None): |
maruel@chromium.org | 5aeb7dd | 2009-11-17 18:09:01 +0000 | [diff] [blame] | 94 | """Returns git status. |
maruel@chromium.org | d5800f1 | 2009-11-12 20:03:43 +0000 | [diff] [blame] | 95 | |
maruel@chromium.org | 5aeb7dd | 2009-11-17 18:09:01 +0000 | [diff] [blame] | 96 | @files can be a string (one file) or a list of files. |
maruel@chromium.org | d5800f1 | 2009-11-12 20:03:43 +0000 | [diff] [blame] | 97 | |
maruel@chromium.org | 5aeb7dd | 2009-11-17 18:09:01 +0000 | [diff] [blame] | 98 | Returns an array of (status, file) tuples.""" |
msb@chromium.org | 786fb68 | 2010-06-02 15:16:23 +0000 | [diff] [blame] | 99 | if upstream_branch is None: |
| 100 | upstream_branch = GIT.GetUpstreamBranch(os.getcwd()) |
| 101 | if upstream_branch is None: |
maruel@chromium.org | ad80e3b | 2010-09-09 14:18:28 +0000 | [diff] [blame] | 102 | raise gclient_utils.Error('Cannot determine upstream branch') |
| 103 | command = ['diff', '--name-status', '-r', '%s...' % upstream_branch] |
maruel@chromium.org | 5aeb7dd | 2009-11-17 18:09:01 +0000 | [diff] [blame] | 104 | if not files: |
| 105 | pass |
| 106 | elif isinstance(files, basestring): |
| 107 | command.append(files) |
| 108 | else: |
| 109 | command.extend(files) |
maruel@chromium.org | ad80e3b | 2010-09-09 14:18:28 +0000 | [diff] [blame] | 110 | status = GIT.Capture(command).rstrip() |
maruel@chromium.org | 5aeb7dd | 2009-11-17 18:09:01 +0000 | [diff] [blame] | 111 | results = [] |
| 112 | if status: |
maruel@chromium.org | ad80e3b | 2010-09-09 14:18:28 +0000 | [diff] [blame] | 113 | for statusline in status.splitlines(): |
maruel@chromium.org | cc1614b | 2010-09-20 17:13:17 +0000 | [diff] [blame] | 114 | # 3-way merges can cause the status can be 'MMM' instead of 'M'. This |
| 115 | # can happen when the user has 2 local branches and he diffs between |
| 116 | # these 2 branches instead diffing to upstream. |
| 117 | m = re.match('^(\w)+\t(.+)$', statusline) |
maruel@chromium.org | 5aeb7dd | 2009-11-17 18:09:01 +0000 | [diff] [blame] | 118 | if not m: |
maruel@chromium.org | ad80e3b | 2010-09-09 14:18:28 +0000 | [diff] [blame] | 119 | raise gclient_utils.Error( |
| 120 | 'status currently unsupported: %s' % statusline) |
maruel@chromium.org | cc1614b | 2010-09-20 17:13:17 +0000 | [diff] [blame] | 121 | # Only grab the first letter. |
| 122 | results.append(('%s ' % m.group(1)[0], m.group(2))) |
maruel@chromium.org | 5aeb7dd | 2009-11-17 18:09:01 +0000 | [diff] [blame] | 123 | return results |
maruel@chromium.org | d5800f1 | 2009-11-12 20:03:43 +0000 | [diff] [blame] | 124 | |
maruel@chromium.org | c78f246 | 2009-11-21 01:20:57 +0000 | [diff] [blame] | 125 | @staticmethod |
maruel@chromium.org | ad80e3b | 2010-09-09 14:18:28 +0000 | [diff] [blame] | 126 | def GetEmail(cwd): |
maruel@chromium.org | c78f246 | 2009-11-21 01:20:57 +0000 | [diff] [blame] | 127 | """Retrieves the user email address if known.""" |
| 128 | # We could want to look at the svn cred when it has a svn remote but it |
| 129 | # should be fine for now, users should simply configure their git settings. |
maruel@chromium.org | ad80e3b | 2010-09-09 14:18:28 +0000 | [diff] [blame] | 130 | try: |
| 131 | return GIT.Capture(['config', 'user.email'], cwd=cwd).strip() |
| 132 | except gclient_utils.CheckCallError: |
| 133 | return '' |
maruel@chromium.org | f2f9d55 | 2009-12-22 00:12:57 +0000 | [diff] [blame] | 134 | |
| 135 | @staticmethod |
| 136 | def ShortBranchName(branch): |
| 137 | """Converts a name like 'refs/heads/foo' to just 'foo'.""" |
| 138 | return branch.replace('refs/heads/', '') |
| 139 | |
| 140 | @staticmethod |
| 141 | def GetBranchRef(cwd): |
maruel@chromium.org | b24a8e1 | 2009-12-22 13:45:48 +0000 | [diff] [blame] | 142 | """Returns the full branch reference, e.g. 'refs/heads/master'.""" |
maruel@chromium.org | ad80e3b | 2010-09-09 14:18:28 +0000 | [diff] [blame] | 143 | return GIT.Capture(['symbolic-ref', 'HEAD'], cwd=cwd).strip() |
maruel@chromium.org | f2f9d55 | 2009-12-22 00:12:57 +0000 | [diff] [blame] | 144 | |
| 145 | @staticmethod |
maruel@chromium.org | b24a8e1 | 2009-12-22 13:45:48 +0000 | [diff] [blame] | 146 | def GetBranch(cwd): |
| 147 | """Returns the short branch name, e.g. 'master'.""" |
maruel@chromium.org | c308a74 | 2009-12-22 18:29:33 +0000 | [diff] [blame] | 148 | return GIT.ShortBranchName(GIT.GetBranchRef(cwd)) |
maruel@chromium.org | b24a8e1 | 2009-12-22 13:45:48 +0000 | [diff] [blame] | 149 | |
| 150 | @staticmethod |
maruel@chromium.org | f2f9d55 | 2009-12-22 00:12:57 +0000 | [diff] [blame] | 151 | def IsGitSvn(cwd): |
| 152 | """Returns true if this repo looks like it's using git-svn.""" |
| 153 | # If you have any "svn-remote.*" config keys, we think you're using svn. |
| 154 | try: |
maruel@chromium.org | ad80e3b | 2010-09-09 14:18:28 +0000 | [diff] [blame] | 155 | GIT.Capture(['config', '--get-regexp', r'^svn-remote\.'], cwd=cwd) |
maruel@chromium.org | f2f9d55 | 2009-12-22 00:12:57 +0000 | [diff] [blame] | 156 | return True |
| 157 | except gclient_utils.CheckCallError: |
| 158 | return False |
| 159 | |
| 160 | @staticmethod |
bauerb@chromium.org | 866276c | 2011-03-18 20:09:31 +0000 | [diff] [blame] | 161 | def MatchSvnGlob(url, base_url, glob_spec, allow_wildcards): |
| 162 | """Return the corresponding git ref if |base_url| together with |glob_spec| |
| 163 | matches the full |url|. |
| 164 | |
| 165 | If |allow_wildcards| is true, |glob_spec| can contain wildcards (see below). |
| 166 | """ |
| 167 | fetch_suburl, as_ref = glob_spec.split(':') |
| 168 | if allow_wildcards: |
| 169 | glob_match = re.match('(.+/)?(\*|{[^/]*})(/.+)?', fetch_suburl) |
| 170 | if glob_match: |
| 171 | # Parse specs like "branches/*/src:refs/remotes/svn/*" or |
| 172 | # "branches/{472,597,648}/src:refs/remotes/svn/*". |
| 173 | branch_re = re.escape(base_url) |
| 174 | if glob_match.group(1): |
| 175 | branch_re += '/' + re.escape(glob_match.group(1)) |
| 176 | wildcard = glob_match.group(2) |
| 177 | if wildcard == '*': |
| 178 | branch_re += '([^/]*)' |
| 179 | else: |
| 180 | # Escape and replace surrounding braces with parentheses and commas |
| 181 | # with pipe symbols. |
| 182 | wildcard = re.escape(wildcard) |
| 183 | wildcard = re.sub('^\\\\{', '(', wildcard) |
| 184 | wildcard = re.sub('\\\\,', '|', wildcard) |
| 185 | wildcard = re.sub('\\\\}$', ')', wildcard) |
| 186 | branch_re += wildcard |
| 187 | if glob_match.group(3): |
| 188 | branch_re += re.escape(glob_match.group(3)) |
| 189 | match = re.match(branch_re, url) |
| 190 | if match: |
| 191 | return re.sub('\*$', match.group(1), as_ref) |
| 192 | |
| 193 | # Parse specs like "trunk/src:refs/remotes/origin/trunk". |
| 194 | if fetch_suburl: |
| 195 | full_url = base_url + '/' + fetch_suburl |
| 196 | else: |
| 197 | full_url = base_url |
| 198 | if full_url == url: |
| 199 | return as_ref |
| 200 | return None |
| 201 | |
| 202 | @staticmethod |
maruel@chromium.org | f2f9d55 | 2009-12-22 00:12:57 +0000 | [diff] [blame] | 203 | def GetSVNBranch(cwd): |
| 204 | """Returns the svn branch name if found.""" |
| 205 | # Try to figure out which remote branch we're based on. |
| 206 | # Strategy: |
bauerb@chromium.org | ade368c | 2011-03-01 08:57:50 +0000 | [diff] [blame] | 207 | # 1) iterate through our branch history and find the svn URL. |
| 208 | # 2) find the svn-remote that fetches from the URL. |
maruel@chromium.org | f2f9d55 | 2009-12-22 00:12:57 +0000 | [diff] [blame] | 209 | |
| 210 | # regexp matching the git-svn line that contains the URL. |
| 211 | git_svn_re = re.compile(r'^\s*git-svn-id: (\S+)@', re.MULTILINE) |
| 212 | |
bauerb@chromium.org | ade368c | 2011-03-01 08:57:50 +0000 | [diff] [blame] | 213 | # We don't want to go through all of history, so read a line from the |
| 214 | # pipe at a time. |
| 215 | # The -100 is an arbitrary limit so we don't search forever. |
| 216 | cmd = ['git', 'log', '-100', '--pretty=medium'] |
| 217 | proc = gclient_utils.Popen(cmd, stdout=subprocess.PIPE) |
| 218 | for line in proc.stdout: |
| 219 | match = git_svn_re.match(line) |
| 220 | if match: |
| 221 | url = match.group(1) |
| 222 | proc.stdout.close() # Cut pipe. |
| 223 | break |
maruel@chromium.org | f2f9d55 | 2009-12-22 00:12:57 +0000 | [diff] [blame] | 224 | |
bauerb@chromium.org | ade368c | 2011-03-01 08:57:50 +0000 | [diff] [blame] | 225 | if url: |
| 226 | svn_remote_re = re.compile(r'^svn-remote\.([^.]+)\.url (.*)$') |
| 227 | remotes = GIT.Capture(['config', '--get-regexp', |
| 228 | r'^svn-remote\..*\.url'], cwd=cwd).splitlines() |
| 229 | for remote in remotes: |
| 230 | match = svn_remote_re.match(remote) |
maruel@chromium.org | f2f9d55 | 2009-12-22 00:12:57 +0000 | [diff] [blame] | 231 | if match: |
bauerb@chromium.org | ade368c | 2011-03-01 08:57:50 +0000 | [diff] [blame] | 232 | remote = match.group(1) |
| 233 | base_url = match.group(2) |
bauerb@chromium.org | 866276c | 2011-03-18 20:09:31 +0000 | [diff] [blame] | 234 | try: |
| 235 | fetch_spec = GIT.Capture( |
| 236 | ['config', 'svn-remote.%s.fetch' % remote], |
| 237 | cwd=cwd).strip() |
| 238 | branch = GIT.MatchSvnGlob(url, base_url, fetch_spec, False) |
| 239 | except gclient_utils.CheckCallError: |
| 240 | branch = None |
| 241 | if branch: |
| 242 | return branch |
| 243 | try: |
| 244 | branch_spec = GIT.Capture( |
| 245 | ['config', 'svn-remote.%s.branches' % remote], |
| 246 | cwd=cwd).strip() |
| 247 | branch = GIT.MatchSvnGlob(url, base_url, branch_spec, True) |
| 248 | except gclient_utils.CheckCallError: |
| 249 | branch = None |
| 250 | if branch: |
| 251 | return branch |
| 252 | try: |
| 253 | tag_spec = GIT.Capture( |
| 254 | ['config', 'svn-remote.%s.tags' % remote], |
| 255 | cwd=cwd).strip() |
| 256 | branch = GIT.MatchSvnGlob(url, base_url, tag_spec, True) |
| 257 | except gclient_utils.CheckCallError: |
| 258 | branch = None |
| 259 | if branch: |
| 260 | return branch |
maruel@chromium.org | f2f9d55 | 2009-12-22 00:12:57 +0000 | [diff] [blame] | 261 | |
| 262 | @staticmethod |
| 263 | def FetchUpstreamTuple(cwd): |
| 264 | """Returns a tuple containg remote and remote ref, |
| 265 | e.g. 'origin', 'refs/heads/master' |
maruel@chromium.org | 81e012c | 2010-04-29 16:07:24 +0000 | [diff] [blame] | 266 | Tries to be intelligent and understand git-svn. |
maruel@chromium.org | f2f9d55 | 2009-12-22 00:12:57 +0000 | [diff] [blame] | 267 | """ |
| 268 | remote = '.' |
maruel@chromium.org | b24a8e1 | 2009-12-22 13:45:48 +0000 | [diff] [blame] | 269 | branch = GIT.GetBranch(cwd) |
maruel@chromium.org | ad80e3b | 2010-09-09 14:18:28 +0000 | [diff] [blame] | 270 | try: |
| 271 | upstream_branch = GIT.Capture( |
| 272 | ['config', 'branch.%s.merge' % branch], cwd=cwd).strip() |
| 273 | except gclient_utils.Error: |
| 274 | upstream_branch = None |
maruel@chromium.org | f2f9d55 | 2009-12-22 00:12:57 +0000 | [diff] [blame] | 275 | if upstream_branch: |
maruel@chromium.org | ad80e3b | 2010-09-09 14:18:28 +0000 | [diff] [blame] | 276 | try: |
| 277 | remote = GIT.Capture( |
| 278 | ['config', 'branch.%s.remote' % branch], cwd=cwd).strip() |
| 279 | except gclient_utils.Error: |
| 280 | pass |
maruel@chromium.org | f2f9d55 | 2009-12-22 00:12:57 +0000 | [diff] [blame] | 281 | else: |
bauerb@chromium.org | ade368c | 2011-03-01 08:57:50 +0000 | [diff] [blame] | 282 | try: |
| 283 | upstream_branch = GIT.Capture( |
| 284 | ['config', 'rietveld.upstream-branch'], cwd=cwd).strip() |
| 285 | except gclient_utils.Error: |
| 286 | upstream_branch = None |
| 287 | if upstream_branch: |
| 288 | try: |
| 289 | remote = GIT.Capture( |
| 290 | ['config', 'rietveld.upstream-remote'], cwd=cwd).strip() |
| 291 | except gclient_utils.Error: |
| 292 | pass |
maruel@chromium.org | 81e012c | 2010-04-29 16:07:24 +0000 | [diff] [blame] | 293 | else: |
bauerb@chromium.org | ade368c | 2011-03-01 08:57:50 +0000 | [diff] [blame] | 294 | # Fall back on trying a git-svn upstream branch. |
| 295 | if GIT.IsGitSvn(cwd): |
| 296 | upstream_branch = GIT.GetSVNBranch(cwd) |
maruel@chromium.org | a630bd7 | 2010-04-29 23:32:34 +0000 | [diff] [blame] | 297 | else: |
bauerb@chromium.org | ade368c | 2011-03-01 08:57:50 +0000 | [diff] [blame] | 298 | # Else, try to guess the origin remote. |
| 299 | remote_branches = GIT.Capture(['branch', '-r'], cwd=cwd).split() |
| 300 | if 'origin/master' in remote_branches: |
| 301 | # Fall back on origin/master if it exits. |
| 302 | remote = 'origin' |
| 303 | upstream_branch = 'refs/heads/master' |
| 304 | elif 'origin/trunk' in remote_branches: |
| 305 | # Fall back on origin/trunk if it exists. Generally a shared |
| 306 | # git-svn clone |
| 307 | remote = 'origin' |
| 308 | upstream_branch = 'refs/heads/trunk' |
| 309 | else: |
| 310 | # Give up. |
| 311 | remote = None |
| 312 | upstream_branch = None |
maruel@chromium.org | f2f9d55 | 2009-12-22 00:12:57 +0000 | [diff] [blame] | 313 | return remote, upstream_branch |
| 314 | |
| 315 | @staticmethod |
maruel@chromium.org | 81e012c | 2010-04-29 16:07:24 +0000 | [diff] [blame] | 316 | def GetUpstreamBranch(cwd): |
maruel@chromium.org | f2f9d55 | 2009-12-22 00:12:57 +0000 | [diff] [blame] | 317 | """Gets the current branch's upstream branch.""" |
| 318 | remote, upstream_branch = GIT.FetchUpstreamTuple(cwd) |
maruel@chromium.org | a630bd7 | 2010-04-29 23:32:34 +0000 | [diff] [blame] | 319 | if remote != '.' and upstream_branch: |
maruel@chromium.org | f2f9d55 | 2009-12-22 00:12:57 +0000 | [diff] [blame] | 320 | upstream_branch = upstream_branch.replace('heads', 'remotes/' + remote) |
| 321 | return upstream_branch |
| 322 | |
| 323 | @staticmethod |
maruel@chromium.org | 8ede00e | 2010-01-12 14:35:28 +0000 | [diff] [blame] | 324 | def GenerateDiff(cwd, branch=None, branch_head='HEAD', full_move=False, |
| 325 | files=None): |
maruel@chromium.org | a937176 | 2009-12-22 18:27:38 +0000 | [diff] [blame] | 326 | """Diffs against the upstream branch or optionally another branch. |
| 327 | |
| 328 | full_move means that move or copy operations should completely recreate the |
| 329 | files, usually in the prospect to apply the patch for a try job.""" |
maruel@chromium.org | f2f9d55 | 2009-12-22 00:12:57 +0000 | [diff] [blame] | 330 | if not branch: |
maruel@chromium.org | 81e012c | 2010-04-29 16:07:24 +0000 | [diff] [blame] | 331 | branch = GIT.GetUpstreamBranch(cwd) |
evan@chromium.org | 400f3e7 | 2010-05-19 14:23:36 +0000 | [diff] [blame] | 332 | command = ['diff', '-p', '--no-prefix', '--no-ext-diff', |
| 333 | branch + "..." + branch_head] |
maruel@chromium.org | a937176 | 2009-12-22 18:27:38 +0000 | [diff] [blame] | 334 | if not full_move: |
| 335 | command.append('-C') |
maruel@chromium.org | 8ede00e | 2010-01-12 14:35:28 +0000 | [diff] [blame] | 336 | # TODO(maruel): --binary support. |
| 337 | if files: |
| 338 | command.append('--') |
| 339 | command.extend(files) |
maruel@chromium.org | ad80e3b | 2010-09-09 14:18:28 +0000 | [diff] [blame] | 340 | diff = GIT.Capture(command, cwd=cwd).splitlines(True) |
maruel@chromium.org | f2f9d55 | 2009-12-22 00:12:57 +0000 | [diff] [blame] | 341 | for i in range(len(diff)): |
| 342 | # In the case of added files, replace /dev/null with the path to the |
| 343 | # file being added. |
| 344 | if diff[i].startswith('--- /dev/null'): |
| 345 | diff[i] = '--- %s' % diff[i+1][4:] |
| 346 | return ''.join(diff) |
maruel@chromium.org | c78f246 | 2009-11-21 01:20:57 +0000 | [diff] [blame] | 347 | |
maruel@chromium.org | b24a8e1 | 2009-12-22 13:45:48 +0000 | [diff] [blame] | 348 | @staticmethod |
maruel@chromium.org | 8ede00e | 2010-01-12 14:35:28 +0000 | [diff] [blame] | 349 | def GetDifferentFiles(cwd, branch=None, branch_head='HEAD'): |
| 350 | """Returns the list of modified files between two branches.""" |
| 351 | if not branch: |
maruel@chromium.org | 81e012c | 2010-04-29 16:07:24 +0000 | [diff] [blame] | 352 | branch = GIT.GetUpstreamBranch(cwd) |
bauerb@chromium.org | 838f0f2 | 2010-04-09 17:02:50 +0000 | [diff] [blame] | 353 | command = ['diff', '--name-only', branch + "..." + branch_head] |
maruel@chromium.org | ad80e3b | 2010-09-09 14:18:28 +0000 | [diff] [blame] | 354 | return GIT.Capture(command, cwd=cwd).splitlines(False) |
maruel@chromium.org | 8ede00e | 2010-01-12 14:35:28 +0000 | [diff] [blame] | 355 | |
| 356 | @staticmethod |
maruel@chromium.org | b24a8e1 | 2009-12-22 13:45:48 +0000 | [diff] [blame] | 357 | def GetPatchName(cwd): |
| 358 | """Constructs a name for this patch.""" |
maruel@chromium.org | ad80e3b | 2010-09-09 14:18:28 +0000 | [diff] [blame] | 359 | short_sha = GIT.Capture(['rev-parse', '--short=4', 'HEAD'], cwd=cwd).strip() |
maruel@chromium.org | 862ff8e | 2010-08-06 15:29:16 +0000 | [diff] [blame] | 360 | return "%s#%s" % (GIT.GetBranch(cwd), short_sha) |
maruel@chromium.org | b24a8e1 | 2009-12-22 13:45:48 +0000 | [diff] [blame] | 361 | |
| 362 | @staticmethod |
maruel@chromium.org | ad80e3b | 2010-09-09 14:18:28 +0000 | [diff] [blame] | 363 | def GetCheckoutRoot(cwd): |
maruel@chromium.org | 01d8c1d | 2010-01-07 01:56:59 +0000 | [diff] [blame] | 364 | """Returns the top level directory of a git checkout as an absolute path. |
maruel@chromium.org | b24a8e1 | 2009-12-22 13:45:48 +0000 | [diff] [blame] | 365 | """ |
maruel@chromium.org | ad80e3b | 2010-09-09 14:18:28 +0000 | [diff] [blame] | 366 | root = GIT.Capture(['rev-parse', '--show-cdup'], cwd=cwd).strip() |
| 367 | return os.path.abspath(os.path.join(cwd, root)) |
maruel@chromium.org | b24a8e1 | 2009-12-22 13:45:48 +0000 | [diff] [blame] | 368 | |
maruel@chromium.org | d0f854a | 2010-03-11 19:35:53 +0000 | [diff] [blame] | 369 | @staticmethod |
| 370 | def AssertVersion(min_version): |
| 371 | """Asserts git's version is at least min_version.""" |
| 372 | def only_int(val): |
| 373 | if val.isdigit(): |
| 374 | return int(val) |
| 375 | else: |
| 376 | return 0 |
maruel@chromium.org | ad80e3b | 2010-09-09 14:18:28 +0000 | [diff] [blame] | 377 | current_version = GIT.Capture(['--version']).split()[-1] |
maruel@chromium.org | d0f854a | 2010-03-11 19:35:53 +0000 | [diff] [blame] | 378 | current_version_list = map(only_int, current_version.split('.')) |
| 379 | for min_ver in map(int, min_version.split('.')): |
| 380 | ver = current_version_list.pop(0) |
| 381 | if ver < min_ver: |
| 382 | return (False, current_version) |
| 383 | elif ver > min_ver: |
| 384 | return (True, current_version) |
| 385 | return (True, current_version) |
| 386 | |
maruel@chromium.org | d5800f1 | 2009-11-12 20:03:43 +0000 | [diff] [blame] | 387 | |
maruel@chromium.org | 5aeb7dd | 2009-11-17 18:09:01 +0000 | [diff] [blame] | 388 | class SVN(object): |
tony@chromium.org | 5756466 | 2010-04-14 02:35:12 +0000 | [diff] [blame] | 389 | current_version = None |
maruel@chromium.org | d5800f1 | 2009-11-12 20:03:43 +0000 | [diff] [blame] | 390 | |
maruel@chromium.org | 5aeb7dd | 2009-11-17 18:09:01 +0000 | [diff] [blame] | 391 | @staticmethod |
maruel@chromium.org | 54019f3 | 2010-09-09 13:50:11 +0000 | [diff] [blame] | 392 | def Capture(args, **kwargs): |
| 393 | """Always redirect stderr. |
maruel@chromium.org | d5800f1 | 2009-11-12 20:03:43 +0000 | [diff] [blame] | 394 | |
maruel@chromium.org | 54019f3 | 2010-09-09 13:50:11 +0000 | [diff] [blame] | 395 | Throws an exception if non-0 is returned.""" |
| 396 | return gclient_utils.CheckCall(['svn'] + args, print_error=False, |
| 397 | **kwargs)[0] |
maruel@chromium.org | d5800f1 | 2009-11-12 20:03:43 +0000 | [diff] [blame] | 398 | |
maruel@chromium.org | 5aeb7dd | 2009-11-17 18:09:01 +0000 | [diff] [blame] | 399 | @staticmethod |
maruel@chromium.org | 2b9aa8e | 2010-08-25 20:01:42 +0000 | [diff] [blame] | 400 | def RunAndGetFileList(verbose, args, cwd, file_list, stdout=None): |
maruel@chromium.org | 5aeb7dd | 2009-11-17 18:09:01 +0000 | [diff] [blame] | 401 | """Runs svn checkout, update, or status, output to stdout. |
maruel@chromium.org | d5800f1 | 2009-11-12 20:03:43 +0000 | [diff] [blame] | 402 | |
maruel@chromium.org | 5aeb7dd | 2009-11-17 18:09:01 +0000 | [diff] [blame] | 403 | The first item in args must be either "checkout", "update", or "status". |
maruel@chromium.org | d5800f1 | 2009-11-12 20:03:43 +0000 | [diff] [blame] | 404 | |
maruel@chromium.org | 5aeb7dd | 2009-11-17 18:09:01 +0000 | [diff] [blame] | 405 | svn's stdout is parsed to collect a list of files checked out or updated. |
| 406 | These files are appended to file_list. svn's stdout is also printed to |
| 407 | sys.stdout as in Run. |
maruel@chromium.org | d5800f1 | 2009-11-12 20:03:43 +0000 | [diff] [blame] | 408 | |
maruel@chromium.org | 5aeb7dd | 2009-11-17 18:09:01 +0000 | [diff] [blame] | 409 | Args: |
maruel@chromium.org | 0380707 | 2010-08-16 17:18:44 +0000 | [diff] [blame] | 410 | verbose: If True, uses verbose output |
maruel@chromium.org | 5aeb7dd | 2009-11-17 18:09:01 +0000 | [diff] [blame] | 411 | args: A sequence of command line parameters to be passed to svn. |
maruel@chromium.org | 2b9aa8e | 2010-08-25 20:01:42 +0000 | [diff] [blame] | 412 | cwd: The directory where svn is to be run. |
maruel@chromium.org | d5800f1 | 2009-11-12 20:03:43 +0000 | [diff] [blame] | 413 | |
maruel@chromium.org | 5aeb7dd | 2009-11-17 18:09:01 +0000 | [diff] [blame] | 414 | Raises: |
| 415 | Error: An error occurred while running the svn command. |
| 416 | """ |
maruel@chromium.org | 2b9aa8e | 2010-08-25 20:01:42 +0000 | [diff] [blame] | 417 | stdout = stdout or sys.stdout |
maruel@chromium.org | d5800f1 | 2009-11-12 20:03:43 +0000 | [diff] [blame] | 418 | |
maruel@chromium.org | 5aeb7dd | 2009-11-17 18:09:01 +0000 | [diff] [blame] | 419 | # svn update and svn checkout use the same pattern: the first three columns |
| 420 | # are for file status, property status, and lock status. This is followed |
| 421 | # by two spaces, and then the path to the file. |
| 422 | update_pattern = '^... (.*)$' |
maruel@chromium.org | d5800f1 | 2009-11-12 20:03:43 +0000 | [diff] [blame] | 423 | |
maruel@chromium.org | 5aeb7dd | 2009-11-17 18:09:01 +0000 | [diff] [blame] | 424 | # The first three columns of svn status are the same as for svn update and |
| 425 | # svn checkout. The next three columns indicate addition-with-history, |
| 426 | # switch, and remote lock status. This is followed by one space, and then |
| 427 | # the path to the file. |
| 428 | status_pattern = '^...... (.*)$' |
maruel@chromium.org | d5800f1 | 2009-11-12 20:03:43 +0000 | [diff] [blame] | 429 | |
maruel@chromium.org | 5aeb7dd | 2009-11-17 18:09:01 +0000 | [diff] [blame] | 430 | # args[0] must be a supported command. This will blow up if it's something |
| 431 | # else, which is good. Note that the patterns are only effective when |
| 432 | # these commands are used in their ordinary forms, the patterns are invalid |
| 433 | # for "svn status --show-updates", for example. |
| 434 | pattern = { |
| 435 | 'checkout': update_pattern, |
| 436 | 'status': status_pattern, |
| 437 | 'update': update_pattern, |
| 438 | }[args[0]] |
maruel@chromium.org | 5aeb7dd | 2009-11-17 18:09:01 +0000 | [diff] [blame] | 439 | compiled_pattern = re.compile(pattern) |
maruel@chromium.org | b71b67e | 2009-11-24 20:48:19 +0000 | [diff] [blame] | 440 | # Place an upper limit. |
cbentzel@chromium.org | 2aee229 | 2010-09-03 14:15:25 +0000 | [diff] [blame] | 441 | backoff_time = 5 |
maruel@chromium.org | bec588d | 2010-10-26 13:50:25 +0000 | [diff] [blame] | 442 | retries = 0 |
maruel@chromium.org | 0350706 | 2010-10-26 00:58:27 +0000 | [diff] [blame] | 443 | while True: |
maruel@chromium.org | bec588d | 2010-10-26 13:50:25 +0000 | [diff] [blame] | 444 | retries += 1 |
maruel@chromium.org | b71b67e | 2009-11-24 20:48:19 +0000 | [diff] [blame] | 445 | previous_list_len = len(file_list) |
| 446 | failure = [] |
maruel@chromium.org | 54d1f1a | 2010-01-08 19:53:47 +0000 | [diff] [blame] | 447 | |
maruel@chromium.org | b71b67e | 2009-11-24 20:48:19 +0000 | [diff] [blame] | 448 | def CaptureMatchingLines(line): |
| 449 | match = compiled_pattern.search(line) |
| 450 | if match: |
| 451 | file_list.append(match.group(1)) |
| 452 | if line.startswith('svn: '): |
maruel@chromium.org | 8599aa7 | 2010-02-08 20:27:14 +0000 | [diff] [blame] | 453 | failure.append(line) |
maruel@chromium.org | 54d1f1a | 2010-01-08 19:53:47 +0000 | [diff] [blame] | 454 | |
maruel@chromium.org | b71b67e | 2009-11-24 20:48:19 +0000 | [diff] [blame] | 455 | try: |
maruel@chromium.org | 17d0179 | 2010-09-01 18:07:10 +0000 | [diff] [blame] | 456 | gclient_utils.CheckCallAndFilterAndHeader( |
| 457 | ['svn'] + args, |
| 458 | cwd=cwd, |
| 459 | always=verbose, |
| 460 | filter_fn=CaptureMatchingLines, |
| 461 | stdout=stdout) |
maruel@chromium.org | b71b67e | 2009-11-24 20:48:19 +0000 | [diff] [blame] | 462 | except gclient_utils.Error: |
maruel@chromium.org | 6133c5b | 2010-08-18 18:34:48 +0000 | [diff] [blame] | 463 | def IsKnownFailure(): |
| 464 | for x in failure: |
| 465 | if (x.startswith('svn: OPTIONS of') or |
| 466 | x.startswith('svn: PROPFIND of') or |
| 467 | x.startswith('svn: REPORT of') or |
maruel@chromium.org | f61fc93 | 2010-08-19 13:05:24 +0000 | [diff] [blame] | 468 | x.startswith('svn: Unknown hostname') or |
| 469 | x.startswith('svn: Server sent unexpected return value')): |
maruel@chromium.org | 6133c5b | 2010-08-18 18:34:48 +0000 | [diff] [blame] | 470 | return True |
| 471 | return False |
| 472 | |
maruel@chromium.org | 953586a | 2010-06-15 14:22:24 +0000 | [diff] [blame] | 473 | # Subversion client is really misbehaving with Google Code. |
| 474 | if args[0] == 'checkout': |
| 475 | # Ensure at least one file was checked out, otherwise *delete* the |
| 476 | # directory. |
| 477 | if len(file_list) == previous_list_len: |
maruel@chromium.org | 6133c5b | 2010-08-18 18:34:48 +0000 | [diff] [blame] | 478 | if not IsKnownFailure(): |
maruel@chromium.org | 953586a | 2010-06-15 14:22:24 +0000 | [diff] [blame] | 479 | # No known svn error was found, bail out. |
| 480 | raise |
maruel@chromium.org | 6133c5b | 2010-08-18 18:34:48 +0000 | [diff] [blame] | 481 | # No file were checked out, so make sure the directory is |
| 482 | # deleted in case it's messed up and try again. |
| 483 | # Warning: It's bad, it assumes args[2] is the directory |
| 484 | # argument. |
| 485 | if os.path.isdir(args[2]): |
| 486 | gclient_utils.RemoveDirectory(args[2]) |
maruel@chromium.org | 953586a | 2010-06-15 14:22:24 +0000 | [diff] [blame] | 487 | else: |
| 488 | # Progress was made, convert to update since an aborted checkout |
| 489 | # is now an update. |
maruel@chromium.org | 2de1025 | 2010-02-08 01:10:39 +0000 | [diff] [blame] | 490 | args = ['update'] + args[1:] |
maruel@chromium.org | 953586a | 2010-06-15 14:22:24 +0000 | [diff] [blame] | 491 | else: |
| 492 | # It was an update or export. |
maruel@chromium.org | 6133c5b | 2010-08-18 18:34:48 +0000 | [diff] [blame] | 493 | # We enforce that some progress has been made or a known failure. |
| 494 | if len(file_list) == previous_list_len and not IsKnownFailure(): |
| 495 | # No known svn error was found and no progress, bail out. |
| 496 | raise |
maruel@chromium.org | bec588d | 2010-10-26 13:50:25 +0000 | [diff] [blame] | 497 | if retries == 10: |
maruel@chromium.org | 0350706 | 2010-10-26 00:58:27 +0000 | [diff] [blame] | 498 | raise |
cbentzel@chromium.org | 2aee229 | 2010-09-03 14:15:25 +0000 | [diff] [blame] | 499 | print "Sleeping %.1f seconds and retrying...." % backoff_time |
| 500 | time.sleep(backoff_time) |
| 501 | backoff_time *= 1.3 |
maruel@chromium.org | 953586a | 2010-06-15 14:22:24 +0000 | [diff] [blame] | 502 | continue |
maruel@chromium.org | b71b67e | 2009-11-24 20:48:19 +0000 | [diff] [blame] | 503 | break |
maruel@chromium.org | d5800f1 | 2009-11-12 20:03:43 +0000 | [diff] [blame] | 504 | |
maruel@chromium.org | 5aeb7dd | 2009-11-17 18:09:01 +0000 | [diff] [blame] | 505 | @staticmethod |
maruel@chromium.org | 54019f3 | 2010-09-09 13:50:11 +0000 | [diff] [blame] | 506 | def CaptureInfo(cwd): |
maruel@chromium.org | 5aeb7dd | 2009-11-17 18:09:01 +0000 | [diff] [blame] | 507 | """Returns a dictionary from the svn info output for the given file. |
maruel@chromium.org | d5800f1 | 2009-11-12 20:03:43 +0000 | [diff] [blame] | 508 | |
maruel@chromium.org | 54019f3 | 2010-09-09 13:50:11 +0000 | [diff] [blame] | 509 | Throws an exception if svn info fails.""" |
| 510 | output = SVN.Capture(['info', '--xml', cwd]) |
maruel@chromium.org | 5aeb7dd | 2009-11-17 18:09:01 +0000 | [diff] [blame] | 511 | dom = gclient_utils.ParseXML(output) |
| 512 | result = {} |
| 513 | if dom: |
| 514 | GetNamedNodeText = gclient_utils.GetNamedNodeText |
| 515 | GetNodeNamedAttributeText = gclient_utils.GetNodeNamedAttributeText |
| 516 | def C(item, f): |
maruel@chromium.org | 6e29d57 | 2010-06-04 17:32:20 +0000 | [diff] [blame] | 517 | if item is not None: |
| 518 | return f(item) |
maruel@chromium.org | 5aeb7dd | 2009-11-17 18:09:01 +0000 | [diff] [blame] | 519 | # /info/entry/ |
| 520 | # url |
| 521 | # reposityory/(root|uuid) |
| 522 | # wc-info/(schedule|depth) |
| 523 | # commit/(author|date) |
| 524 | # str() the results because they may be returned as Unicode, which |
| 525 | # interferes with the higher layers matching up things in the deps |
| 526 | # dictionary. |
maruel@chromium.org | 5aeb7dd | 2009-11-17 18:09:01 +0000 | [diff] [blame] | 527 | result['Repository Root'] = C(GetNamedNodeText(dom, 'root'), str) |
| 528 | result['URL'] = C(GetNamedNodeText(dom, 'url'), str) |
| 529 | result['UUID'] = C(GetNamedNodeText(dom, 'uuid'), str) |
| 530 | result['Revision'] = C(GetNodeNamedAttributeText(dom, 'entry', |
| 531 | 'revision'), |
| 532 | int) |
| 533 | result['Node Kind'] = C(GetNodeNamedAttributeText(dom, 'entry', 'kind'), |
| 534 | str) |
| 535 | # Differs across versions. |
| 536 | if result['Node Kind'] == 'dir': |
| 537 | result['Node Kind'] = 'directory' |
| 538 | result['Schedule'] = C(GetNamedNodeText(dom, 'schedule'), str) |
| 539 | result['Path'] = C(GetNodeNamedAttributeText(dom, 'entry', 'path'), str) |
| 540 | result['Copied From URL'] = C(GetNamedNodeText(dom, 'copy-from-url'), str) |
| 541 | result['Copied From Rev'] = C(GetNamedNodeText(dom, 'copy-from-rev'), str) |
| 542 | return result |
maruel@chromium.org | d5800f1 | 2009-11-12 20:03:43 +0000 | [diff] [blame] | 543 | |
maruel@chromium.org | 5aeb7dd | 2009-11-17 18:09:01 +0000 | [diff] [blame] | 544 | @staticmethod |
maruel@chromium.org | 54019f3 | 2010-09-09 13:50:11 +0000 | [diff] [blame] | 545 | def CaptureRevision(cwd): |
nasser@codeaurora.org | 5d63eb8 | 2010-03-24 23:22:09 +0000 | [diff] [blame] | 546 | """Get the base revision of a SVN repository. |
| 547 | |
| 548 | Returns: |
| 549 | Int base revision |
| 550 | """ |
maruel@chromium.org | 54019f3 | 2010-09-09 13:50:11 +0000 | [diff] [blame] | 551 | info = SVN.Capture(['info', '--xml'], cwd=cwd) |
nasser@codeaurora.org | 5d63eb8 | 2010-03-24 23:22:09 +0000 | [diff] [blame] | 552 | dom = xml.dom.minidom.parseString(info) |
| 553 | return dom.getElementsByTagName('entry')[0].getAttribute('revision') |
| 554 | |
| 555 | @staticmethod |
maruel@chromium.org | 5aeb7dd | 2009-11-17 18:09:01 +0000 | [diff] [blame] | 556 | def CaptureStatus(files): |
| 557 | """Returns the svn 1.5 svn status emulated output. |
maruel@chromium.org | d5800f1 | 2009-11-12 20:03:43 +0000 | [diff] [blame] | 558 | |
maruel@chromium.org | 5aeb7dd | 2009-11-17 18:09:01 +0000 | [diff] [blame] | 559 | @files can be a string (one file) or a list of files. |
maruel@chromium.org | d5800f1 | 2009-11-12 20:03:43 +0000 | [diff] [blame] | 560 | |
maruel@chromium.org | 5aeb7dd | 2009-11-17 18:09:01 +0000 | [diff] [blame] | 561 | Returns an array of (status, file) tuples.""" |
| 562 | command = ["status", "--xml"] |
| 563 | if not files: |
| 564 | pass |
| 565 | elif isinstance(files, basestring): |
| 566 | command.append(files) |
| 567 | else: |
| 568 | command.extend(files) |
maruel@chromium.org | d5800f1 | 2009-11-12 20:03:43 +0000 | [diff] [blame] | 569 | |
maruel@chromium.org | 5aeb7dd | 2009-11-17 18:09:01 +0000 | [diff] [blame] | 570 | status_letter = { |
| 571 | None: ' ', |
| 572 | '': ' ', |
| 573 | 'added': 'A', |
| 574 | 'conflicted': 'C', |
| 575 | 'deleted': 'D', |
| 576 | 'external': 'X', |
| 577 | 'ignored': 'I', |
| 578 | 'incomplete': '!', |
| 579 | 'merged': 'G', |
| 580 | 'missing': '!', |
| 581 | 'modified': 'M', |
| 582 | 'none': ' ', |
| 583 | 'normal': ' ', |
| 584 | 'obstructed': '~', |
| 585 | 'replaced': 'R', |
| 586 | 'unversioned': '?', |
| 587 | } |
| 588 | dom = gclient_utils.ParseXML(SVN.Capture(command)) |
| 589 | results = [] |
| 590 | if dom: |
| 591 | # /status/target/entry/(wc-status|commit|author|date) |
| 592 | for target in dom.getElementsByTagName('target'): |
| 593 | #base_path = target.getAttribute('path') |
| 594 | for entry in target.getElementsByTagName('entry'): |
| 595 | file_path = entry.getAttribute('path') |
| 596 | wc_status = entry.getElementsByTagName('wc-status') |
| 597 | assert len(wc_status) == 1 |
| 598 | # Emulate svn 1.5 status ouput... |
| 599 | statuses = [' '] * 7 |
| 600 | # Col 0 |
| 601 | xml_item_status = wc_status[0].getAttribute('item') |
| 602 | if xml_item_status in status_letter: |
| 603 | statuses[0] = status_letter[xml_item_status] |
| 604 | else: |
maruel@chromium.org | 54019f3 | 2010-09-09 13:50:11 +0000 | [diff] [blame] | 605 | raise gclient_utils.Error( |
| 606 | 'Unknown item status "%s"; please implement me!' % |
| 607 | xml_item_status) |
maruel@chromium.org | 5aeb7dd | 2009-11-17 18:09:01 +0000 | [diff] [blame] | 608 | # Col 1 |
| 609 | xml_props_status = wc_status[0].getAttribute('props') |
| 610 | if xml_props_status == 'modified': |
| 611 | statuses[1] = 'M' |
| 612 | elif xml_props_status == 'conflicted': |
| 613 | statuses[1] = 'C' |
| 614 | elif (not xml_props_status or xml_props_status == 'none' or |
| 615 | xml_props_status == 'normal'): |
| 616 | pass |
| 617 | else: |
maruel@chromium.org | 54019f3 | 2010-09-09 13:50:11 +0000 | [diff] [blame] | 618 | raise gclient_utils.Error( |
| 619 | 'Unknown props status "%s"; please implement me!' % |
| 620 | xml_props_status) |
maruel@chromium.org | 5aeb7dd | 2009-11-17 18:09:01 +0000 | [diff] [blame] | 621 | # Col 2 |
| 622 | if wc_status[0].getAttribute('wc-locked') == 'true': |
| 623 | statuses[2] = 'L' |
| 624 | # Col 3 |
| 625 | if wc_status[0].getAttribute('copied') == 'true': |
| 626 | statuses[3] = '+' |
| 627 | # Col 4 |
| 628 | if wc_status[0].getAttribute('switched') == 'true': |
| 629 | statuses[4] = 'S' |
| 630 | # TODO(maruel): Col 5 and 6 |
| 631 | item = (''.join(statuses), file_path) |
| 632 | results.append(item) |
| 633 | return results |
maruel@chromium.org | d5800f1 | 2009-11-12 20:03:43 +0000 | [diff] [blame] | 634 | |
maruel@chromium.org | 5aeb7dd | 2009-11-17 18:09:01 +0000 | [diff] [blame] | 635 | @staticmethod |
| 636 | def IsMoved(filename): |
| 637 | """Determine if a file has been added through svn mv""" |
maruel@chromium.org | 3c55d98 | 2010-05-06 14:25:44 +0000 | [diff] [blame] | 638 | return SVN.IsMovedInfo(SVN.CaptureInfo(filename)) |
| 639 | |
| 640 | @staticmethod |
| 641 | def IsMovedInfo(info): |
| 642 | """Determine if a file has been added through svn mv""" |
maruel@chromium.org | 5aeb7dd | 2009-11-17 18:09:01 +0000 | [diff] [blame] | 643 | return (info.get('Copied From URL') and |
| 644 | info.get('Copied From Rev') and |
| 645 | info.get('Schedule') == 'add') |
maruel@chromium.org | d5800f1 | 2009-11-12 20:03:43 +0000 | [diff] [blame] | 646 | |
maruel@chromium.org | 5aeb7dd | 2009-11-17 18:09:01 +0000 | [diff] [blame] | 647 | @staticmethod |
maruel@chromium.org | 6e29d57 | 2010-06-04 17:32:20 +0000 | [diff] [blame] | 648 | def GetFileProperty(filename, property_name): |
maruel@chromium.org | 5aeb7dd | 2009-11-17 18:09:01 +0000 | [diff] [blame] | 649 | """Returns the value of an SVN property for the given file. |
maruel@chromium.org | d5800f1 | 2009-11-12 20:03:43 +0000 | [diff] [blame] | 650 | |
maruel@chromium.org | 5aeb7dd | 2009-11-17 18:09:01 +0000 | [diff] [blame] | 651 | Args: |
maruel@chromium.org | 6e29d57 | 2010-06-04 17:32:20 +0000 | [diff] [blame] | 652 | filename: The file to check |
maruel@chromium.org | 5aeb7dd | 2009-11-17 18:09:01 +0000 | [diff] [blame] | 653 | property_name: The name of the SVN property, e.g. "svn:mime-type" |
maruel@chromium.org | d5800f1 | 2009-11-12 20:03:43 +0000 | [diff] [blame] | 654 | |
maruel@chromium.org | 5aeb7dd | 2009-11-17 18:09:01 +0000 | [diff] [blame] | 655 | Returns: |
| 656 | The value of the property, which will be the empty string if the property |
| 657 | is not set on the file. If the file is not under version control, the |
| 658 | empty string is also returned. |
| 659 | """ |
maruel@chromium.org | 54019f3 | 2010-09-09 13:50:11 +0000 | [diff] [blame] | 660 | try: |
| 661 | return SVN.Capture(['propget', property_name, filename]) |
| 662 | except gclient_utils.Error: |
| 663 | return '' |
maruel@chromium.org | d5800f1 | 2009-11-12 20:03:43 +0000 | [diff] [blame] | 664 | |
maruel@chromium.org | 5aeb7dd | 2009-11-17 18:09:01 +0000 | [diff] [blame] | 665 | @staticmethod |
maruel@chromium.org | 1c7db8e | 2010-01-07 02:00:19 +0000 | [diff] [blame] | 666 | def DiffItem(filename, full_move=False, revision=None): |
maruel@chromium.org | f2f9d55 | 2009-12-22 00:12:57 +0000 | [diff] [blame] | 667 | """Diffs a single file. |
| 668 | |
maruel@chromium.org | 3c55d98 | 2010-05-06 14:25:44 +0000 | [diff] [blame] | 669 | Should be simple, eh? No it isn't. |
maruel@chromium.org | f2f9d55 | 2009-12-22 00:12:57 +0000 | [diff] [blame] | 670 | Be sure to be in the appropriate directory before calling to have the |
maruel@chromium.org | a937176 | 2009-12-22 18:27:38 +0000 | [diff] [blame] | 671 | expected relative path. |
| 672 | full_move means that move or copy operations should completely recreate the |
| 673 | files, usually in the prospect to apply the patch for a try job.""" |
maruel@chromium.org | 5aeb7dd | 2009-11-17 18:09:01 +0000 | [diff] [blame] | 674 | # If the user specified a custom diff command in their svn config file, |
| 675 | # then it'll be used when we do svn diff, which we don't want to happen |
| 676 | # since we want the unified diff. Using --diff-cmd=diff doesn't always |
| 677 | # work, since they can have another diff executable in their path that |
| 678 | # gives different line endings. So we use a bogus temp directory as the |
| 679 | # config directory, which gets around these problems. |
maruel@chromium.org | f2f9d55 | 2009-12-22 00:12:57 +0000 | [diff] [blame] | 680 | bogus_dir = tempfile.mkdtemp() |
| 681 | try: |
maruel@chromium.org | 3c55d98 | 2010-05-06 14:25:44 +0000 | [diff] [blame] | 682 | # Use "svn info" output instead of os.path.isdir because the latter fails |
| 683 | # when the file is deleted. |
maruel@chromium.org | 6e29d57 | 2010-06-04 17:32:20 +0000 | [diff] [blame] | 684 | return SVN._DiffItemInternal(filename, SVN.CaptureInfo(filename), |
| 685 | bogus_dir, |
maruel@chromium.org | 3c55d98 | 2010-05-06 14:25:44 +0000 | [diff] [blame] | 686 | full_move=full_move, revision=revision) |
| 687 | finally: |
| 688 | shutil.rmtree(bogus_dir) |
| 689 | |
| 690 | @staticmethod |
| 691 | def _DiffItemInternal(filename, info, bogus_dir, full_move=False, |
| 692 | revision=None): |
| 693 | """Grabs the diff data.""" |
| 694 | command = ["diff", "--config-dir", bogus_dir, filename] |
| 695 | if revision: |
| 696 | command.extend(['--revision', revision]) |
| 697 | data = None |
| 698 | if SVN.IsMovedInfo(info): |
| 699 | if full_move: |
| 700 | if info.get("Node Kind") == "directory": |
| 701 | # Things become tricky here. It's a directory copy/move. We need to |
| 702 | # diff all the files inside it. |
| 703 | # This will put a lot of pressure on the heap. This is why StringIO |
| 704 | # is used and converted back into a string at the end. The reason to |
| 705 | # return a string instead of a StringIO is that StringIO.write() |
| 706 | # doesn't accept a StringIO object. *sigh*. |
| 707 | for (dirpath, dirnames, filenames) in os.walk(filename): |
| 708 | # Cleanup all files starting with a '.'. |
| 709 | for d in dirnames: |
| 710 | if d.startswith('.'): |
| 711 | dirnames.remove(d) |
| 712 | for f in filenames: |
| 713 | if f.startswith('.'): |
| 714 | filenames.remove(f) |
| 715 | for f in filenames: |
| 716 | if data is None: |
| 717 | data = cStringIO.StringIO() |
| 718 | data.write(GenFakeDiff(os.path.join(dirpath, f))) |
| 719 | if data: |
| 720 | tmp = data.getvalue() |
| 721 | data.close() |
| 722 | data = tmp |
maruel@chromium.org | f2f9d55 | 2009-12-22 00:12:57 +0000 | [diff] [blame] | 723 | else: |
maruel@chromium.org | 3c55d98 | 2010-05-06 14:25:44 +0000 | [diff] [blame] | 724 | data = GenFakeDiff(filename) |
| 725 | else: |
| 726 | if info.get("Node Kind") != "directory": |
maruel@chromium.org | 0836c56 | 2010-01-22 01:10:06 +0000 | [diff] [blame] | 727 | # svn diff on a mv/cp'd file outputs nothing if there was no change. |
maruel@chromium.org | 54019f3 | 2010-09-09 13:50:11 +0000 | [diff] [blame] | 728 | data = SVN.Capture(command) |
maruel@chromium.org | 0836c56 | 2010-01-22 01:10:06 +0000 | [diff] [blame] | 729 | if not data: |
| 730 | # We put in an empty Index entry so upload.py knows about them. |
maruel@chromium.org | c6d170e | 2010-06-03 00:06:00 +0000 | [diff] [blame] | 731 | data = "Index: %s\n" % filename.replace(os.sep, '/') |
maruel@chromium.org | 3c55d98 | 2010-05-06 14:25:44 +0000 | [diff] [blame] | 732 | # Otherwise silently ignore directories. |
| 733 | else: |
| 734 | if info.get("Node Kind") != "directory": |
| 735 | # Normal simple case. |
maruel@chromium.org | 54019f3 | 2010-09-09 13:50:11 +0000 | [diff] [blame] | 736 | data = SVN.Capture(command) |
maruel@chromium.org | 3c55d98 | 2010-05-06 14:25:44 +0000 | [diff] [blame] | 737 | # Otherwise silently ignore directories. |
maruel@chromium.org | 5aeb7dd | 2009-11-17 18:09:01 +0000 | [diff] [blame] | 738 | return data |
maruel@chromium.org | c78f246 | 2009-11-21 01:20:57 +0000 | [diff] [blame] | 739 | |
| 740 | @staticmethod |
maruel@chromium.org | 1c7db8e | 2010-01-07 02:00:19 +0000 | [diff] [blame] | 741 | def GenerateDiff(filenames, root=None, full_move=False, revision=None): |
maruel@chromium.org | f2f9d55 | 2009-12-22 00:12:57 +0000 | [diff] [blame] | 742 | """Returns a string containing the diff for the given file list. |
| 743 | |
| 744 | The files in the list should either be absolute paths or relative to the |
| 745 | given root. If no root directory is provided, the repository root will be |
| 746 | used. |
| 747 | The diff will always use relative paths. |
| 748 | """ |
maruel@chromium.org | 00fdcb3 | 2011-02-24 01:41:02 +0000 | [diff] [blame] | 749 | assert isinstance(filenames, (list, tuple)) |
maruel@chromium.org | f2f9d55 | 2009-12-22 00:12:57 +0000 | [diff] [blame] | 750 | previous_cwd = os.getcwd() |
maruel@chromium.org | fd9cbbb | 2010-01-08 23:04:03 +0000 | [diff] [blame] | 751 | root = root or SVN.GetCheckoutRoot(previous_cwd) |
| 752 | root = os.path.normcase(os.path.join(root, '')) |
maruel@chromium.org | f2f9d55 | 2009-12-22 00:12:57 +0000 | [diff] [blame] | 753 | def RelativePath(path, root): |
| 754 | """We must use relative paths.""" |
maruel@chromium.org | fd9cbbb | 2010-01-08 23:04:03 +0000 | [diff] [blame] | 755 | if os.path.normcase(path).startswith(root): |
maruel@chromium.org | f2f9d55 | 2009-12-22 00:12:57 +0000 | [diff] [blame] | 756 | return path[len(root):] |
| 757 | return path |
maruel@chromium.org | 3c55d98 | 2010-05-06 14:25:44 +0000 | [diff] [blame] | 758 | # If the user specified a custom diff command in their svn config file, |
| 759 | # then it'll be used when we do svn diff, which we don't want to happen |
| 760 | # since we want the unified diff. Using --diff-cmd=diff doesn't always |
| 761 | # work, since they can have another diff executable in their path that |
| 762 | # gives different line endings. So we use a bogus temp directory as the |
| 763 | # config directory, which gets around these problems. |
| 764 | bogus_dir = tempfile.mkdtemp() |
maruel@chromium.org | f2f9d55 | 2009-12-22 00:12:57 +0000 | [diff] [blame] | 765 | try: |
| 766 | os.chdir(root) |
maruel@chromium.org | 3c55d98 | 2010-05-06 14:25:44 +0000 | [diff] [blame] | 767 | # Cleanup filenames |
| 768 | filenames = [RelativePath(f, root) for f in filenames] |
| 769 | # Get information about the modified items (files and directories) |
| 770 | data = dict([(f, SVN.CaptureInfo(f)) for f in filenames]) |
gavinp@google.com | 3fda4cc | 2010-06-29 13:29:27 +0000 | [diff] [blame] | 771 | diffs = [] |
maruel@chromium.org | 3c55d98 | 2010-05-06 14:25:44 +0000 | [diff] [blame] | 772 | if full_move: |
| 773 | # Eliminate modified files inside moved/copied directory. |
| 774 | for (filename, info) in data.iteritems(): |
| 775 | if SVN.IsMovedInfo(info) and info.get("Node Kind") == "directory": |
| 776 | # Remove files inside the directory. |
| 777 | filenames = [f for f in filenames |
| 778 | if not f.startswith(filename + os.path.sep)] |
| 779 | for filename in data.keys(): |
| 780 | if not filename in filenames: |
| 781 | # Remove filtered out items. |
| 782 | del data[filename] |
gavinp@google.com | 3fda4cc | 2010-06-29 13:29:27 +0000 | [diff] [blame] | 783 | else: |
| 784 | metaheaders = [] |
| 785 | for (filename, info) in data.iteritems(): |
| 786 | if SVN.IsMovedInfo(info): |
| 787 | # for now, the most common case is a head copy, |
| 788 | # so let's just encode that as a straight up cp. |
| 789 | srcurl = info.get('Copied From URL') |
| 790 | root = info.get('Repository Root') |
| 791 | rev = int(info.get('Copied From Rev')) |
| 792 | assert srcurl.startswith(root) |
| 793 | src = srcurl[len(root)+1:] |
maruel@chromium.org | 00fdcb3 | 2011-02-24 01:41:02 +0000 | [diff] [blame] | 794 | try: |
| 795 | srcinfo = SVN.CaptureInfo(srcurl) |
| 796 | except gclient_utils.CheckCallError, e: |
| 797 | if not 'Not a valid URL' in e.stderr: |
| 798 | raise |
| 799 | # Assume the file was deleted. No idea how to figure out at which |
| 800 | # revision the file was deleted. |
| 801 | srcinfo = {'Revision': rev} |
gavinp@google.com | 3fda4cc | 2010-06-29 13:29:27 +0000 | [diff] [blame] | 802 | if (srcinfo.get('Revision') != rev and |
| 803 | SVN.Capture(['diff', '-r', '%d:head' % rev, srcurl])): |
| 804 | metaheaders.append("#$ svn cp -r %d %s %s " |
| 805 | "### WARNING: note non-trunk copy\n" % |
| 806 | (rev, src, filename)) |
| 807 | else: |
| 808 | metaheaders.append("#$ cp %s %s\n" % (src, |
| 809 | filename)) |
| 810 | |
| 811 | if metaheaders: |
| 812 | diffs.append("### BEGIN SVN COPY METADATA\n") |
| 813 | diffs.extend(metaheaders) |
| 814 | diffs.append("### END SVN COPY METADATA\n") |
maruel@chromium.org | 3c55d98 | 2010-05-06 14:25:44 +0000 | [diff] [blame] | 815 | # Now ready to do the actual diff. |
maruel@chromium.org | 3c55d98 | 2010-05-06 14:25:44 +0000 | [diff] [blame] | 816 | for filename in sorted(data.iterkeys()): |
| 817 | diffs.append(SVN._DiffItemInternal(filename, data[filename], bogus_dir, |
| 818 | full_move=full_move, |
| 819 | revision=revision)) |
| 820 | # Use StringIO since it can be messy when diffing a directory move with |
| 821 | # full_move=True. |
| 822 | buf = cStringIO.StringIO() |
| 823 | for d in filter(None, diffs): |
| 824 | buf.write(d) |
| 825 | result = buf.getvalue() |
| 826 | buf.close() |
| 827 | return result |
maruel@chromium.org | f2f9d55 | 2009-12-22 00:12:57 +0000 | [diff] [blame] | 828 | finally: |
| 829 | os.chdir(previous_cwd) |
maruel@chromium.org | 3c55d98 | 2010-05-06 14:25:44 +0000 | [diff] [blame] | 830 | shutil.rmtree(bogus_dir) |
maruel@chromium.org | f2f9d55 | 2009-12-22 00:12:57 +0000 | [diff] [blame] | 831 | |
| 832 | @staticmethod |
maruel@chromium.org | c78f246 | 2009-11-21 01:20:57 +0000 | [diff] [blame] | 833 | def GetEmail(repo_root): |
| 834 | """Retrieves the svn account which we assume is an email address.""" |
maruel@chromium.org | 54019f3 | 2010-09-09 13:50:11 +0000 | [diff] [blame] | 835 | try: |
| 836 | infos = SVN.CaptureInfo(repo_root) |
| 837 | except gclient_utils.Error: |
maruel@chromium.org | c78f246 | 2009-11-21 01:20:57 +0000 | [diff] [blame] | 838 | return None |
| 839 | |
| 840 | # Should check for uuid but it is incorrectly saved for https creds. |
maruel@chromium.org | 54019f3 | 2010-09-09 13:50:11 +0000 | [diff] [blame] | 841 | root = infos['Repository Root'] |
maruel@chromium.org | c78f246 | 2009-11-21 01:20:57 +0000 | [diff] [blame] | 842 | realm = root.rsplit('/', 1)[0] |
maruel@chromium.org | 54019f3 | 2010-09-09 13:50:11 +0000 | [diff] [blame] | 843 | uuid = infos['UUID'] |
maruel@chromium.org | c78f246 | 2009-11-21 01:20:57 +0000 | [diff] [blame] | 844 | if root.startswith('https') or not uuid: |
| 845 | regexp = re.compile(r'<%s:\d+>.*' % realm) |
| 846 | else: |
| 847 | regexp = re.compile(r'<%s:\d+> %s' % (realm, uuid)) |
| 848 | if regexp is None: |
| 849 | return None |
| 850 | if sys.platform.startswith('win'): |
| 851 | if not 'APPDATA' in os.environ: |
| 852 | return None |
maruel@chromium.org | 720d9f3 | 2009-11-21 17:38:57 +0000 | [diff] [blame] | 853 | auth_dir = os.path.join(os.environ['APPDATA'], 'Subversion', 'auth', |
| 854 | 'svn.simple') |
maruel@chromium.org | c78f246 | 2009-11-21 01:20:57 +0000 | [diff] [blame] | 855 | else: |
| 856 | if not 'HOME' in os.environ: |
| 857 | return None |
| 858 | auth_dir = os.path.join(os.environ['HOME'], '.subversion', 'auth', |
| 859 | 'svn.simple') |
| 860 | for credfile in os.listdir(auth_dir): |
| 861 | cred_info = SVN.ReadSimpleAuth(os.path.join(auth_dir, credfile)) |
| 862 | if regexp.match(cred_info.get('svn:realmstring')): |
| 863 | return cred_info.get('username') |
| 864 | |
| 865 | @staticmethod |
| 866 | def ReadSimpleAuth(filename): |
| 867 | f = open(filename, 'r') |
| 868 | values = {} |
maruel@chromium.org | 6e29d57 | 2010-06-04 17:32:20 +0000 | [diff] [blame] | 869 | def ReadOneItem(item_type): |
| 870 | m = re.match(r'%s (\d+)' % item_type, f.readline()) |
maruel@chromium.org | c78f246 | 2009-11-21 01:20:57 +0000 | [diff] [blame] | 871 | if not m: |
| 872 | return None |
| 873 | data = f.read(int(m.group(1))) |
| 874 | if f.read(1) != '\n': |
| 875 | return None |
| 876 | return data |
| 877 | |
| 878 | while True: |
| 879 | key = ReadOneItem('K') |
| 880 | if not key: |
| 881 | break |
| 882 | value = ReadOneItem('V') |
| 883 | if not value: |
| 884 | break |
| 885 | values[key] = value |
| 886 | return values |
maruel@chromium.org | 94b1ee9 | 2009-12-19 20:27:20 +0000 | [diff] [blame] | 887 | |
| 888 | @staticmethod |
| 889 | def GetCheckoutRoot(directory): |
| 890 | """Returns the top level directory of the current repository. |
| 891 | |
| 892 | The directory is returned as an absolute path. |
| 893 | """ |
maruel@chromium.org | f7ae6d5 | 2009-12-22 20:49:04 +0000 | [diff] [blame] | 894 | directory = os.path.abspath(directory) |
maruel@chromium.org | 54019f3 | 2010-09-09 13:50:11 +0000 | [diff] [blame] | 895 | try: |
maruel@chromium.org | 885d6e8 | 2011-02-24 20:21:46 +0000 | [diff] [blame] | 896 | info = SVN.CaptureInfo(directory) |
| 897 | cur_dir_repo_root = info['Repository Root'] |
| 898 | url = info['URL'] |
maruel@chromium.org | 54019f3 | 2010-09-09 13:50:11 +0000 | [diff] [blame] | 899 | except gclient_utils.Error: |
maruel@chromium.org | 94b1ee9 | 2009-12-19 20:27:20 +0000 | [diff] [blame] | 900 | return None |
maruel@chromium.org | 94b1ee9 | 2009-12-19 20:27:20 +0000 | [diff] [blame] | 901 | while True: |
| 902 | parent = os.path.dirname(directory) |
maruel@chromium.org | 54019f3 | 2010-09-09 13:50:11 +0000 | [diff] [blame] | 903 | try: |
maruel@chromium.org | 885d6e8 | 2011-02-24 20:21:46 +0000 | [diff] [blame] | 904 | info = SVN.CaptureInfo(parent) |
| 905 | if (info['Repository Root'] != cur_dir_repo_root or |
| 906 | info['URL'] != os.path.dirname(url)): |
maruel@chromium.org | 54019f3 | 2010-09-09 13:50:11 +0000 | [diff] [blame] | 907 | break |
maruel@chromium.org | 885d6e8 | 2011-02-24 20:21:46 +0000 | [diff] [blame] | 908 | url = info['URL'] |
maruel@chromium.org | 54019f3 | 2010-09-09 13:50:11 +0000 | [diff] [blame] | 909 | except gclient_utils.Error: |
maruel@chromium.org | 94b1ee9 | 2009-12-19 20:27:20 +0000 | [diff] [blame] | 910 | break |
| 911 | directory = parent |
maruel@chromium.org | fd9cbbb | 2010-01-08 23:04:03 +0000 | [diff] [blame] | 912 | return GetCasedPath(directory) |
tony@chromium.org | 5756466 | 2010-04-14 02:35:12 +0000 | [diff] [blame] | 913 | |
| 914 | @staticmethod |
| 915 | def AssertVersion(min_version): |
| 916 | """Asserts svn's version is at least min_version.""" |
| 917 | def only_int(val): |
| 918 | if val.isdigit(): |
| 919 | return int(val) |
| 920 | else: |
| 921 | return 0 |
| 922 | if not SVN.current_version: |
| 923 | SVN.current_version = SVN.Capture(['--version']).split()[2] |
| 924 | current_version_list = map(only_int, SVN.current_version.split('.')) |
| 925 | for min_ver in map(int, min_version.split('.')): |
| 926 | ver = current_version_list.pop(0) |
| 927 | if ver < min_ver: |
| 928 | return (False, SVN.current_version) |
| 929 | elif ver > min_ver: |
| 930 | return (True, SVN.current_version) |
| 931 | return (True, SVN.current_version) |
maruel@chromium.org | 07ab60e | 2011-02-08 21:54:00 +0000 | [diff] [blame] | 932 | |
| 933 | @staticmethod |
| 934 | def Revert(repo_root, callback=None, ignore_externals=False): |
| 935 | """Reverts all svn modifications in repo_root, including properties. |
| 936 | |
| 937 | Deletes any modified files or directory. |
| 938 | |
| 939 | A "svn update --revision BASE" call is required after to revive deleted |
| 940 | files. |
| 941 | """ |
| 942 | for file_status in SVN.CaptureStatus(repo_root): |
| 943 | file_path = os.path.join(repo_root, file_status[1]) |
maruel@chromium.org | 8c41512 | 2011-03-15 17:14:27 +0000 | [diff] [blame] | 944 | if (ignore_externals and |
| 945 | file_status[0][0] == 'X' and |
| 946 | file_status[0][1:].isspace()): |
maruel@chromium.org | 07ab60e | 2011-02-08 21:54:00 +0000 | [diff] [blame] | 947 | # Ignore externals. |
| 948 | logging.info('Ignoring external %s' % file_status[1]) |
| 949 | continue |
| 950 | |
| 951 | if callback: |
| 952 | callback(file_status) |
| 953 | |
maruel@chromium.org | 8c41512 | 2011-03-15 17:14:27 +0000 | [diff] [blame] | 954 | if os.path.exists(file_path): |
| 955 | # svn revert is really stupid. It fails on inconsistent line-endings, |
| 956 | # on switched directories, etc. So take no chance and delete everything! |
| 957 | # In theory, it wouldn't be necessary for property-only change but then |
| 958 | # it'd have to look for switched directories, etc so it's not worth |
| 959 | # optimizing this use case. |
| 960 | if os.path.isfile(file_path) or os.path.islink(file_path): |
| 961 | logging.info('os.remove(%s)' % file_path) |
| 962 | os.remove(file_path) |
| 963 | elif os.path.isdir(file_path): |
| 964 | logging.info('gclient_utils.RemoveDirectory(%s)' % file_path) |
| 965 | gclient_utils.RemoveDirectory(file_path) |
| 966 | else: |
| 967 | logging.critical( |
| 968 | ('No idea what is %s.\nYou just found a bug in gclient' |
| 969 | ', please ping maruel@chromium.org ASAP!') % file_path) |
maruel@chromium.org | 07ab60e | 2011-02-08 21:54:00 +0000 | [diff] [blame] | 970 | |
maruel@chromium.org | 8c41512 | 2011-03-15 17:14:27 +0000 | [diff] [blame] | 971 | if (file_status[0][0] in ('D', 'A', '!') or |
| 972 | not file_status[0][1:].isspace()): |
maruel@chromium.org | af45349 | 2011-03-03 21:04:09 +0000 | [diff] [blame] | 973 | # Added, deleted file requires manual intervention and require calling |
maruel@chromium.org | 07ab60e | 2011-02-08 21:54:00 +0000 | [diff] [blame] | 974 | # revert, like for properties. |
maruel@chromium.org | af45349 | 2011-03-03 21:04:09 +0000 | [diff] [blame] | 975 | try: |
| 976 | SVN.Capture(['revert', file_status[1]], cwd=repo_root) |
| 977 | except gclient_utils.CheckCallError: |
| 978 | if not os.path.exists(file_path): |
| 979 | continue |
| 980 | raise |