blob: 2156b293ded4fb3a6a1085299b78151a56a95b04 [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.org5c8c6de2011-03-18 16:20:18 +000068def determine_scm(root):
69 """Similar to upload.py's version but much simpler.
70
71 Returns 'svn', 'git' or None.
72 """
73 if os.path.isdir(os.path.join(root, '.svn')):
74 return 'svn'
75 elif os.path.isdir(os.path.join(root, '.svn')):
76 return 'git'
77 else:
78 if (0 == subprocess.call(
79 ['git', 'rev-parse', '--show-cdup'],
80 stdout=subprocess.PIPE, cwd=root)):
81 return 'git'
82 else:
83 return None
84
85
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +000086class GIT(object):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +000087 @staticmethod
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +000088 def Capture(args, **kwargs):
89 return gclient_utils.CheckCall(['git'] + args, print_error=False,
90 **kwargs)[0]
maruel@chromium.orgd5800f12009-11-12 20:03:43 +000091
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +000092 @staticmethod
msb@chromium.org786fb682010-06-02 15:16:23 +000093 def CaptureStatus(files, upstream_branch=None):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +000094 """Returns git status.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +000095
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +000096 @files can be a string (one file) or a list of files.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +000097
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +000098 Returns an array of (status, file) tuples."""
msb@chromium.org786fb682010-06-02 15:16:23 +000099 if upstream_branch is None:
100 upstream_branch = GIT.GetUpstreamBranch(os.getcwd())
101 if upstream_branch is None:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000102 raise gclient_utils.Error('Cannot determine upstream branch')
103 command = ['diff', '--name-status', '-r', '%s...' % upstream_branch]
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000104 if not files:
105 pass
106 elif isinstance(files, basestring):
107 command.append(files)
108 else:
109 command.extend(files)
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000110 status = GIT.Capture(command).rstrip()
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000111 results = []
112 if status:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000113 for statusline in status.splitlines():
maruel@chromium.orgcc1614b2010-09-20 17:13:17 +0000114 # 3-way merges can cause the status can be 'MMM' instead of 'M'. This
115 # can happen when the user has 2 local branches and he diffs between
116 # these 2 branches instead diffing to upstream.
117 m = re.match('^(\w)+\t(.+)$', statusline)
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000118 if not m:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000119 raise gclient_utils.Error(
120 'status currently unsupported: %s' % statusline)
maruel@chromium.orgcc1614b2010-09-20 17:13:17 +0000121 # Only grab the first letter.
122 results.append(('%s ' % m.group(1)[0], m.group(2)))
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000123 return results
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000124
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000125 @staticmethod
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000126 def GetEmail(cwd):
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000127 """Retrieves the user email address if known."""
128 # We could want to look at the svn cred when it has a svn remote but it
129 # should be fine for now, users should simply configure their git settings.
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000130 try:
131 return GIT.Capture(['config', 'user.email'], cwd=cwd).strip()
132 except gclient_utils.CheckCallError:
133 return ''
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000134
135 @staticmethod
136 def ShortBranchName(branch):
137 """Converts a name like 'refs/heads/foo' to just 'foo'."""
138 return branch.replace('refs/heads/', '')
139
140 @staticmethod
141 def GetBranchRef(cwd):
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000142 """Returns the full branch reference, e.g. 'refs/heads/master'."""
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000143 return GIT.Capture(['symbolic-ref', 'HEAD'], cwd=cwd).strip()
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000144
145 @staticmethod
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000146 def GetBranch(cwd):
147 """Returns the short branch name, e.g. 'master'."""
maruel@chromium.orgc308a742009-12-22 18:29:33 +0000148 return GIT.ShortBranchName(GIT.GetBranchRef(cwd))
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000149
150 @staticmethod
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000151 def IsGitSvn(cwd):
152 """Returns true if this repo looks like it's using git-svn."""
153 # If you have any "svn-remote.*" config keys, we think you're using svn.
154 try:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000155 GIT.Capture(['config', '--get-regexp', r'^svn-remote\.'], cwd=cwd)
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000156 return True
157 except gclient_utils.CheckCallError:
158 return False
159
160 @staticmethod
161 def GetSVNBranch(cwd):
162 """Returns the svn branch name if found."""
163 # Try to figure out which remote branch we're based on.
164 # Strategy:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000165 # 1) iterate through our branch history and find the svn URL.
166 # 2) find the svn-remote that fetches from the URL.
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000167
168 # regexp matching the git-svn line that contains the URL.
169 git_svn_re = re.compile(r'^\s*git-svn-id: (\S+)@', re.MULTILINE)
170
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000171 # We don't want to go through all of history, so read a line from the
172 # pipe at a time.
173 # The -100 is an arbitrary limit so we don't search forever.
174 cmd = ['git', 'log', '-100', '--pretty=medium']
175 proc = gclient_utils.Popen(cmd, stdout=subprocess.PIPE)
176 for line in proc.stdout:
177 match = git_svn_re.match(line)
178 if match:
179 url = match.group(1)
180 proc.stdout.close() # Cut pipe.
181 break
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000182
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000183 if url:
184 svn_remote_re = re.compile(r'^svn-remote\.([^.]+)\.url (.*)$')
185 remotes = GIT.Capture(['config', '--get-regexp',
186 r'^svn-remote\..*\.url'], cwd=cwd).splitlines()
187 for remote in remotes:
188 match = svn_remote_re.match(remote)
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000189 if match:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000190 remote = match.group(1)
191 base_url = match.group(2)
192 fetch_spec = GIT.Capture(
193 ['config', 'svn-remote.%s.fetch' % remote],
194 cwd=cwd).strip().split(':')
195 if fetch_spec[0]:
196 full_url = base_url + '/' + fetch_spec[0]
197 else:
198 full_url = base_url
199 if full_url == url:
200 return fetch_spec[1]
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000201
202 @staticmethod
203 def FetchUpstreamTuple(cwd):
204 """Returns a tuple containg remote and remote ref,
205 e.g. 'origin', 'refs/heads/master'
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000206 Tries to be intelligent and understand git-svn.
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000207 """
208 remote = '.'
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000209 branch = GIT.GetBranch(cwd)
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000210 try:
211 upstream_branch = GIT.Capture(
212 ['config', 'branch.%s.merge' % branch], cwd=cwd).strip()
213 except gclient_utils.Error:
214 upstream_branch = None
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000215 if upstream_branch:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000216 try:
217 remote = GIT.Capture(
218 ['config', 'branch.%s.remote' % branch], cwd=cwd).strip()
219 except gclient_utils.Error:
220 pass
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000221 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000222 try:
223 upstream_branch = GIT.Capture(
224 ['config', 'rietveld.upstream-branch'], cwd=cwd).strip()
225 except gclient_utils.Error:
226 upstream_branch = None
227 if upstream_branch:
228 try:
229 remote = GIT.Capture(
230 ['config', 'rietveld.upstream-remote'], cwd=cwd).strip()
231 except gclient_utils.Error:
232 pass
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000233 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000234 # Fall back on trying a git-svn upstream branch.
235 if GIT.IsGitSvn(cwd):
236 upstream_branch = GIT.GetSVNBranch(cwd)
maruel@chromium.orga630bd72010-04-29 23:32:34 +0000237 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000238 # Else, try to guess the origin remote.
239 remote_branches = GIT.Capture(['branch', '-r'], cwd=cwd).split()
240 if 'origin/master' in remote_branches:
241 # Fall back on origin/master if it exits.
242 remote = 'origin'
243 upstream_branch = 'refs/heads/master'
244 elif 'origin/trunk' in remote_branches:
245 # Fall back on origin/trunk if it exists. Generally a shared
246 # git-svn clone
247 remote = 'origin'
248 upstream_branch = 'refs/heads/trunk'
249 else:
250 # Give up.
251 remote = None
252 upstream_branch = None
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000253 return remote, upstream_branch
254
255 @staticmethod
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000256 def GetUpstreamBranch(cwd):
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000257 """Gets the current branch's upstream branch."""
258 remote, upstream_branch = GIT.FetchUpstreamTuple(cwd)
maruel@chromium.orga630bd72010-04-29 23:32:34 +0000259 if remote != '.' and upstream_branch:
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000260 upstream_branch = upstream_branch.replace('heads', 'remotes/' + remote)
261 return upstream_branch
262
263 @staticmethod
maruel@chromium.org8ede00e2010-01-12 14:35:28 +0000264 def GenerateDiff(cwd, branch=None, branch_head='HEAD', full_move=False,
265 files=None):
maruel@chromium.orga9371762009-12-22 18:27:38 +0000266 """Diffs against the upstream branch or optionally another branch.
267
268 full_move means that move or copy operations should completely recreate the
269 files, usually in the prospect to apply the patch for a try job."""
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000270 if not branch:
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000271 branch = GIT.GetUpstreamBranch(cwd)
evan@chromium.org400f3e72010-05-19 14:23:36 +0000272 command = ['diff', '-p', '--no-prefix', '--no-ext-diff',
273 branch + "..." + branch_head]
maruel@chromium.orga9371762009-12-22 18:27:38 +0000274 if not full_move:
275 command.append('-C')
maruel@chromium.org8ede00e2010-01-12 14:35:28 +0000276 # TODO(maruel): --binary support.
277 if files:
278 command.append('--')
279 command.extend(files)
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000280 diff = GIT.Capture(command, cwd=cwd).splitlines(True)
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000281 for i in range(len(diff)):
282 # In the case of added files, replace /dev/null with the path to the
283 # file being added.
284 if diff[i].startswith('--- /dev/null'):
285 diff[i] = '--- %s' % diff[i+1][4:]
286 return ''.join(diff)
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000287
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000288 @staticmethod
maruel@chromium.org8ede00e2010-01-12 14:35:28 +0000289 def GetDifferentFiles(cwd, branch=None, branch_head='HEAD'):
290 """Returns the list of modified files between two branches."""
291 if not branch:
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000292 branch = GIT.GetUpstreamBranch(cwd)
bauerb@chromium.org838f0f22010-04-09 17:02:50 +0000293 command = ['diff', '--name-only', branch + "..." + branch_head]
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000294 return GIT.Capture(command, cwd=cwd).splitlines(False)
maruel@chromium.org8ede00e2010-01-12 14:35:28 +0000295
296 @staticmethod
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000297 def GetPatchName(cwd):
298 """Constructs a name for this patch."""
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000299 short_sha = GIT.Capture(['rev-parse', '--short=4', 'HEAD'], cwd=cwd).strip()
maruel@chromium.org862ff8e2010-08-06 15:29:16 +0000300 return "%s#%s" % (GIT.GetBranch(cwd), short_sha)
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000301
302 @staticmethod
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000303 def GetCheckoutRoot(cwd):
maruel@chromium.org01d8c1d2010-01-07 01:56:59 +0000304 """Returns the top level directory of a git checkout as an absolute path.
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000305 """
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000306 root = GIT.Capture(['rev-parse', '--show-cdup'], cwd=cwd).strip()
307 return os.path.abspath(os.path.join(cwd, root))
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000308
maruel@chromium.orgd0f854a2010-03-11 19:35:53 +0000309 @staticmethod
310 def AssertVersion(min_version):
311 """Asserts git's version is at least min_version."""
312 def only_int(val):
313 if val.isdigit():
314 return int(val)
315 else:
316 return 0
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000317 current_version = GIT.Capture(['--version']).split()[-1]
maruel@chromium.orgd0f854a2010-03-11 19:35:53 +0000318 current_version_list = map(only_int, current_version.split('.'))
319 for min_ver in map(int, min_version.split('.')):
320 ver = current_version_list.pop(0)
321 if ver < min_ver:
322 return (False, current_version)
323 elif ver > min_ver:
324 return (True, current_version)
325 return (True, current_version)
326
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000327
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000328class SVN(object):
tony@chromium.org57564662010-04-14 02:35:12 +0000329 current_version = None
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000330
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000331 @staticmethod
maruel@chromium.org54019f32010-09-09 13:50:11 +0000332 def Capture(args, **kwargs):
333 """Always redirect stderr.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000334
maruel@chromium.org54019f32010-09-09 13:50:11 +0000335 Throws an exception if non-0 is returned."""
336 return gclient_utils.CheckCall(['svn'] + args, print_error=False,
337 **kwargs)[0]
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000338
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000339 @staticmethod
maruel@chromium.org2b9aa8e2010-08-25 20:01:42 +0000340 def RunAndGetFileList(verbose, args, cwd, file_list, stdout=None):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000341 """Runs svn checkout, update, or status, output to stdout.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000342
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000343 The first item in args must be either "checkout", "update", or "status".
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000344
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000345 svn's stdout is parsed to collect a list of files checked out or updated.
346 These files are appended to file_list. svn's stdout is also printed to
347 sys.stdout as in Run.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000348
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000349 Args:
maruel@chromium.org03807072010-08-16 17:18:44 +0000350 verbose: If True, uses verbose output
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000351 args: A sequence of command line parameters to be passed to svn.
maruel@chromium.org2b9aa8e2010-08-25 20:01:42 +0000352 cwd: The directory where svn is to be run.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000353
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000354 Raises:
355 Error: An error occurred while running the svn command.
356 """
maruel@chromium.org2b9aa8e2010-08-25 20:01:42 +0000357 stdout = stdout or sys.stdout
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000358
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000359 # svn update and svn checkout use the same pattern: the first three columns
360 # are for file status, property status, and lock status. This is followed
361 # by two spaces, and then the path to the file.
362 update_pattern = '^... (.*)$'
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000363
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000364 # The first three columns of svn status are the same as for svn update and
365 # svn checkout. The next three columns indicate addition-with-history,
366 # switch, and remote lock status. This is followed by one space, and then
367 # the path to the file.
368 status_pattern = '^...... (.*)$'
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000369
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000370 # args[0] must be a supported command. This will blow up if it's something
371 # else, which is good. Note that the patterns are only effective when
372 # these commands are used in their ordinary forms, the patterns are invalid
373 # for "svn status --show-updates", for example.
374 pattern = {
375 'checkout': update_pattern,
376 'status': status_pattern,
377 'update': update_pattern,
378 }[args[0]]
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000379 compiled_pattern = re.compile(pattern)
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000380 # Place an upper limit.
cbentzel@chromium.org2aee2292010-09-03 14:15:25 +0000381 backoff_time = 5
maruel@chromium.orgbec588d2010-10-26 13:50:25 +0000382 retries = 0
maruel@chromium.org03507062010-10-26 00:58:27 +0000383 while True:
maruel@chromium.orgbec588d2010-10-26 13:50:25 +0000384 retries += 1
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000385 previous_list_len = len(file_list)
386 failure = []
maruel@chromium.org54d1f1a2010-01-08 19:53:47 +0000387
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000388 def CaptureMatchingLines(line):
389 match = compiled_pattern.search(line)
390 if match:
391 file_list.append(match.group(1))
392 if line.startswith('svn: '):
maruel@chromium.org8599aa72010-02-08 20:27:14 +0000393 failure.append(line)
maruel@chromium.org54d1f1a2010-01-08 19:53:47 +0000394
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000395 try:
maruel@chromium.org17d01792010-09-01 18:07:10 +0000396 gclient_utils.CheckCallAndFilterAndHeader(
397 ['svn'] + args,
398 cwd=cwd,
399 always=verbose,
400 filter_fn=CaptureMatchingLines,
401 stdout=stdout)
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000402 except gclient_utils.Error:
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000403 def IsKnownFailure():
404 for x in failure:
405 if (x.startswith('svn: OPTIONS of') or
406 x.startswith('svn: PROPFIND of') or
407 x.startswith('svn: REPORT of') or
maruel@chromium.orgf61fc932010-08-19 13:05:24 +0000408 x.startswith('svn: Unknown hostname') or
409 x.startswith('svn: Server sent unexpected return value')):
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000410 return True
411 return False
412
maruel@chromium.org953586a2010-06-15 14:22:24 +0000413 # Subversion client is really misbehaving with Google Code.
414 if args[0] == 'checkout':
415 # Ensure at least one file was checked out, otherwise *delete* the
416 # directory.
417 if len(file_list) == previous_list_len:
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000418 if not IsKnownFailure():
maruel@chromium.org953586a2010-06-15 14:22:24 +0000419 # No known svn error was found, bail out.
420 raise
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000421 # No file were checked out, so make sure the directory is
422 # deleted in case it's messed up and try again.
423 # Warning: It's bad, it assumes args[2] is the directory
424 # argument.
425 if os.path.isdir(args[2]):
426 gclient_utils.RemoveDirectory(args[2])
maruel@chromium.org953586a2010-06-15 14:22:24 +0000427 else:
428 # Progress was made, convert to update since an aborted checkout
429 # is now an update.
maruel@chromium.org2de10252010-02-08 01:10:39 +0000430 args = ['update'] + args[1:]
maruel@chromium.org953586a2010-06-15 14:22:24 +0000431 else:
432 # It was an update or export.
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000433 # We enforce that some progress has been made or a known failure.
434 if len(file_list) == previous_list_len and not IsKnownFailure():
435 # No known svn error was found and no progress, bail out.
436 raise
maruel@chromium.orgbec588d2010-10-26 13:50:25 +0000437 if retries == 10:
maruel@chromium.org03507062010-10-26 00:58:27 +0000438 raise
cbentzel@chromium.org2aee2292010-09-03 14:15:25 +0000439 print "Sleeping %.1f seconds and retrying...." % backoff_time
440 time.sleep(backoff_time)
441 backoff_time *= 1.3
maruel@chromium.org953586a2010-06-15 14:22:24 +0000442 continue
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000443 break
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000444
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000445 @staticmethod
maruel@chromium.org54019f32010-09-09 13:50:11 +0000446 def CaptureInfo(cwd):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000447 """Returns a dictionary from the svn info output for the given file.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000448
maruel@chromium.org54019f32010-09-09 13:50:11 +0000449 Throws an exception if svn info fails."""
450 output = SVN.Capture(['info', '--xml', cwd])
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000451 dom = gclient_utils.ParseXML(output)
452 result = {}
453 if dom:
454 GetNamedNodeText = gclient_utils.GetNamedNodeText
455 GetNodeNamedAttributeText = gclient_utils.GetNodeNamedAttributeText
456 def C(item, f):
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000457 if item is not None:
458 return f(item)
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000459 # /info/entry/
460 # url
461 # reposityory/(root|uuid)
462 # wc-info/(schedule|depth)
463 # commit/(author|date)
464 # str() the results because they may be returned as Unicode, which
465 # interferes with the higher layers matching up things in the deps
466 # dictionary.
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000467 result['Repository Root'] = C(GetNamedNodeText(dom, 'root'), str)
468 result['URL'] = C(GetNamedNodeText(dom, 'url'), str)
469 result['UUID'] = C(GetNamedNodeText(dom, 'uuid'), str)
470 result['Revision'] = C(GetNodeNamedAttributeText(dom, 'entry',
471 'revision'),
472 int)
473 result['Node Kind'] = C(GetNodeNamedAttributeText(dom, 'entry', 'kind'),
474 str)
475 # Differs across versions.
476 if result['Node Kind'] == 'dir':
477 result['Node Kind'] = 'directory'
478 result['Schedule'] = C(GetNamedNodeText(dom, 'schedule'), str)
479 result['Path'] = C(GetNodeNamedAttributeText(dom, 'entry', 'path'), str)
480 result['Copied From URL'] = C(GetNamedNodeText(dom, 'copy-from-url'), str)
481 result['Copied From Rev'] = C(GetNamedNodeText(dom, 'copy-from-rev'), str)
482 return result
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000483
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000484 @staticmethod
maruel@chromium.org54019f32010-09-09 13:50:11 +0000485 def CaptureRevision(cwd):
nasser@codeaurora.org5d63eb82010-03-24 23:22:09 +0000486 """Get the base revision of a SVN repository.
487
488 Returns:
489 Int base revision
490 """
maruel@chromium.org54019f32010-09-09 13:50:11 +0000491 info = SVN.Capture(['info', '--xml'], cwd=cwd)
nasser@codeaurora.org5d63eb82010-03-24 23:22:09 +0000492 dom = xml.dom.minidom.parseString(info)
493 return dom.getElementsByTagName('entry')[0].getAttribute('revision')
494
495 @staticmethod
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000496 def CaptureStatus(files):
497 """Returns the svn 1.5 svn status emulated output.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000498
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000499 @files can be a string (one file) or a list of files.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000500
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000501 Returns an array of (status, file) tuples."""
502 command = ["status", "--xml"]
503 if not files:
504 pass
505 elif isinstance(files, basestring):
506 command.append(files)
507 else:
508 command.extend(files)
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000509
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000510 status_letter = {
511 None: ' ',
512 '': ' ',
513 'added': 'A',
514 'conflicted': 'C',
515 'deleted': 'D',
516 'external': 'X',
517 'ignored': 'I',
518 'incomplete': '!',
519 'merged': 'G',
520 'missing': '!',
521 'modified': 'M',
522 'none': ' ',
523 'normal': ' ',
524 'obstructed': '~',
525 'replaced': 'R',
526 'unversioned': '?',
527 }
528 dom = gclient_utils.ParseXML(SVN.Capture(command))
529 results = []
530 if dom:
531 # /status/target/entry/(wc-status|commit|author|date)
532 for target in dom.getElementsByTagName('target'):
533 #base_path = target.getAttribute('path')
534 for entry in target.getElementsByTagName('entry'):
535 file_path = entry.getAttribute('path')
536 wc_status = entry.getElementsByTagName('wc-status')
537 assert len(wc_status) == 1
538 # Emulate svn 1.5 status ouput...
539 statuses = [' '] * 7
540 # Col 0
541 xml_item_status = wc_status[0].getAttribute('item')
542 if xml_item_status in status_letter:
543 statuses[0] = status_letter[xml_item_status]
544 else:
maruel@chromium.org54019f32010-09-09 13:50:11 +0000545 raise gclient_utils.Error(
546 'Unknown item status "%s"; please implement me!' %
547 xml_item_status)
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000548 # Col 1
549 xml_props_status = wc_status[0].getAttribute('props')
550 if xml_props_status == 'modified':
551 statuses[1] = 'M'
552 elif xml_props_status == 'conflicted':
553 statuses[1] = 'C'
554 elif (not xml_props_status or xml_props_status == 'none' or
555 xml_props_status == 'normal'):
556 pass
557 else:
maruel@chromium.org54019f32010-09-09 13:50:11 +0000558 raise gclient_utils.Error(
559 'Unknown props status "%s"; please implement me!' %
560 xml_props_status)
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000561 # Col 2
562 if wc_status[0].getAttribute('wc-locked') == 'true':
563 statuses[2] = 'L'
564 # Col 3
565 if wc_status[0].getAttribute('copied') == 'true':
566 statuses[3] = '+'
567 # Col 4
568 if wc_status[0].getAttribute('switched') == 'true':
569 statuses[4] = 'S'
570 # TODO(maruel): Col 5 and 6
571 item = (''.join(statuses), file_path)
572 results.append(item)
573 return results
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000574
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000575 @staticmethod
576 def IsMoved(filename):
577 """Determine if a file has been added through svn mv"""
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000578 return SVN.IsMovedInfo(SVN.CaptureInfo(filename))
579
580 @staticmethod
581 def IsMovedInfo(info):
582 """Determine if a file has been added through svn mv"""
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000583 return (info.get('Copied From URL') and
584 info.get('Copied From Rev') and
585 info.get('Schedule') == 'add')
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000586
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000587 @staticmethod
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000588 def GetFileProperty(filename, property_name):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000589 """Returns the value of an SVN property for the given file.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000590
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000591 Args:
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000592 filename: The file to check
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000593 property_name: The name of the SVN property, e.g. "svn:mime-type"
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000594
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000595 Returns:
596 The value of the property, which will be the empty string if the property
597 is not set on the file. If the file is not under version control, the
598 empty string is also returned.
599 """
maruel@chromium.org54019f32010-09-09 13:50:11 +0000600 try:
601 return SVN.Capture(['propget', property_name, filename])
602 except gclient_utils.Error:
603 return ''
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000604
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000605 @staticmethod
maruel@chromium.org1c7db8e2010-01-07 02:00:19 +0000606 def DiffItem(filename, full_move=False, revision=None):
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000607 """Diffs a single file.
608
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000609 Should be simple, eh? No it isn't.
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000610 Be sure to be in the appropriate directory before calling to have the
maruel@chromium.orga9371762009-12-22 18:27:38 +0000611 expected relative path.
612 full_move means that move or copy operations should completely recreate the
613 files, usually in the prospect to apply the patch for a try job."""
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000614 # If the user specified a custom diff command in their svn config file,
615 # then it'll be used when we do svn diff, which we don't want to happen
616 # since we want the unified diff. Using --diff-cmd=diff doesn't always
617 # work, since they can have another diff executable in their path that
618 # gives different line endings. So we use a bogus temp directory as the
619 # config directory, which gets around these problems.
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000620 bogus_dir = tempfile.mkdtemp()
621 try:
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000622 # Use "svn info" output instead of os.path.isdir because the latter fails
623 # when the file is deleted.
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000624 return SVN._DiffItemInternal(filename, SVN.CaptureInfo(filename),
625 bogus_dir,
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000626 full_move=full_move, revision=revision)
627 finally:
628 shutil.rmtree(bogus_dir)
629
630 @staticmethod
631 def _DiffItemInternal(filename, info, bogus_dir, full_move=False,
632 revision=None):
633 """Grabs the diff data."""
634 command = ["diff", "--config-dir", bogus_dir, filename]
635 if revision:
636 command.extend(['--revision', revision])
637 data = None
638 if SVN.IsMovedInfo(info):
639 if full_move:
640 if info.get("Node Kind") == "directory":
641 # Things become tricky here. It's a directory copy/move. We need to
642 # diff all the files inside it.
643 # This will put a lot of pressure on the heap. This is why StringIO
644 # is used and converted back into a string at the end. The reason to
645 # return a string instead of a StringIO is that StringIO.write()
646 # doesn't accept a StringIO object. *sigh*.
647 for (dirpath, dirnames, filenames) in os.walk(filename):
648 # Cleanup all files starting with a '.'.
649 for d in dirnames:
650 if d.startswith('.'):
651 dirnames.remove(d)
652 for f in filenames:
653 if f.startswith('.'):
654 filenames.remove(f)
655 for f in filenames:
656 if data is None:
657 data = cStringIO.StringIO()
658 data.write(GenFakeDiff(os.path.join(dirpath, f)))
659 if data:
660 tmp = data.getvalue()
661 data.close()
662 data = tmp
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000663 else:
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000664 data = GenFakeDiff(filename)
665 else:
666 if info.get("Node Kind") != "directory":
maruel@chromium.org0836c562010-01-22 01:10:06 +0000667 # svn diff on a mv/cp'd file outputs nothing if there was no change.
maruel@chromium.org54019f32010-09-09 13:50:11 +0000668 data = SVN.Capture(command)
maruel@chromium.org0836c562010-01-22 01:10:06 +0000669 if not data:
670 # We put in an empty Index entry so upload.py knows about them.
maruel@chromium.orgc6d170e2010-06-03 00:06:00 +0000671 data = "Index: %s\n" % filename.replace(os.sep, '/')
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000672 # Otherwise silently ignore directories.
673 else:
674 if info.get("Node Kind") != "directory":
675 # Normal simple case.
maruel@chromium.org54019f32010-09-09 13:50:11 +0000676 data = SVN.Capture(command)
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000677 # Otherwise silently ignore directories.
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000678 return data
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000679
680 @staticmethod
maruel@chromium.org1c7db8e2010-01-07 02:00:19 +0000681 def GenerateDiff(filenames, root=None, full_move=False, revision=None):
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000682 """Returns a string containing the diff for the given file list.
683
684 The files in the list should either be absolute paths or relative to the
685 given root. If no root directory is provided, the repository root will be
686 used.
687 The diff will always use relative paths.
688 """
maruel@chromium.org00fdcb32011-02-24 01:41:02 +0000689 assert isinstance(filenames, (list, tuple))
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000690 previous_cwd = os.getcwd()
maruel@chromium.orgfd9cbbb2010-01-08 23:04:03 +0000691 root = root or SVN.GetCheckoutRoot(previous_cwd)
692 root = os.path.normcase(os.path.join(root, ''))
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000693 def RelativePath(path, root):
694 """We must use relative paths."""
maruel@chromium.orgfd9cbbb2010-01-08 23:04:03 +0000695 if os.path.normcase(path).startswith(root):
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000696 return path[len(root):]
697 return path
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000698 # If the user specified a custom diff command in their svn config file,
699 # then it'll be used when we do svn diff, which we don't want to happen
700 # since we want the unified diff. Using --diff-cmd=diff doesn't always
701 # work, since they can have another diff executable in their path that
702 # gives different line endings. So we use a bogus temp directory as the
703 # config directory, which gets around these problems.
704 bogus_dir = tempfile.mkdtemp()
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000705 try:
706 os.chdir(root)
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000707 # Cleanup filenames
708 filenames = [RelativePath(f, root) for f in filenames]
709 # Get information about the modified items (files and directories)
710 data = dict([(f, SVN.CaptureInfo(f)) for f in filenames])
gavinp@google.com3fda4cc2010-06-29 13:29:27 +0000711 diffs = []
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000712 if full_move:
713 # Eliminate modified files inside moved/copied directory.
714 for (filename, info) in data.iteritems():
715 if SVN.IsMovedInfo(info) and info.get("Node Kind") == "directory":
716 # Remove files inside the directory.
717 filenames = [f for f in filenames
718 if not f.startswith(filename + os.path.sep)]
719 for filename in data.keys():
720 if not filename in filenames:
721 # Remove filtered out items.
722 del data[filename]
gavinp@google.com3fda4cc2010-06-29 13:29:27 +0000723 else:
724 metaheaders = []
725 for (filename, info) in data.iteritems():
726 if SVN.IsMovedInfo(info):
727 # for now, the most common case is a head copy,
728 # so let's just encode that as a straight up cp.
729 srcurl = info.get('Copied From URL')
730 root = info.get('Repository Root')
731 rev = int(info.get('Copied From Rev'))
732 assert srcurl.startswith(root)
733 src = srcurl[len(root)+1:]
maruel@chromium.org00fdcb32011-02-24 01:41:02 +0000734 try:
735 srcinfo = SVN.CaptureInfo(srcurl)
736 except gclient_utils.CheckCallError, e:
737 if not 'Not a valid URL' in e.stderr:
738 raise
739 # Assume the file was deleted. No idea how to figure out at which
740 # revision the file was deleted.
741 srcinfo = {'Revision': rev}
gavinp@google.com3fda4cc2010-06-29 13:29:27 +0000742 if (srcinfo.get('Revision') != rev and
743 SVN.Capture(['diff', '-r', '%d:head' % rev, srcurl])):
744 metaheaders.append("#$ svn cp -r %d %s %s "
745 "### WARNING: note non-trunk copy\n" %
746 (rev, src, filename))
747 else:
748 metaheaders.append("#$ cp %s %s\n" % (src,
749 filename))
750
751 if metaheaders:
752 diffs.append("### BEGIN SVN COPY METADATA\n")
753 diffs.extend(metaheaders)
754 diffs.append("### END SVN COPY METADATA\n")
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000755 # Now ready to do the actual diff.
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000756 for filename in sorted(data.iterkeys()):
757 diffs.append(SVN._DiffItemInternal(filename, data[filename], bogus_dir,
758 full_move=full_move,
759 revision=revision))
760 # Use StringIO since it can be messy when diffing a directory move with
761 # full_move=True.
762 buf = cStringIO.StringIO()
763 for d in filter(None, diffs):
764 buf.write(d)
765 result = buf.getvalue()
766 buf.close()
767 return result
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000768 finally:
769 os.chdir(previous_cwd)
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000770 shutil.rmtree(bogus_dir)
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000771
772 @staticmethod
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000773 def GetEmail(repo_root):
774 """Retrieves the svn account which we assume is an email address."""
maruel@chromium.org54019f32010-09-09 13:50:11 +0000775 try:
776 infos = SVN.CaptureInfo(repo_root)
777 except gclient_utils.Error:
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000778 return None
779
780 # Should check for uuid but it is incorrectly saved for https creds.
maruel@chromium.org54019f32010-09-09 13:50:11 +0000781 root = infos['Repository Root']
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000782 realm = root.rsplit('/', 1)[0]
maruel@chromium.org54019f32010-09-09 13:50:11 +0000783 uuid = infos['UUID']
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000784 if root.startswith('https') or not uuid:
785 regexp = re.compile(r'<%s:\d+>.*' % realm)
786 else:
787 regexp = re.compile(r'<%s:\d+> %s' % (realm, uuid))
788 if regexp is None:
789 return None
790 if sys.platform.startswith('win'):
791 if not 'APPDATA' in os.environ:
792 return None
maruel@chromium.org720d9f32009-11-21 17:38:57 +0000793 auth_dir = os.path.join(os.environ['APPDATA'], 'Subversion', 'auth',
794 'svn.simple')
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000795 else:
796 if not 'HOME' in os.environ:
797 return None
798 auth_dir = os.path.join(os.environ['HOME'], '.subversion', 'auth',
799 'svn.simple')
800 for credfile in os.listdir(auth_dir):
801 cred_info = SVN.ReadSimpleAuth(os.path.join(auth_dir, credfile))
802 if regexp.match(cred_info.get('svn:realmstring')):
803 return cred_info.get('username')
804
805 @staticmethod
806 def ReadSimpleAuth(filename):
807 f = open(filename, 'r')
808 values = {}
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000809 def ReadOneItem(item_type):
810 m = re.match(r'%s (\d+)' % item_type, f.readline())
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000811 if not m:
812 return None
813 data = f.read(int(m.group(1)))
814 if f.read(1) != '\n':
815 return None
816 return data
817
818 while True:
819 key = ReadOneItem('K')
820 if not key:
821 break
822 value = ReadOneItem('V')
823 if not value:
824 break
825 values[key] = value
826 return values
maruel@chromium.org94b1ee92009-12-19 20:27:20 +0000827
828 @staticmethod
829 def GetCheckoutRoot(directory):
830 """Returns the top level directory of the current repository.
831
832 The directory is returned as an absolute path.
833 """
maruel@chromium.orgf7ae6d52009-12-22 20:49:04 +0000834 directory = os.path.abspath(directory)
maruel@chromium.org54019f32010-09-09 13:50:11 +0000835 try:
maruel@chromium.org885d6e82011-02-24 20:21:46 +0000836 info = SVN.CaptureInfo(directory)
837 cur_dir_repo_root = info['Repository Root']
838 url = info['URL']
maruel@chromium.org54019f32010-09-09 13:50:11 +0000839 except gclient_utils.Error:
maruel@chromium.org94b1ee92009-12-19 20:27:20 +0000840 return None
maruel@chromium.org94b1ee92009-12-19 20:27:20 +0000841 while True:
842 parent = os.path.dirname(directory)
maruel@chromium.org54019f32010-09-09 13:50:11 +0000843 try:
maruel@chromium.org885d6e82011-02-24 20:21:46 +0000844 info = SVN.CaptureInfo(parent)
845 if (info['Repository Root'] != cur_dir_repo_root or
846 info['URL'] != os.path.dirname(url)):
maruel@chromium.org54019f32010-09-09 13:50:11 +0000847 break
maruel@chromium.org885d6e82011-02-24 20:21:46 +0000848 url = info['URL']
maruel@chromium.org54019f32010-09-09 13:50:11 +0000849 except gclient_utils.Error:
maruel@chromium.org94b1ee92009-12-19 20:27:20 +0000850 break
851 directory = parent
maruel@chromium.orgfd9cbbb2010-01-08 23:04:03 +0000852 return GetCasedPath(directory)
tony@chromium.org57564662010-04-14 02:35:12 +0000853
854 @staticmethod
855 def AssertVersion(min_version):
856 """Asserts svn's version is at least min_version."""
857 def only_int(val):
858 if val.isdigit():
859 return int(val)
860 else:
861 return 0
862 if not SVN.current_version:
863 SVN.current_version = SVN.Capture(['--version']).split()[2]
864 current_version_list = map(only_int, SVN.current_version.split('.'))
865 for min_ver in map(int, min_version.split('.')):
866 ver = current_version_list.pop(0)
867 if ver < min_ver:
868 return (False, SVN.current_version)
869 elif ver > min_ver:
870 return (True, SVN.current_version)
871 return (True, SVN.current_version)
maruel@chromium.org07ab60e2011-02-08 21:54:00 +0000872
873 @staticmethod
874 def Revert(repo_root, callback=None, ignore_externals=False):
875 """Reverts all svn modifications in repo_root, including properties.
876
877 Deletes any modified files or directory.
878
879 A "svn update --revision BASE" call is required after to revive deleted
880 files.
881 """
882 for file_status in SVN.CaptureStatus(repo_root):
883 file_path = os.path.join(repo_root, file_status[1])
maruel@chromium.org8c415122011-03-15 17:14:27 +0000884 if (ignore_externals and
885 file_status[0][0] == 'X' and
886 file_status[0][1:].isspace()):
maruel@chromium.org07ab60e2011-02-08 21:54:00 +0000887 # Ignore externals.
888 logging.info('Ignoring external %s' % file_status[1])
889 continue
890
891 if callback:
892 callback(file_status)
893
maruel@chromium.org8c415122011-03-15 17:14:27 +0000894 if os.path.exists(file_path):
895 # svn revert is really stupid. It fails on inconsistent line-endings,
896 # on switched directories, etc. So take no chance and delete everything!
897 # In theory, it wouldn't be necessary for property-only change but then
898 # it'd have to look for switched directories, etc so it's not worth
899 # optimizing this use case.
900 if os.path.isfile(file_path) or os.path.islink(file_path):
901 logging.info('os.remove(%s)' % file_path)
902 os.remove(file_path)
903 elif os.path.isdir(file_path):
904 logging.info('gclient_utils.RemoveDirectory(%s)' % file_path)
905 gclient_utils.RemoveDirectory(file_path)
906 else:
907 logging.critical(
908 ('No idea what is %s.\nYou just found a bug in gclient'
909 ', please ping maruel@chromium.org ASAP!') % file_path)
maruel@chromium.org07ab60e2011-02-08 21:54:00 +0000910
maruel@chromium.org8c415122011-03-15 17:14:27 +0000911 if (file_status[0][0] in ('D', 'A', '!') or
912 not file_status[0][1:].isspace()):
maruel@chromium.orgaf453492011-03-03 21:04:09 +0000913 # Added, deleted file requires manual intervention and require calling
maruel@chromium.org07ab60e2011-02-08 21:54:00 +0000914 # revert, like for properties.
maruel@chromium.orgaf453492011-03-03 21:04:09 +0000915 try:
916 SVN.Capture(['revert', file_status[1]], cwd=repo_root)
917 except gclient_utils.CheckCallError:
918 if not os.path.exists(file_path):
919 continue
920 raise