blob: 2690f1f9bb4fa3f83d3ef0bfc4c544668ec63064 [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:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000147 # 1) iterate through our branch history and find the svn URL.
148 # 2) find the svn-remote that fetches from the URL.
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000149
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
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000153 # We don't want to go through all of history, so read a line from the
154 # pipe at a time.
155 # The -100 is an arbitrary limit so we don't search forever.
156 cmd = ['git', 'log', '-100', '--pretty=medium']
157 proc = gclient_utils.Popen(cmd, stdout=subprocess.PIPE)
158 for line in proc.stdout:
159 match = git_svn_re.match(line)
160 if match:
161 url = match.group(1)
162 proc.stdout.close() # Cut pipe.
163 break
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000164
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000165 if url:
166 svn_remote_re = re.compile(r'^svn-remote\.([^.]+)\.url (.*)$')
167 remotes = GIT.Capture(['config', '--get-regexp',
168 r'^svn-remote\..*\.url'], cwd=cwd).splitlines()
169 for remote in remotes:
170 match = svn_remote_re.match(remote)
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000171 if match:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000172 remote = match.group(1)
173 base_url = match.group(2)
174 fetch_spec = GIT.Capture(
175 ['config', 'svn-remote.%s.fetch' % remote],
176 cwd=cwd).strip().split(':')
177 if fetch_spec[0]:
178 full_url = base_url + '/' + fetch_spec[0]
179 else:
180 full_url = base_url
181 if full_url == url:
182 return fetch_spec[1]
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000183
184 @staticmethod
185 def FetchUpstreamTuple(cwd):
186 """Returns a tuple containg remote and remote ref,
187 e.g. 'origin', 'refs/heads/master'
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000188 Tries to be intelligent and understand git-svn.
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000189 """
190 remote = '.'
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000191 branch = GIT.GetBranch(cwd)
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000192 try:
193 upstream_branch = GIT.Capture(
194 ['config', 'branch.%s.merge' % branch], cwd=cwd).strip()
195 except gclient_utils.Error:
196 upstream_branch = None
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000197 if upstream_branch:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000198 try:
199 remote = GIT.Capture(
200 ['config', 'branch.%s.remote' % branch], cwd=cwd).strip()
201 except gclient_utils.Error:
202 pass
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000203 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000204 try:
205 upstream_branch = GIT.Capture(
206 ['config', 'rietveld.upstream-branch'], cwd=cwd).strip()
207 except gclient_utils.Error:
208 upstream_branch = None
209 if upstream_branch:
210 try:
211 remote = GIT.Capture(
212 ['config', 'rietveld.upstream-remote'], cwd=cwd).strip()
213 except gclient_utils.Error:
214 pass
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000215 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000216 # Fall back on trying a git-svn upstream branch.
217 if GIT.IsGitSvn(cwd):
218 upstream_branch = GIT.GetSVNBranch(cwd)
maruel@chromium.orga630bd72010-04-29 23:32:34 +0000219 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000220 # Else, try to guess the origin remote.
221 remote_branches = GIT.Capture(['branch', '-r'], cwd=cwd).split()
222 if 'origin/master' in remote_branches:
223 # Fall back on origin/master if it exits.
224 remote = 'origin'
225 upstream_branch = 'refs/heads/master'
226 elif 'origin/trunk' in remote_branches:
227 # Fall back on origin/trunk if it exists. Generally a shared
228 # git-svn clone
229 remote = 'origin'
230 upstream_branch = 'refs/heads/trunk'
231 else:
232 # Give up.
233 remote = None
234 upstream_branch = None
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000235 return remote, upstream_branch
236
237 @staticmethod
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000238 def GetUpstreamBranch(cwd):
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000239 """Gets the current branch's upstream branch."""
240 remote, upstream_branch = GIT.FetchUpstreamTuple(cwd)
maruel@chromium.orga630bd72010-04-29 23:32:34 +0000241 if remote != '.' and upstream_branch:
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000242 upstream_branch = upstream_branch.replace('heads', 'remotes/' + remote)
243 return upstream_branch
244
245 @staticmethod
maruel@chromium.org8ede00e2010-01-12 14:35:28 +0000246 def GenerateDiff(cwd, branch=None, branch_head='HEAD', full_move=False,
247 files=None):
maruel@chromium.orga9371762009-12-22 18:27:38 +0000248 """Diffs against the upstream branch or optionally another branch.
249
250 full_move means that move or copy operations should completely recreate the
251 files, usually in the prospect to apply the patch for a try job."""
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000252 if not branch:
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000253 branch = GIT.GetUpstreamBranch(cwd)
evan@chromium.org400f3e72010-05-19 14:23:36 +0000254 command = ['diff', '-p', '--no-prefix', '--no-ext-diff',
255 branch + "..." + branch_head]
maruel@chromium.orga9371762009-12-22 18:27:38 +0000256 if not full_move:
257 command.append('-C')
maruel@chromium.org8ede00e2010-01-12 14:35:28 +0000258 # TODO(maruel): --binary support.
259 if files:
260 command.append('--')
261 command.extend(files)
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000262 diff = GIT.Capture(command, cwd=cwd).splitlines(True)
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000263 for i in range(len(diff)):
264 # In the case of added files, replace /dev/null with the path to the
265 # file being added.
266 if diff[i].startswith('--- /dev/null'):
267 diff[i] = '--- %s' % diff[i+1][4:]
268 return ''.join(diff)
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000269
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000270 @staticmethod
maruel@chromium.org8ede00e2010-01-12 14:35:28 +0000271 def GetDifferentFiles(cwd, branch=None, branch_head='HEAD'):
272 """Returns the list of modified files between two branches."""
273 if not branch:
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000274 branch = GIT.GetUpstreamBranch(cwd)
bauerb@chromium.org838f0f22010-04-09 17:02:50 +0000275 command = ['diff', '--name-only', branch + "..." + branch_head]
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000276 return GIT.Capture(command, cwd=cwd).splitlines(False)
maruel@chromium.org8ede00e2010-01-12 14:35:28 +0000277
278 @staticmethod
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000279 def GetPatchName(cwd):
280 """Constructs a name for this patch."""
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000281 short_sha = GIT.Capture(['rev-parse', '--short=4', 'HEAD'], cwd=cwd).strip()
maruel@chromium.org862ff8e2010-08-06 15:29:16 +0000282 return "%s#%s" % (GIT.GetBranch(cwd), short_sha)
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000283
284 @staticmethod
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000285 def GetCheckoutRoot(cwd):
maruel@chromium.org01d8c1d2010-01-07 01:56:59 +0000286 """Returns the top level directory of a git checkout as an absolute path.
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000287 """
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000288 root = GIT.Capture(['rev-parse', '--show-cdup'], cwd=cwd).strip()
289 return os.path.abspath(os.path.join(cwd, root))
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000290
maruel@chromium.orgd0f854a2010-03-11 19:35:53 +0000291 @staticmethod
292 def AssertVersion(min_version):
293 """Asserts git's version is at least min_version."""
294 def only_int(val):
295 if val.isdigit():
296 return int(val)
297 else:
298 return 0
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000299 current_version = GIT.Capture(['--version']).split()[-1]
maruel@chromium.orgd0f854a2010-03-11 19:35:53 +0000300 current_version_list = map(only_int, current_version.split('.'))
301 for min_ver in map(int, min_version.split('.')):
302 ver = current_version_list.pop(0)
303 if ver < min_ver:
304 return (False, current_version)
305 elif ver > min_ver:
306 return (True, current_version)
307 return (True, current_version)
308
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000309
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000310class SVN(object):
tony@chromium.org57564662010-04-14 02:35:12 +0000311 current_version = None
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000312
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000313 @staticmethod
maruel@chromium.org54019f32010-09-09 13:50:11 +0000314 def Capture(args, **kwargs):
315 """Always redirect stderr.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000316
maruel@chromium.org54019f32010-09-09 13:50:11 +0000317 Throws an exception if non-0 is returned."""
318 return gclient_utils.CheckCall(['svn'] + args, print_error=False,
319 **kwargs)[0]
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000320
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000321 @staticmethod
maruel@chromium.org2b9aa8e2010-08-25 20:01:42 +0000322 def RunAndGetFileList(verbose, args, cwd, file_list, stdout=None):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000323 """Runs svn checkout, update, or status, output to stdout.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000324
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000325 The first item in args must be either "checkout", "update", or "status".
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000326
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000327 svn's stdout is parsed to collect a list of files checked out or updated.
328 These files are appended to file_list. svn's stdout is also printed to
329 sys.stdout as in Run.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000330
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000331 Args:
maruel@chromium.org03807072010-08-16 17:18:44 +0000332 verbose: If True, uses verbose output
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000333 args: A sequence of command line parameters to be passed to svn.
maruel@chromium.org2b9aa8e2010-08-25 20:01:42 +0000334 cwd: The directory where svn is to be run.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000335
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000336 Raises:
337 Error: An error occurred while running the svn command.
338 """
maruel@chromium.org2b9aa8e2010-08-25 20:01:42 +0000339 stdout = stdout or sys.stdout
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000340
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000341 # svn update and svn checkout use the same pattern: the first three columns
342 # are for file status, property status, and lock status. This is followed
343 # by two spaces, and then the path to the file.
344 update_pattern = '^... (.*)$'
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000345
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000346 # The first three columns of svn status are the same as for svn update and
347 # svn checkout. The next three columns indicate addition-with-history,
348 # switch, and remote lock status. This is followed by one space, and then
349 # the path to the file.
350 status_pattern = '^...... (.*)$'
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000351
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000352 # args[0] must be a supported command. This will blow up if it's something
353 # else, which is good. Note that the patterns are only effective when
354 # these commands are used in their ordinary forms, the patterns are invalid
355 # for "svn status --show-updates", for example.
356 pattern = {
357 'checkout': update_pattern,
358 'status': status_pattern,
359 'update': update_pattern,
360 }[args[0]]
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000361 compiled_pattern = re.compile(pattern)
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000362 # Place an upper limit.
cbentzel@chromium.org2aee2292010-09-03 14:15:25 +0000363 backoff_time = 5
maruel@chromium.orgbec588d2010-10-26 13:50:25 +0000364 retries = 0
maruel@chromium.org03507062010-10-26 00:58:27 +0000365 while True:
maruel@chromium.orgbec588d2010-10-26 13:50:25 +0000366 retries += 1
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000367 previous_list_len = len(file_list)
368 failure = []
maruel@chromium.org54d1f1a2010-01-08 19:53:47 +0000369
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000370 def CaptureMatchingLines(line):
371 match = compiled_pattern.search(line)
372 if match:
373 file_list.append(match.group(1))
374 if line.startswith('svn: '):
maruel@chromium.org8599aa72010-02-08 20:27:14 +0000375 failure.append(line)
maruel@chromium.org54d1f1a2010-01-08 19:53:47 +0000376
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000377 try:
maruel@chromium.org17d01792010-09-01 18:07:10 +0000378 gclient_utils.CheckCallAndFilterAndHeader(
379 ['svn'] + args,
380 cwd=cwd,
381 always=verbose,
382 filter_fn=CaptureMatchingLines,
383 stdout=stdout)
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000384 except gclient_utils.Error:
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000385 def IsKnownFailure():
386 for x in failure:
387 if (x.startswith('svn: OPTIONS of') or
388 x.startswith('svn: PROPFIND of') or
389 x.startswith('svn: REPORT of') or
maruel@chromium.orgf61fc932010-08-19 13:05:24 +0000390 x.startswith('svn: Unknown hostname') or
391 x.startswith('svn: Server sent unexpected return value')):
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000392 return True
393 return False
394
maruel@chromium.org953586a2010-06-15 14:22:24 +0000395 # Subversion client is really misbehaving with Google Code.
396 if args[0] == 'checkout':
397 # Ensure at least one file was checked out, otherwise *delete* the
398 # directory.
399 if len(file_list) == previous_list_len:
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000400 if not IsKnownFailure():
maruel@chromium.org953586a2010-06-15 14:22:24 +0000401 # No known svn error was found, bail out.
402 raise
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000403 # No file were checked out, so make sure the directory is
404 # deleted in case it's messed up and try again.
405 # Warning: It's bad, it assumes args[2] is the directory
406 # argument.
407 if os.path.isdir(args[2]):
408 gclient_utils.RemoveDirectory(args[2])
maruel@chromium.org953586a2010-06-15 14:22:24 +0000409 else:
410 # Progress was made, convert to update since an aborted checkout
411 # is now an update.
maruel@chromium.org2de10252010-02-08 01:10:39 +0000412 args = ['update'] + args[1:]
maruel@chromium.org953586a2010-06-15 14:22:24 +0000413 else:
414 # It was an update or export.
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000415 # We enforce that some progress has been made or a known failure.
416 if len(file_list) == previous_list_len and not IsKnownFailure():
417 # No known svn error was found and no progress, bail out.
418 raise
maruel@chromium.orgbec588d2010-10-26 13:50:25 +0000419 if retries == 10:
maruel@chromium.org03507062010-10-26 00:58:27 +0000420 raise
cbentzel@chromium.org2aee2292010-09-03 14:15:25 +0000421 print "Sleeping %.1f seconds and retrying...." % backoff_time
422 time.sleep(backoff_time)
423 backoff_time *= 1.3
maruel@chromium.org953586a2010-06-15 14:22:24 +0000424 continue
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000425 break
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000426
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000427 @staticmethod
maruel@chromium.org54019f32010-09-09 13:50:11 +0000428 def CaptureInfo(cwd):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000429 """Returns a dictionary from the svn info output for the given file.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000430
maruel@chromium.org54019f32010-09-09 13:50:11 +0000431 Throws an exception if svn info fails."""
432 output = SVN.Capture(['info', '--xml', cwd])
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000433 dom = gclient_utils.ParseXML(output)
434 result = {}
435 if dom:
436 GetNamedNodeText = gclient_utils.GetNamedNodeText
437 GetNodeNamedAttributeText = gclient_utils.GetNodeNamedAttributeText
438 def C(item, f):
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000439 if item is not None:
440 return f(item)
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000441 # /info/entry/
442 # url
443 # reposityory/(root|uuid)
444 # wc-info/(schedule|depth)
445 # commit/(author|date)
446 # str() the results because they may be returned as Unicode, which
447 # interferes with the higher layers matching up things in the deps
448 # dictionary.
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000449 result['Repository Root'] = C(GetNamedNodeText(dom, 'root'), str)
450 result['URL'] = C(GetNamedNodeText(dom, 'url'), str)
451 result['UUID'] = C(GetNamedNodeText(dom, 'uuid'), str)
452 result['Revision'] = C(GetNodeNamedAttributeText(dom, 'entry',
453 'revision'),
454 int)
455 result['Node Kind'] = C(GetNodeNamedAttributeText(dom, 'entry', 'kind'),
456 str)
457 # Differs across versions.
458 if result['Node Kind'] == 'dir':
459 result['Node Kind'] = 'directory'
460 result['Schedule'] = C(GetNamedNodeText(dom, 'schedule'), str)
461 result['Path'] = C(GetNodeNamedAttributeText(dom, 'entry', 'path'), str)
462 result['Copied From URL'] = C(GetNamedNodeText(dom, 'copy-from-url'), str)
463 result['Copied From Rev'] = C(GetNamedNodeText(dom, 'copy-from-rev'), str)
464 return result
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000465
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000466 @staticmethod
maruel@chromium.org54019f32010-09-09 13:50:11 +0000467 def CaptureRevision(cwd):
nasser@codeaurora.org5d63eb82010-03-24 23:22:09 +0000468 """Get the base revision of a SVN repository.
469
470 Returns:
471 Int base revision
472 """
maruel@chromium.org54019f32010-09-09 13:50:11 +0000473 info = SVN.Capture(['info', '--xml'], cwd=cwd)
nasser@codeaurora.org5d63eb82010-03-24 23:22:09 +0000474 dom = xml.dom.minidom.parseString(info)
475 return dom.getElementsByTagName('entry')[0].getAttribute('revision')
476
477 @staticmethod
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000478 def CaptureStatus(files):
479 """Returns the svn 1.5 svn status emulated output.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000480
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000481 @files can be a string (one file) or a list of files.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000482
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000483 Returns an array of (status, file) tuples."""
484 command = ["status", "--xml"]
485 if not files:
486 pass
487 elif isinstance(files, basestring):
488 command.append(files)
489 else:
490 command.extend(files)
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000491
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000492 status_letter = {
493 None: ' ',
494 '': ' ',
495 'added': 'A',
496 'conflicted': 'C',
497 'deleted': 'D',
498 'external': 'X',
499 'ignored': 'I',
500 'incomplete': '!',
501 'merged': 'G',
502 'missing': '!',
503 'modified': 'M',
504 'none': ' ',
505 'normal': ' ',
506 'obstructed': '~',
507 'replaced': 'R',
508 'unversioned': '?',
509 }
510 dom = gclient_utils.ParseXML(SVN.Capture(command))
511 results = []
512 if dom:
513 # /status/target/entry/(wc-status|commit|author|date)
514 for target in dom.getElementsByTagName('target'):
515 #base_path = target.getAttribute('path')
516 for entry in target.getElementsByTagName('entry'):
517 file_path = entry.getAttribute('path')
518 wc_status = entry.getElementsByTagName('wc-status')
519 assert len(wc_status) == 1
520 # Emulate svn 1.5 status ouput...
521 statuses = [' '] * 7
522 # Col 0
523 xml_item_status = wc_status[0].getAttribute('item')
524 if xml_item_status in status_letter:
525 statuses[0] = status_letter[xml_item_status]
526 else:
maruel@chromium.org54019f32010-09-09 13:50:11 +0000527 raise gclient_utils.Error(
528 'Unknown item status "%s"; please implement me!' %
529 xml_item_status)
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000530 # Col 1
531 xml_props_status = wc_status[0].getAttribute('props')
532 if xml_props_status == 'modified':
533 statuses[1] = 'M'
534 elif xml_props_status == 'conflicted':
535 statuses[1] = 'C'
536 elif (not xml_props_status or xml_props_status == 'none' or
537 xml_props_status == 'normal'):
538 pass
539 else:
maruel@chromium.org54019f32010-09-09 13:50:11 +0000540 raise gclient_utils.Error(
541 'Unknown props status "%s"; please implement me!' %
542 xml_props_status)
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000543 # Col 2
544 if wc_status[0].getAttribute('wc-locked') == 'true':
545 statuses[2] = 'L'
546 # Col 3
547 if wc_status[0].getAttribute('copied') == 'true':
548 statuses[3] = '+'
549 # Col 4
550 if wc_status[0].getAttribute('switched') == 'true':
551 statuses[4] = 'S'
552 # TODO(maruel): Col 5 and 6
553 item = (''.join(statuses), file_path)
554 results.append(item)
555 return results
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000556
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000557 @staticmethod
558 def IsMoved(filename):
559 """Determine if a file has been added through svn mv"""
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000560 return SVN.IsMovedInfo(SVN.CaptureInfo(filename))
561
562 @staticmethod
563 def IsMovedInfo(info):
564 """Determine if a file has been added through svn mv"""
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000565 return (info.get('Copied From URL') and
566 info.get('Copied From Rev') and
567 info.get('Schedule') == 'add')
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000568
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000569 @staticmethod
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000570 def GetFileProperty(filename, property_name):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000571 """Returns the value of an SVN property for the given file.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000572
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000573 Args:
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000574 filename: The file to check
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000575 property_name: The name of the SVN property, e.g. "svn:mime-type"
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000576
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000577 Returns:
578 The value of the property, which will be the empty string if the property
579 is not set on the file. If the file is not under version control, the
580 empty string is also returned.
581 """
maruel@chromium.org54019f32010-09-09 13:50:11 +0000582 try:
583 return SVN.Capture(['propget', property_name, filename])
584 except gclient_utils.Error:
585 return ''
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000586
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000587 @staticmethod
maruel@chromium.org1c7db8e2010-01-07 02:00:19 +0000588 def DiffItem(filename, full_move=False, revision=None):
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000589 """Diffs a single file.
590
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000591 Should be simple, eh? No it isn't.
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000592 Be sure to be in the appropriate directory before calling to have the
maruel@chromium.orga9371762009-12-22 18:27:38 +0000593 expected relative path.
594 full_move means that move or copy operations should completely recreate the
595 files, usually in the prospect to apply the patch for a try job."""
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000596 # If the user specified a custom diff command in their svn config file,
597 # then it'll be used when we do svn diff, which we don't want to happen
598 # since we want the unified diff. Using --diff-cmd=diff doesn't always
599 # work, since they can have another diff executable in their path that
600 # gives different line endings. So we use a bogus temp directory as the
601 # config directory, which gets around these problems.
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000602 bogus_dir = tempfile.mkdtemp()
603 try:
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000604 # Use "svn info" output instead of os.path.isdir because the latter fails
605 # when the file is deleted.
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000606 return SVN._DiffItemInternal(filename, SVN.CaptureInfo(filename),
607 bogus_dir,
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000608 full_move=full_move, revision=revision)
609 finally:
610 shutil.rmtree(bogus_dir)
611
612 @staticmethod
613 def _DiffItemInternal(filename, info, bogus_dir, full_move=False,
614 revision=None):
615 """Grabs the diff data."""
616 command = ["diff", "--config-dir", bogus_dir, filename]
617 if revision:
618 command.extend(['--revision', revision])
619 data = None
620 if SVN.IsMovedInfo(info):
621 if full_move:
622 if info.get("Node Kind") == "directory":
623 # Things become tricky here. It's a directory copy/move. We need to
624 # diff all the files inside it.
625 # This will put a lot of pressure on the heap. This is why StringIO
626 # is used and converted back into a string at the end. The reason to
627 # return a string instead of a StringIO is that StringIO.write()
628 # doesn't accept a StringIO object. *sigh*.
629 for (dirpath, dirnames, filenames) in os.walk(filename):
630 # Cleanup all files starting with a '.'.
631 for d in dirnames:
632 if d.startswith('.'):
633 dirnames.remove(d)
634 for f in filenames:
635 if f.startswith('.'):
636 filenames.remove(f)
637 for f in filenames:
638 if data is None:
639 data = cStringIO.StringIO()
640 data.write(GenFakeDiff(os.path.join(dirpath, f)))
641 if data:
642 tmp = data.getvalue()
643 data.close()
644 data = tmp
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000645 else:
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000646 data = GenFakeDiff(filename)
647 else:
648 if info.get("Node Kind") != "directory":
maruel@chromium.org0836c562010-01-22 01:10:06 +0000649 # svn diff on a mv/cp'd file outputs nothing if there was no change.
maruel@chromium.org54019f32010-09-09 13:50:11 +0000650 data = SVN.Capture(command)
maruel@chromium.org0836c562010-01-22 01:10:06 +0000651 if not data:
652 # We put in an empty Index entry so upload.py knows about them.
maruel@chromium.orgc6d170e2010-06-03 00:06:00 +0000653 data = "Index: %s\n" % filename.replace(os.sep, '/')
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000654 # Otherwise silently ignore directories.
655 else:
656 if info.get("Node Kind") != "directory":
657 # Normal simple case.
maruel@chromium.org54019f32010-09-09 13:50:11 +0000658 data = SVN.Capture(command)
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000659 # Otherwise silently ignore directories.
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000660 return data
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000661
662 @staticmethod
maruel@chromium.org1c7db8e2010-01-07 02:00:19 +0000663 def GenerateDiff(filenames, root=None, full_move=False, revision=None):
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000664 """Returns a string containing the diff for the given file list.
665
666 The files in the list should either be absolute paths or relative to the
667 given root. If no root directory is provided, the repository root will be
668 used.
669 The diff will always use relative paths.
670 """
maruel@chromium.org00fdcb32011-02-24 01:41:02 +0000671 assert isinstance(filenames, (list, tuple))
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000672 previous_cwd = os.getcwd()
maruel@chromium.orgfd9cbbb2010-01-08 23:04:03 +0000673 root = root or SVN.GetCheckoutRoot(previous_cwd)
674 root = os.path.normcase(os.path.join(root, ''))
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000675 def RelativePath(path, root):
676 """We must use relative paths."""
maruel@chromium.orgfd9cbbb2010-01-08 23:04:03 +0000677 if os.path.normcase(path).startswith(root):
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000678 return path[len(root):]
679 return path
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000680 # If the user specified a custom diff command in their svn config file,
681 # then it'll be used when we do svn diff, which we don't want to happen
682 # since we want the unified diff. Using --diff-cmd=diff doesn't always
683 # work, since they can have another diff executable in their path that
684 # gives different line endings. So we use a bogus temp directory as the
685 # config directory, which gets around these problems.
686 bogus_dir = tempfile.mkdtemp()
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000687 try:
688 os.chdir(root)
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000689 # Cleanup filenames
690 filenames = [RelativePath(f, root) for f in filenames]
691 # Get information about the modified items (files and directories)
692 data = dict([(f, SVN.CaptureInfo(f)) for f in filenames])
gavinp@google.com3fda4cc2010-06-29 13:29:27 +0000693 diffs = []
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000694 if full_move:
695 # Eliminate modified files inside moved/copied directory.
696 for (filename, info) in data.iteritems():
697 if SVN.IsMovedInfo(info) and info.get("Node Kind") == "directory":
698 # Remove files inside the directory.
699 filenames = [f for f in filenames
700 if not f.startswith(filename + os.path.sep)]
701 for filename in data.keys():
702 if not filename in filenames:
703 # Remove filtered out items.
704 del data[filename]
gavinp@google.com3fda4cc2010-06-29 13:29:27 +0000705 else:
706 metaheaders = []
707 for (filename, info) in data.iteritems():
708 if SVN.IsMovedInfo(info):
709 # for now, the most common case is a head copy,
710 # so let's just encode that as a straight up cp.
711 srcurl = info.get('Copied From URL')
712 root = info.get('Repository Root')
713 rev = int(info.get('Copied From Rev'))
714 assert srcurl.startswith(root)
715 src = srcurl[len(root)+1:]
maruel@chromium.org00fdcb32011-02-24 01:41:02 +0000716 try:
717 srcinfo = SVN.CaptureInfo(srcurl)
718 except gclient_utils.CheckCallError, e:
719 if not 'Not a valid URL' in e.stderr:
720 raise
721 # Assume the file was deleted. No idea how to figure out at which
722 # revision the file was deleted.
723 srcinfo = {'Revision': rev}
gavinp@google.com3fda4cc2010-06-29 13:29:27 +0000724 if (srcinfo.get('Revision') != rev and
725 SVN.Capture(['diff', '-r', '%d:head' % rev, srcurl])):
726 metaheaders.append("#$ svn cp -r %d %s %s "
727 "### WARNING: note non-trunk copy\n" %
728 (rev, src, filename))
729 else:
730 metaheaders.append("#$ cp %s %s\n" % (src,
731 filename))
732
733 if metaheaders:
734 diffs.append("### BEGIN SVN COPY METADATA\n")
735 diffs.extend(metaheaders)
736 diffs.append("### END SVN COPY METADATA\n")
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000737 # Now ready to do the actual diff.
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000738 for filename in sorted(data.iterkeys()):
739 diffs.append(SVN._DiffItemInternal(filename, data[filename], bogus_dir,
740 full_move=full_move,
741 revision=revision))
742 # Use StringIO since it can be messy when diffing a directory move with
743 # full_move=True.
744 buf = cStringIO.StringIO()
745 for d in filter(None, diffs):
746 buf.write(d)
747 result = buf.getvalue()
748 buf.close()
749 return result
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000750 finally:
751 os.chdir(previous_cwd)
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000752 shutil.rmtree(bogus_dir)
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000753
754 @staticmethod
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000755 def GetEmail(repo_root):
756 """Retrieves the svn account which we assume is an email address."""
maruel@chromium.org54019f32010-09-09 13:50:11 +0000757 try:
758 infos = SVN.CaptureInfo(repo_root)
759 except gclient_utils.Error:
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000760 return None
761
762 # Should check for uuid but it is incorrectly saved for https creds.
maruel@chromium.org54019f32010-09-09 13:50:11 +0000763 root = infos['Repository Root']
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000764 realm = root.rsplit('/', 1)[0]
maruel@chromium.org54019f32010-09-09 13:50:11 +0000765 uuid = infos['UUID']
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000766 if root.startswith('https') or not uuid:
767 regexp = re.compile(r'<%s:\d+>.*' % realm)
768 else:
769 regexp = re.compile(r'<%s:\d+> %s' % (realm, uuid))
770 if regexp is None:
771 return None
772 if sys.platform.startswith('win'):
773 if not 'APPDATA' in os.environ:
774 return None
maruel@chromium.org720d9f32009-11-21 17:38:57 +0000775 auth_dir = os.path.join(os.environ['APPDATA'], 'Subversion', 'auth',
776 'svn.simple')
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000777 else:
778 if not 'HOME' in os.environ:
779 return None
780 auth_dir = os.path.join(os.environ['HOME'], '.subversion', 'auth',
781 'svn.simple')
782 for credfile in os.listdir(auth_dir):
783 cred_info = SVN.ReadSimpleAuth(os.path.join(auth_dir, credfile))
784 if regexp.match(cred_info.get('svn:realmstring')):
785 return cred_info.get('username')
786
787 @staticmethod
788 def ReadSimpleAuth(filename):
789 f = open(filename, 'r')
790 values = {}
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000791 def ReadOneItem(item_type):
792 m = re.match(r'%s (\d+)' % item_type, f.readline())
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000793 if not m:
794 return None
795 data = f.read(int(m.group(1)))
796 if f.read(1) != '\n':
797 return None
798 return data
799
800 while True:
801 key = ReadOneItem('K')
802 if not key:
803 break
804 value = ReadOneItem('V')
805 if not value:
806 break
807 values[key] = value
808 return values
maruel@chromium.org94b1ee92009-12-19 20:27:20 +0000809
810 @staticmethod
811 def GetCheckoutRoot(directory):
812 """Returns the top level directory of the current repository.
813
814 The directory is returned as an absolute path.
815 """
maruel@chromium.orgf7ae6d52009-12-22 20:49:04 +0000816 directory = os.path.abspath(directory)
maruel@chromium.org54019f32010-09-09 13:50:11 +0000817 try:
maruel@chromium.org885d6e82011-02-24 20:21:46 +0000818 info = SVN.CaptureInfo(directory)
819 cur_dir_repo_root = info['Repository Root']
820 url = info['URL']
maruel@chromium.org54019f32010-09-09 13:50:11 +0000821 except gclient_utils.Error:
maruel@chromium.org94b1ee92009-12-19 20:27:20 +0000822 return None
maruel@chromium.org94b1ee92009-12-19 20:27:20 +0000823 while True:
824 parent = os.path.dirname(directory)
maruel@chromium.org54019f32010-09-09 13:50:11 +0000825 try:
maruel@chromium.org885d6e82011-02-24 20:21:46 +0000826 info = SVN.CaptureInfo(parent)
827 if (info['Repository Root'] != cur_dir_repo_root or
828 info['URL'] != os.path.dirname(url)):
maruel@chromium.org54019f32010-09-09 13:50:11 +0000829 break
maruel@chromium.org885d6e82011-02-24 20:21:46 +0000830 url = info['URL']
maruel@chromium.org54019f32010-09-09 13:50:11 +0000831 except gclient_utils.Error:
maruel@chromium.org94b1ee92009-12-19 20:27:20 +0000832 break
833 directory = parent
maruel@chromium.orgfd9cbbb2010-01-08 23:04:03 +0000834 return GetCasedPath(directory)
tony@chromium.org57564662010-04-14 02:35:12 +0000835
836 @staticmethod
837 def AssertVersion(min_version):
838 """Asserts svn's version is at least min_version."""
839 def only_int(val):
840 if val.isdigit():
841 return int(val)
842 else:
843 return 0
844 if not SVN.current_version:
845 SVN.current_version = SVN.Capture(['--version']).split()[2]
846 current_version_list = map(only_int, SVN.current_version.split('.'))
847 for min_ver in map(int, min_version.split('.')):
848 ver = current_version_list.pop(0)
849 if ver < min_ver:
850 return (False, SVN.current_version)
851 elif ver > min_ver:
852 return (True, SVN.current_version)
853 return (True, SVN.current_version)
maruel@chromium.org07ab60e2011-02-08 21:54:00 +0000854
855 @staticmethod
856 def Revert(repo_root, callback=None, ignore_externals=False):
857 """Reverts all svn modifications in repo_root, including properties.
858
859 Deletes any modified files or directory.
860
861 A "svn update --revision BASE" call is required after to revive deleted
862 files.
863 """
864 for file_status in SVN.CaptureStatus(repo_root):
865 file_path = os.path.join(repo_root, file_status[1])
866 if ignore_externals and file_status[0][0] == 'X':
867 # Ignore externals.
868 logging.info('Ignoring external %s' % file_status[1])
869 continue
870
871 if callback:
872 callback(file_status)
873
874 if file_status[0].isspace():
875 # Try reverting the file since it's probably a property change.
876 gclient_utils.CheckCall(
877 ['svn', 'revert', file_status[1]], cwd=repo_root)
878
879 # svn revert is really stupid. It fails on inconsistent line-endings,
880 # on switched directories, etc. So take no chance and delete everything!
881 if file_status[0][0] == 'D':
882 # Deleted file requires manual intervention and require calling
883 # revert, like for properties.
884 gclient_utils.CheckCall(
885 ['svn', 'revert', file_status[1]], cwd=repo_root)
886 else:
887 if not os.path.exists(file_path):
888 pass
889 elif os.path.isfile(file_path) or os.path.islink(file_path):
890 logging.info('os.remove(%s)' % file_path)
891 os.remove(file_path)
892 elif os.path.isdir(file_path):
893 logging.info('gclient_utils.RemoveDirectory(%s)' % file_path)
894 gclient_utils.RemoveDirectory(file_path)
895 else:
896 logging.critical(
897 ('No idea what is %s.\nYou just found a bug in gclient'
898 ', please ping maruel@chromium.org ASAP!') % file_path)