blob: f0b956ab4254ca026ac3374b78e97585d1f83077 [file] [log] [blame]
maruel@chromium.orgbec588d2010-10-26 13:50:25 +00001# Copyright (c) 2010 The Chromium Authors. All rights reserved.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +00002# Use of this source code is governed by a BSD-style license that can be
3# found in the LICENSE file.
4
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +00005"""SCM-specific utility classes."""
maruel@chromium.orgd5800f12009-11-12 20:03:43 +00006
maruel@chromium.org3c55d982010-05-06 14:25:44 +00007import cStringIO
maruel@chromium.orgfd9cbbb2010-01-08 23:04:03 +00008import glob
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00009import logging
maruel@chromium.orgd5800f12009-11-12 20:03:43 +000010import os
11import re
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +000012import shutil
maruel@chromium.orgd5800f12009-11-12 20:03:43 +000013import subprocess
14import sys
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +000015import tempfile
maruel@chromium.orgfd876172010-04-30 14:01:05 +000016import time
maruel@chromium.orgd5800f12009-11-12 20:03:43 +000017import xml.dom.minidom
18
19import gclient_utils
20
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +000021def ValidateEmail(email):
maruel@chromium.org6e29d572010-06-04 17:32:20 +000022 return (re.match(r"^[a-zA-Z0-9._%-+]+@[a-zA-Z0-9._%-]+.[a-zA-Z]{2,6}$", email)
23 is not None)
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +000024
maruel@chromium.orgd5800f12009-11-12 20:03:43 +000025
maruel@chromium.orgfd9cbbb2010-01-08 23:04:03 +000026def 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.org3c55d982010-05-06 14:25:44 +000046def GenFakeDiff(filename):
47 """Generates a fake diff from a file."""
48 file_content = gclient_utils.FileRead(filename, 'rb').splitlines(True)
maruel@chromium.orgc6d170e2010-06-03 00:06:00 +000049 filename = filename.replace(os.sep, '/')
maruel@chromium.org3c55d982010-05-06 14:25:44 +000050 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.org5aeb7dd2009-11-17 18:09:01 +000068class GIT(object):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +000069 @staticmethod
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +000070 def Capture(args, **kwargs):
71 return gclient_utils.CheckCall(['git'] + args, print_error=False,
72 **kwargs)[0]
maruel@chromium.orgd5800f12009-11-12 20:03:43 +000073
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +000074 @staticmethod
msb@chromium.org786fb682010-06-02 15:16:23 +000075 def CaptureStatus(files, upstream_branch=None):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +000076 """Returns git status.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +000077
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +000078 @files can be a string (one file) or a list of files.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +000079
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +000080 Returns an array of (status, file) tuples."""
msb@chromium.org786fb682010-06-02 15:16:23 +000081 if upstream_branch is None:
82 upstream_branch = GIT.GetUpstreamBranch(os.getcwd())
83 if upstream_branch is None:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +000084 raise gclient_utils.Error('Cannot determine upstream branch')
85 command = ['diff', '--name-status', '-r', '%s...' % upstream_branch]
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +000086 if not files:
87 pass
88 elif isinstance(files, basestring):
89 command.append(files)
90 else:
91 command.extend(files)
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +000092 status = GIT.Capture(command).rstrip()
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +000093 results = []
94 if status:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +000095 for statusline in status.splitlines():
maruel@chromium.orgcc1614b2010-09-20 17:13:17 +000096 # 3-way merges can cause the status can be 'MMM' instead of 'M'. This
97 # can happen when the user has 2 local branches and he diffs between
98 # these 2 branches instead diffing to upstream.
99 m = re.match('^(\w)+\t(.+)$', statusline)
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000100 if not m:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000101 raise gclient_utils.Error(
102 'status currently unsupported: %s' % statusline)
maruel@chromium.orgcc1614b2010-09-20 17:13:17 +0000103 # Only grab the first letter.
104 results.append(('%s ' % m.group(1)[0], m.group(2)))
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000105 return results
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000106
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000107 @staticmethod
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000108 def GetEmail(cwd):
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000109 """Retrieves the user email address if known."""
110 # We could want to look at the svn cred when it has a svn remote but it
111 # should be fine for now, users should simply configure their git settings.
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000112 try:
113 return GIT.Capture(['config', 'user.email'], cwd=cwd).strip()
114 except gclient_utils.CheckCallError:
115 return ''
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000116
117 @staticmethod
118 def ShortBranchName(branch):
119 """Converts a name like 'refs/heads/foo' to just 'foo'."""
120 return branch.replace('refs/heads/', '')
121
122 @staticmethod
123 def GetBranchRef(cwd):
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000124 """Returns the full branch reference, e.g. 'refs/heads/master'."""
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000125 return GIT.Capture(['symbolic-ref', 'HEAD'], cwd=cwd).strip()
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000126
127 @staticmethod
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000128 def GetBranch(cwd):
129 """Returns the short branch name, e.g. 'master'."""
maruel@chromium.orgc308a742009-12-22 18:29:33 +0000130 return GIT.ShortBranchName(GIT.GetBranchRef(cwd))
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000131
132 @staticmethod
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000133 def IsGitSvn(cwd):
134 """Returns true if this repo looks like it's using git-svn."""
135 # If you have any "svn-remote.*" config keys, we think you're using svn.
136 try:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000137 GIT.Capture(['config', '--get-regexp', r'^svn-remote\.'], cwd=cwd)
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000138 return True
139 except gclient_utils.CheckCallError:
140 return False
141
142 @staticmethod
143 def GetSVNBranch(cwd):
144 """Returns the svn branch name if found."""
145 # Try to figure out which remote branch we're based on.
146 # Strategy:
147 # 1) find all git-svn branches and note their svn URLs.
148 # 2) iterate through our branch history and match up the URLs.
149
150 # regexp matching the git-svn line that contains the URL.
151 git_svn_re = re.compile(r'^\s*git-svn-id: (\S+)@', re.MULTILINE)
152
153 # Get the refname and svn url for all refs/remotes/*.
154 remotes = GIT.Capture(
155 ['for-each-ref', '--format=%(refname)', 'refs/remotes'],
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000156 cwd=cwd).splitlines()
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000157 svn_refs = {}
158 for ref in remotes:
159 match = git_svn_re.search(
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000160 GIT.Capture(['cat-file', '-p', ref], cwd=cwd))
sky@chromium.org42d8da52010-04-23 18:25:07 +0000161 # Prefer origin/HEAD over all others.
162 if match and (match.group(1) not in svn_refs or
163 ref == "refs/remotes/origin/HEAD"):
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000164 svn_refs[match.group(1)] = ref
165
166 svn_branch = ''
167 if len(svn_refs) == 1:
168 # Only one svn branch exists -- seems like a good candidate.
169 svn_branch = svn_refs.values()[0]
170 elif len(svn_refs) > 1:
171 # We have more than one remote branch available. We don't
172 # want to go through all of history, so read a line from the
173 # pipe at a time.
174 # The -100 is an arbitrary limit so we don't search forever.
175 cmd = ['git', 'log', '-100', '--pretty=medium']
maruel@chromium.org3a292682010-08-23 18:54:55 +0000176 proc = gclient_utils.Popen(cmd, stdout=subprocess.PIPE, cwd=cwd)
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000177 for line in proc.stdout:
178 match = git_svn_re.match(line)
179 if match:
180 url = match.group(1)
181 if url in svn_refs:
182 svn_branch = svn_refs[url]
183 proc.stdout.close() # Cut pipe.
184 break
185 return svn_branch
186
187 @staticmethod
188 def FetchUpstreamTuple(cwd):
189 """Returns a tuple containg remote and remote ref,
190 e.g. 'origin', 'refs/heads/master'
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000191 Tries to be intelligent and understand git-svn.
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000192 """
193 remote = '.'
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000194 branch = GIT.GetBranch(cwd)
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000195 try:
196 upstream_branch = GIT.Capture(
197 ['config', 'branch.%s.merge' % branch], cwd=cwd).strip()
198 except gclient_utils.Error:
199 upstream_branch = None
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000200 if upstream_branch:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000201 try:
202 remote = GIT.Capture(
203 ['config', 'branch.%s.remote' % branch], cwd=cwd).strip()
204 except gclient_utils.Error:
205 pass
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000206 else:
207 # Fall back on trying a git-svn upstream branch.
208 if GIT.IsGitSvn(cwd):
209 upstream_branch = GIT.GetSVNBranch(cwd)
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000210 else:
maruel@chromium.orga630bd72010-04-29 23:32:34 +0000211 # Else, try to guess the origin remote.
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000212 remote_branches = GIT.Capture(['branch', '-r'], cwd=cwd).split()
maruel@chromium.orga630bd72010-04-29 23:32:34 +0000213 if 'origin/master' in remote_branches:
214 # Fall back on origin/master if it exits.
215 remote = 'origin'
216 upstream_branch = 'refs/heads/master'
217 elif 'origin/trunk' in remote_branches:
218 # Fall back on origin/trunk if it exists. Generally a shared
219 # git-svn clone
220 remote = 'origin'
221 upstream_branch = 'refs/heads/trunk'
222 else:
223 # Give up.
224 remote = None
225 upstream_branch = None
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000226 return remote, upstream_branch
227
228 @staticmethod
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000229 def GetUpstreamBranch(cwd):
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000230 """Gets the current branch's upstream branch."""
231 remote, upstream_branch = GIT.FetchUpstreamTuple(cwd)
maruel@chromium.orga630bd72010-04-29 23:32:34 +0000232 if remote != '.' and upstream_branch:
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000233 upstream_branch = upstream_branch.replace('heads', 'remotes/' + remote)
234 return upstream_branch
235
236 @staticmethod
maruel@chromium.org8ede00e2010-01-12 14:35:28 +0000237 def GenerateDiff(cwd, branch=None, branch_head='HEAD', full_move=False,
238 files=None):
maruel@chromium.orga9371762009-12-22 18:27:38 +0000239 """Diffs against the upstream branch or optionally another branch.
240
241 full_move means that move or copy operations should completely recreate the
242 files, usually in the prospect to apply the patch for a try job."""
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000243 if not branch:
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000244 branch = GIT.GetUpstreamBranch(cwd)
evan@chromium.org400f3e72010-05-19 14:23:36 +0000245 command = ['diff', '-p', '--no-prefix', '--no-ext-diff',
246 branch + "..." + branch_head]
maruel@chromium.orga9371762009-12-22 18:27:38 +0000247 if not full_move:
248 command.append('-C')
maruel@chromium.org8ede00e2010-01-12 14:35:28 +0000249 # TODO(maruel): --binary support.
250 if files:
251 command.append('--')
252 command.extend(files)
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000253 diff = GIT.Capture(command, cwd=cwd).splitlines(True)
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000254 for i in range(len(diff)):
255 # In the case of added files, replace /dev/null with the path to the
256 # file being added.
257 if diff[i].startswith('--- /dev/null'):
258 diff[i] = '--- %s' % diff[i+1][4:]
259 return ''.join(diff)
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000260
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000261 @staticmethod
maruel@chromium.org8ede00e2010-01-12 14:35:28 +0000262 def GetDifferentFiles(cwd, branch=None, branch_head='HEAD'):
263 """Returns the list of modified files between two branches."""
264 if not branch:
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000265 branch = GIT.GetUpstreamBranch(cwd)
bauerb@chromium.org838f0f22010-04-09 17:02:50 +0000266 command = ['diff', '--name-only', branch + "..." + branch_head]
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000267 return GIT.Capture(command, cwd=cwd).splitlines(False)
maruel@chromium.org8ede00e2010-01-12 14:35:28 +0000268
269 @staticmethod
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000270 def GetPatchName(cwd):
271 """Constructs a name for this patch."""
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000272 short_sha = GIT.Capture(['rev-parse', '--short=4', 'HEAD'], cwd=cwd).strip()
maruel@chromium.org862ff8e2010-08-06 15:29:16 +0000273 return "%s#%s" % (GIT.GetBranch(cwd), short_sha)
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000274
275 @staticmethod
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000276 def GetCheckoutRoot(cwd):
maruel@chromium.org01d8c1d2010-01-07 01:56:59 +0000277 """Returns the top level directory of a git checkout as an absolute path.
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000278 """
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000279 root = GIT.Capture(['rev-parse', '--show-cdup'], cwd=cwd).strip()
280 return os.path.abspath(os.path.join(cwd, root))
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000281
maruel@chromium.orgd0f854a2010-03-11 19:35:53 +0000282 @staticmethod
283 def AssertVersion(min_version):
284 """Asserts git's version is at least min_version."""
285 def only_int(val):
286 if val.isdigit():
287 return int(val)
288 else:
289 return 0
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000290 current_version = GIT.Capture(['--version']).split()[-1]
maruel@chromium.orgd0f854a2010-03-11 19:35:53 +0000291 current_version_list = map(only_int, current_version.split('.'))
292 for min_ver in map(int, min_version.split('.')):
293 ver = current_version_list.pop(0)
294 if ver < min_ver:
295 return (False, current_version)
296 elif ver > min_ver:
297 return (True, current_version)
298 return (True, current_version)
299
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000300
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000301class SVN(object):
tony@chromium.org57564662010-04-14 02:35:12 +0000302 current_version = None
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000303
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000304 @staticmethod
maruel@chromium.org54019f32010-09-09 13:50:11 +0000305 def Capture(args, **kwargs):
306 """Always redirect stderr.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000307
maruel@chromium.org54019f32010-09-09 13:50:11 +0000308 Throws an exception if non-0 is returned."""
309 return gclient_utils.CheckCall(['svn'] + args, print_error=False,
310 **kwargs)[0]
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000311
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000312 @staticmethod
maruel@chromium.org2b9aa8e2010-08-25 20:01:42 +0000313 def RunAndGetFileList(verbose, args, cwd, file_list, stdout=None):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000314 """Runs svn checkout, update, or status, output to stdout.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000315
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000316 The first item in args must be either "checkout", "update", or "status".
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000317
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000318 svn's stdout is parsed to collect a list of files checked out or updated.
319 These files are appended to file_list. svn's stdout is also printed to
320 sys.stdout as in Run.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000321
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000322 Args:
maruel@chromium.org03807072010-08-16 17:18:44 +0000323 verbose: If True, uses verbose output
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000324 args: A sequence of command line parameters to be passed to svn.
maruel@chromium.org2b9aa8e2010-08-25 20:01:42 +0000325 cwd: The directory where svn is to be run.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000326
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000327 Raises:
328 Error: An error occurred while running the svn command.
329 """
maruel@chromium.org2b9aa8e2010-08-25 20:01:42 +0000330 stdout = stdout or sys.stdout
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000331
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000332 # svn update and svn checkout use the same pattern: the first three columns
333 # are for file status, property status, and lock status. This is followed
334 # by two spaces, and then the path to the file.
335 update_pattern = '^... (.*)$'
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000336
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000337 # The first three columns of svn status are the same as for svn update and
338 # svn checkout. The next three columns indicate addition-with-history,
339 # switch, and remote lock status. This is followed by one space, and then
340 # the path to the file.
341 status_pattern = '^...... (.*)$'
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000342
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000343 # args[0] must be a supported command. This will blow up if it's something
344 # else, which is good. Note that the patterns are only effective when
345 # these commands are used in their ordinary forms, the patterns are invalid
346 # for "svn status --show-updates", for example.
347 pattern = {
348 'checkout': update_pattern,
349 'status': status_pattern,
350 'update': update_pattern,
351 }[args[0]]
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000352 compiled_pattern = re.compile(pattern)
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000353 # Place an upper limit.
cbentzel@chromium.org2aee2292010-09-03 14:15:25 +0000354 backoff_time = 5
maruel@chromium.orgbec588d2010-10-26 13:50:25 +0000355 retries = 0
maruel@chromium.org03507062010-10-26 00:58:27 +0000356 while True:
maruel@chromium.orgbec588d2010-10-26 13:50:25 +0000357 retries += 1
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000358 previous_list_len = len(file_list)
359 failure = []
maruel@chromium.org54d1f1a2010-01-08 19:53:47 +0000360
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000361 def CaptureMatchingLines(line):
362 match = compiled_pattern.search(line)
363 if match:
364 file_list.append(match.group(1))
365 if line.startswith('svn: '):
maruel@chromium.org8599aa72010-02-08 20:27:14 +0000366 failure.append(line)
maruel@chromium.org54d1f1a2010-01-08 19:53:47 +0000367
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000368 try:
maruel@chromium.org17d01792010-09-01 18:07:10 +0000369 gclient_utils.CheckCallAndFilterAndHeader(
370 ['svn'] + args,
371 cwd=cwd,
372 always=verbose,
373 filter_fn=CaptureMatchingLines,
374 stdout=stdout)
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000375 except gclient_utils.Error:
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000376 def IsKnownFailure():
377 for x in failure:
378 if (x.startswith('svn: OPTIONS of') or
379 x.startswith('svn: PROPFIND of') or
380 x.startswith('svn: REPORT of') or
maruel@chromium.orgf61fc932010-08-19 13:05:24 +0000381 x.startswith('svn: Unknown hostname') or
382 x.startswith('svn: Server sent unexpected return value')):
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000383 return True
384 return False
385
maruel@chromium.org953586a2010-06-15 14:22:24 +0000386 # Subversion client is really misbehaving with Google Code.
387 if args[0] == 'checkout':
388 # Ensure at least one file was checked out, otherwise *delete* the
389 # directory.
390 if len(file_list) == previous_list_len:
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000391 if not IsKnownFailure():
maruel@chromium.org953586a2010-06-15 14:22:24 +0000392 # No known svn error was found, bail out.
393 raise
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000394 # No file were checked out, so make sure the directory is
395 # deleted in case it's messed up and try again.
396 # Warning: It's bad, it assumes args[2] is the directory
397 # argument.
398 if os.path.isdir(args[2]):
399 gclient_utils.RemoveDirectory(args[2])
maruel@chromium.org953586a2010-06-15 14:22:24 +0000400 else:
401 # Progress was made, convert to update since an aborted checkout
402 # is now an update.
maruel@chromium.org2de10252010-02-08 01:10:39 +0000403 args = ['update'] + args[1:]
maruel@chromium.org953586a2010-06-15 14:22:24 +0000404 else:
405 # It was an update or export.
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000406 # We enforce that some progress has been made or a known failure.
407 if len(file_list) == previous_list_len and not IsKnownFailure():
408 # No known svn error was found and no progress, bail out.
409 raise
maruel@chromium.orgbec588d2010-10-26 13:50:25 +0000410 if retries == 10:
maruel@chromium.org03507062010-10-26 00:58:27 +0000411 raise
cbentzel@chromium.org2aee2292010-09-03 14:15:25 +0000412 print "Sleeping %.1f seconds and retrying...." % backoff_time
413 time.sleep(backoff_time)
414 backoff_time *= 1.3
maruel@chromium.org953586a2010-06-15 14:22:24 +0000415 continue
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000416 break
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000417
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000418 @staticmethod
maruel@chromium.org54019f32010-09-09 13:50:11 +0000419 def CaptureInfo(cwd):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000420 """Returns a dictionary from the svn info output for the given file.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000421
maruel@chromium.org54019f32010-09-09 13:50:11 +0000422 Throws an exception if svn info fails."""
423 output = SVN.Capture(['info', '--xml', cwd])
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000424 dom = gclient_utils.ParseXML(output)
425 result = {}
426 if dom:
427 GetNamedNodeText = gclient_utils.GetNamedNodeText
428 GetNodeNamedAttributeText = gclient_utils.GetNodeNamedAttributeText
429 def C(item, f):
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000430 if item is not None:
431 return f(item)
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000432 # /info/entry/
433 # url
434 # reposityory/(root|uuid)
435 # wc-info/(schedule|depth)
436 # commit/(author|date)
437 # str() the results because they may be returned as Unicode, which
438 # interferes with the higher layers matching up things in the deps
439 # dictionary.
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000440 result['Repository Root'] = C(GetNamedNodeText(dom, 'root'), str)
441 result['URL'] = C(GetNamedNodeText(dom, 'url'), str)
442 result['UUID'] = C(GetNamedNodeText(dom, 'uuid'), str)
443 result['Revision'] = C(GetNodeNamedAttributeText(dom, 'entry',
444 'revision'),
445 int)
446 result['Node Kind'] = C(GetNodeNamedAttributeText(dom, 'entry', 'kind'),
447 str)
448 # Differs across versions.
449 if result['Node Kind'] == 'dir':
450 result['Node Kind'] = 'directory'
451 result['Schedule'] = C(GetNamedNodeText(dom, 'schedule'), str)
452 result['Path'] = C(GetNodeNamedAttributeText(dom, 'entry', 'path'), str)
453 result['Copied From URL'] = C(GetNamedNodeText(dom, 'copy-from-url'), str)
454 result['Copied From Rev'] = C(GetNamedNodeText(dom, 'copy-from-rev'), str)
455 return result
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000456
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000457 @staticmethod
maruel@chromium.org54019f32010-09-09 13:50:11 +0000458 def CaptureRevision(cwd):
nasser@codeaurora.org5d63eb82010-03-24 23:22:09 +0000459 """Get the base revision of a SVN repository.
460
461 Returns:
462 Int base revision
463 """
maruel@chromium.org54019f32010-09-09 13:50:11 +0000464 info = SVN.Capture(['info', '--xml'], cwd=cwd)
nasser@codeaurora.org5d63eb82010-03-24 23:22:09 +0000465 dom = xml.dom.minidom.parseString(info)
466 return dom.getElementsByTagName('entry')[0].getAttribute('revision')
467
468 @staticmethod
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000469 def CaptureStatus(files):
470 """Returns the svn 1.5 svn status emulated output.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000471
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000472 @files can be a string (one file) or a list of files.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000473
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000474 Returns an array of (status, file) tuples."""
475 command = ["status", "--xml"]
476 if not files:
477 pass
478 elif isinstance(files, basestring):
479 command.append(files)
480 else:
481 command.extend(files)
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000482
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000483 status_letter = {
484 None: ' ',
485 '': ' ',
486 'added': 'A',
487 'conflicted': 'C',
488 'deleted': 'D',
489 'external': 'X',
490 'ignored': 'I',
491 'incomplete': '!',
492 'merged': 'G',
493 'missing': '!',
494 'modified': 'M',
495 'none': ' ',
496 'normal': ' ',
497 'obstructed': '~',
498 'replaced': 'R',
499 'unversioned': '?',
500 }
501 dom = gclient_utils.ParseXML(SVN.Capture(command))
502 results = []
503 if dom:
504 # /status/target/entry/(wc-status|commit|author|date)
505 for target in dom.getElementsByTagName('target'):
506 #base_path = target.getAttribute('path')
507 for entry in target.getElementsByTagName('entry'):
508 file_path = entry.getAttribute('path')
509 wc_status = entry.getElementsByTagName('wc-status')
510 assert len(wc_status) == 1
511 # Emulate svn 1.5 status ouput...
512 statuses = [' '] * 7
513 # Col 0
514 xml_item_status = wc_status[0].getAttribute('item')
515 if xml_item_status in status_letter:
516 statuses[0] = status_letter[xml_item_status]
517 else:
maruel@chromium.org54019f32010-09-09 13:50:11 +0000518 raise gclient_utils.Error(
519 'Unknown item status "%s"; please implement me!' %
520 xml_item_status)
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000521 # Col 1
522 xml_props_status = wc_status[0].getAttribute('props')
523 if xml_props_status == 'modified':
524 statuses[1] = 'M'
525 elif xml_props_status == 'conflicted':
526 statuses[1] = 'C'
527 elif (not xml_props_status or xml_props_status == 'none' or
528 xml_props_status == 'normal'):
529 pass
530 else:
maruel@chromium.org54019f32010-09-09 13:50:11 +0000531 raise gclient_utils.Error(
532 'Unknown props status "%s"; please implement me!' %
533 xml_props_status)
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000534 # Col 2
535 if wc_status[0].getAttribute('wc-locked') == 'true':
536 statuses[2] = 'L'
537 # Col 3
538 if wc_status[0].getAttribute('copied') == 'true':
539 statuses[3] = '+'
540 # Col 4
541 if wc_status[0].getAttribute('switched') == 'true':
542 statuses[4] = 'S'
543 # TODO(maruel): Col 5 and 6
544 item = (''.join(statuses), file_path)
545 results.append(item)
546 return results
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000547
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000548 @staticmethod
549 def IsMoved(filename):
550 """Determine if a file has been added through svn mv"""
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000551 return SVN.IsMovedInfo(SVN.CaptureInfo(filename))
552
553 @staticmethod
554 def IsMovedInfo(info):
555 """Determine if a file has been added through svn mv"""
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000556 return (info.get('Copied From URL') and
557 info.get('Copied From Rev') and
558 info.get('Schedule') == 'add')
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000559
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000560 @staticmethod
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000561 def GetFileProperty(filename, property_name):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000562 """Returns the value of an SVN property for the given file.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000563
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000564 Args:
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000565 filename: The file to check
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000566 property_name: The name of the SVN property, e.g. "svn:mime-type"
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000567
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000568 Returns:
569 The value of the property, which will be the empty string if the property
570 is not set on the file. If the file is not under version control, the
571 empty string is also returned.
572 """
maruel@chromium.org54019f32010-09-09 13:50:11 +0000573 try:
574 return SVN.Capture(['propget', property_name, filename])
575 except gclient_utils.Error:
576 return ''
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000577
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000578 @staticmethod
maruel@chromium.org1c7db8e2010-01-07 02:00:19 +0000579 def DiffItem(filename, full_move=False, revision=None):
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000580 """Diffs a single file.
581
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000582 Should be simple, eh? No it isn't.
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000583 Be sure to be in the appropriate directory before calling to have the
maruel@chromium.orga9371762009-12-22 18:27:38 +0000584 expected relative path.
585 full_move means that move or copy operations should completely recreate the
586 files, usually in the prospect to apply the patch for a try job."""
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000587 # If the user specified a custom diff command in their svn config file,
588 # then it'll be used when we do svn diff, which we don't want to happen
589 # since we want the unified diff. Using --diff-cmd=diff doesn't always
590 # work, since they can have another diff executable in their path that
591 # gives different line endings. So we use a bogus temp directory as the
592 # config directory, which gets around these problems.
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000593 bogus_dir = tempfile.mkdtemp()
594 try:
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000595 # Use "svn info" output instead of os.path.isdir because the latter fails
596 # when the file is deleted.
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000597 return SVN._DiffItemInternal(filename, SVN.CaptureInfo(filename),
598 bogus_dir,
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000599 full_move=full_move, revision=revision)
600 finally:
601 shutil.rmtree(bogus_dir)
602
603 @staticmethod
604 def _DiffItemInternal(filename, info, bogus_dir, full_move=False,
605 revision=None):
606 """Grabs the diff data."""
607 command = ["diff", "--config-dir", bogus_dir, filename]
608 if revision:
609 command.extend(['--revision', revision])
610 data = None
611 if SVN.IsMovedInfo(info):
612 if full_move:
613 if info.get("Node Kind") == "directory":
614 # Things become tricky here. It's a directory copy/move. We need to
615 # diff all the files inside it.
616 # This will put a lot of pressure on the heap. This is why StringIO
617 # is used and converted back into a string at the end. The reason to
618 # return a string instead of a StringIO is that StringIO.write()
619 # doesn't accept a StringIO object. *sigh*.
620 for (dirpath, dirnames, filenames) in os.walk(filename):
621 # Cleanup all files starting with a '.'.
622 for d in dirnames:
623 if d.startswith('.'):
624 dirnames.remove(d)
625 for f in filenames:
626 if f.startswith('.'):
627 filenames.remove(f)
628 for f in filenames:
629 if data is None:
630 data = cStringIO.StringIO()
631 data.write(GenFakeDiff(os.path.join(dirpath, f)))
632 if data:
633 tmp = data.getvalue()
634 data.close()
635 data = tmp
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000636 else:
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000637 data = GenFakeDiff(filename)
638 else:
639 if info.get("Node Kind") != "directory":
maruel@chromium.org0836c562010-01-22 01:10:06 +0000640 # svn diff on a mv/cp'd file outputs nothing if there was no change.
maruel@chromium.org54019f32010-09-09 13:50:11 +0000641 data = SVN.Capture(command)
maruel@chromium.org0836c562010-01-22 01:10:06 +0000642 if not data:
643 # We put in an empty Index entry so upload.py knows about them.
maruel@chromium.orgc6d170e2010-06-03 00:06:00 +0000644 data = "Index: %s\n" % filename.replace(os.sep, '/')
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000645 # Otherwise silently ignore directories.
646 else:
647 if info.get("Node Kind") != "directory":
648 # Normal simple case.
maruel@chromium.org54019f32010-09-09 13:50:11 +0000649 data = SVN.Capture(command)
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000650 # Otherwise silently ignore directories.
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000651 return data
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000652
653 @staticmethod
maruel@chromium.org1c7db8e2010-01-07 02:00:19 +0000654 def GenerateDiff(filenames, root=None, full_move=False, revision=None):
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000655 """Returns a string containing the diff for the given file list.
656
657 The files in the list should either be absolute paths or relative to the
658 given root. If no root directory is provided, the repository root will be
659 used.
660 The diff will always use relative paths.
661 """
maruel@chromium.org00fdcb32011-02-24 01:41:02 +0000662 assert isinstance(filenames, (list, tuple))
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000663 previous_cwd = os.getcwd()
maruel@chromium.orgfd9cbbb2010-01-08 23:04:03 +0000664 root = root or SVN.GetCheckoutRoot(previous_cwd)
665 root = os.path.normcase(os.path.join(root, ''))
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000666 def RelativePath(path, root):
667 """We must use relative paths."""
maruel@chromium.orgfd9cbbb2010-01-08 23:04:03 +0000668 if os.path.normcase(path).startswith(root):
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000669 return path[len(root):]
670 return path
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000671 # If the user specified a custom diff command in their svn config file,
672 # then it'll be used when we do svn diff, which we don't want to happen
673 # since we want the unified diff. Using --diff-cmd=diff doesn't always
674 # work, since they can have another diff executable in their path that
675 # gives different line endings. So we use a bogus temp directory as the
676 # config directory, which gets around these problems.
677 bogus_dir = tempfile.mkdtemp()
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000678 try:
679 os.chdir(root)
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000680 # Cleanup filenames
681 filenames = [RelativePath(f, root) for f in filenames]
682 # Get information about the modified items (files and directories)
683 data = dict([(f, SVN.CaptureInfo(f)) for f in filenames])
gavinp@google.com3fda4cc2010-06-29 13:29:27 +0000684 diffs = []
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000685 if full_move:
686 # Eliminate modified files inside moved/copied directory.
687 for (filename, info) in data.iteritems():
688 if SVN.IsMovedInfo(info) and info.get("Node Kind") == "directory":
689 # Remove files inside the directory.
690 filenames = [f for f in filenames
691 if not f.startswith(filename + os.path.sep)]
692 for filename in data.keys():
693 if not filename in filenames:
694 # Remove filtered out items.
695 del data[filename]
gavinp@google.com3fda4cc2010-06-29 13:29:27 +0000696 else:
697 metaheaders = []
698 for (filename, info) in data.iteritems():
699 if SVN.IsMovedInfo(info):
700 # for now, the most common case is a head copy,
701 # so let's just encode that as a straight up cp.
702 srcurl = info.get('Copied From URL')
703 root = info.get('Repository Root')
704 rev = int(info.get('Copied From Rev'))
705 assert srcurl.startswith(root)
706 src = srcurl[len(root)+1:]
maruel@chromium.org00fdcb32011-02-24 01:41:02 +0000707 try:
708 srcinfo = SVN.CaptureInfo(srcurl)
709 except gclient_utils.CheckCallError, e:
710 if not 'Not a valid URL' in e.stderr:
711 raise
712 # Assume the file was deleted. No idea how to figure out at which
713 # revision the file was deleted.
714 srcinfo = {'Revision': rev}
gavinp@google.com3fda4cc2010-06-29 13:29:27 +0000715 if (srcinfo.get('Revision') != rev and
716 SVN.Capture(['diff', '-r', '%d:head' % rev, srcurl])):
717 metaheaders.append("#$ svn cp -r %d %s %s "
718 "### WARNING: note non-trunk copy\n" %
719 (rev, src, filename))
720 else:
721 metaheaders.append("#$ cp %s %s\n" % (src,
722 filename))
723
724 if metaheaders:
725 diffs.append("### BEGIN SVN COPY METADATA\n")
726 diffs.extend(metaheaders)
727 diffs.append("### END SVN COPY METADATA\n")
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000728 # Now ready to do the actual diff.
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000729 for filename in sorted(data.iterkeys()):
730 diffs.append(SVN._DiffItemInternal(filename, data[filename], bogus_dir,
731 full_move=full_move,
732 revision=revision))
733 # Use StringIO since it can be messy when diffing a directory move with
734 # full_move=True.
735 buf = cStringIO.StringIO()
736 for d in filter(None, diffs):
737 buf.write(d)
738 result = buf.getvalue()
739 buf.close()
740 return result
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000741 finally:
742 os.chdir(previous_cwd)
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000743 shutil.rmtree(bogus_dir)
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000744
745 @staticmethod
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000746 def GetEmail(repo_root):
747 """Retrieves the svn account which we assume is an email address."""
maruel@chromium.org54019f32010-09-09 13:50:11 +0000748 try:
749 infos = SVN.CaptureInfo(repo_root)
750 except gclient_utils.Error:
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000751 return None
752
753 # Should check for uuid but it is incorrectly saved for https creds.
maruel@chromium.org54019f32010-09-09 13:50:11 +0000754 root = infos['Repository Root']
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000755 realm = root.rsplit('/', 1)[0]
maruel@chromium.org54019f32010-09-09 13:50:11 +0000756 uuid = infos['UUID']
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000757 if root.startswith('https') or not uuid:
758 regexp = re.compile(r'<%s:\d+>.*' % realm)
759 else:
760 regexp = re.compile(r'<%s:\d+> %s' % (realm, uuid))
761 if regexp is None:
762 return None
763 if sys.platform.startswith('win'):
764 if not 'APPDATA' in os.environ:
765 return None
maruel@chromium.org720d9f32009-11-21 17:38:57 +0000766 auth_dir = os.path.join(os.environ['APPDATA'], 'Subversion', 'auth',
767 'svn.simple')
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000768 else:
769 if not 'HOME' in os.environ:
770 return None
771 auth_dir = os.path.join(os.environ['HOME'], '.subversion', 'auth',
772 'svn.simple')
773 for credfile in os.listdir(auth_dir):
774 cred_info = SVN.ReadSimpleAuth(os.path.join(auth_dir, credfile))
775 if regexp.match(cred_info.get('svn:realmstring')):
776 return cred_info.get('username')
777
778 @staticmethod
779 def ReadSimpleAuth(filename):
780 f = open(filename, 'r')
781 values = {}
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000782 def ReadOneItem(item_type):
783 m = re.match(r'%s (\d+)' % item_type, f.readline())
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000784 if not m:
785 return None
786 data = f.read(int(m.group(1)))
787 if f.read(1) != '\n':
788 return None
789 return data
790
791 while True:
792 key = ReadOneItem('K')
793 if not key:
794 break
795 value = ReadOneItem('V')
796 if not value:
797 break
798 values[key] = value
799 return values
maruel@chromium.org94b1ee92009-12-19 20:27:20 +0000800
801 @staticmethod
802 def GetCheckoutRoot(directory):
803 """Returns the top level directory of the current repository.
804
805 The directory is returned as an absolute path.
806 """
maruel@chromium.orgf7ae6d52009-12-22 20:49:04 +0000807 directory = os.path.abspath(directory)
maruel@chromium.org54019f32010-09-09 13:50:11 +0000808 try:
809 cur_dir_repo_root = SVN.CaptureInfo(directory)['Repository Root']
810 except gclient_utils.Error:
maruel@chromium.org94b1ee92009-12-19 20:27:20 +0000811 return None
maruel@chromium.org94b1ee92009-12-19 20:27:20 +0000812 while True:
813 parent = os.path.dirname(directory)
maruel@chromium.org54019f32010-09-09 13:50:11 +0000814 try:
815 if SVN.CaptureInfo(parent)['Repository Root'] != cur_dir_repo_root:
816 break
817 except gclient_utils.Error:
maruel@chromium.org94b1ee92009-12-19 20:27:20 +0000818 break
819 directory = parent
maruel@chromium.orgfd9cbbb2010-01-08 23:04:03 +0000820 return GetCasedPath(directory)
tony@chromium.org57564662010-04-14 02:35:12 +0000821
822 @staticmethod
823 def AssertVersion(min_version):
824 """Asserts svn's version is at least min_version."""
825 def only_int(val):
826 if val.isdigit():
827 return int(val)
828 else:
829 return 0
830 if not SVN.current_version:
831 SVN.current_version = SVN.Capture(['--version']).split()[2]
832 current_version_list = map(only_int, SVN.current_version.split('.'))
833 for min_ver in map(int, min_version.split('.')):
834 ver = current_version_list.pop(0)
835 if ver < min_ver:
836 return (False, SVN.current_version)
837 elif ver > min_ver:
838 return (True, SVN.current_version)
839 return (True, SVN.current_version)
maruel@chromium.org07ab60e2011-02-08 21:54:00 +0000840
841 @staticmethod
842 def Revert(repo_root, callback=None, ignore_externals=False):
843 """Reverts all svn modifications in repo_root, including properties.
844
845 Deletes any modified files or directory.
846
847 A "svn update --revision BASE" call is required after to revive deleted
848 files.
849 """
850 for file_status in SVN.CaptureStatus(repo_root):
851 file_path = os.path.join(repo_root, file_status[1])
852 if ignore_externals and file_status[0][0] == 'X':
853 # Ignore externals.
854 logging.info('Ignoring external %s' % file_status[1])
855 continue
856
857 if callback:
858 callback(file_status)
859
860 if file_status[0].isspace():
861 # Try reverting the file since it's probably a property change.
862 gclient_utils.CheckCall(
863 ['svn', 'revert', file_status[1]], cwd=repo_root)
864
865 # svn revert is really stupid. It fails on inconsistent line-endings,
866 # on switched directories, etc. So take no chance and delete everything!
867 if file_status[0][0] == 'D':
868 # Deleted file requires manual intervention and require calling
869 # revert, like for properties.
870 gclient_utils.CheckCall(
871 ['svn', 'revert', file_status[1]], cwd=repo_root)
872 else:
873 if not os.path.exists(file_path):
874 pass
875 elif os.path.isfile(file_path) or os.path.islink(file_path):
876 logging.info('os.remove(%s)' % file_path)
877 os.remove(file_path)
878 elif os.path.isdir(file_path):
879 logging.info('gclient_utils.RemoveDirectory(%s)' % file_path)
880 gclient_utils.RemoveDirectory(file_path)
881 else:
882 logging.critical(
883 ('No idea what is %s.\nYou just found a bug in gclient'
884 ', please ping maruel@chromium.org ASAP!') % file_path)