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