blob: b1f2e653e91a50429c1324080bc9a15c9a3e1053 [file] [log] [blame]
[email protected]da64d632011-09-08 17:41:151# Copyright (c) 2011 The Chromium Authors. All rights reserved.
[email protected]d5800f12009-11-12 20:03:432# Use of this source code is governed by a BSD-style license that can be
3# found in the LICENSE file.
4
[email protected]5aeb7dd2009-11-17 18:09:015"""SCM-specific utility classes."""
[email protected]d5800f12009-11-12 20:03:436
[email protected]3c55d982010-05-06 14:25:447import cStringIO
[email protected]fd9cbbb2010-01-08 23:04:038import glob
[email protected]07ab60e2011-02-08 21:54:009import logging
[email protected]d5800f12009-11-12 20:03:4310import os
11import re
[email protected]d5800f12009-11-12 20:03:4312import sys
[email protected]5aeb7dd2009-11-17 18:09:0113import tempfile
[email protected]fd876172010-04-30 14:01:0514import time
[email protected]ade9c592011-04-07 15:59:1115from xml.etree import ElementTree
[email protected]d5800f12009-11-12 20:03:4316
17import gclient_utils
[email protected]31cb48a2011-04-04 18:01:3618import subprocess2
19
[email protected]d5800f12009-11-12 20:03:4320
[email protected]b24a8e12009-12-22 13:45:4821def ValidateEmail(email):
[email protected]6e29d572010-06-04 17:32:2022 return (re.match(r"^[a-zA-Z0-9._%-+]+@[a-zA-Z0-9._%-]+.[a-zA-Z]{2,6}$", email)
23 is not None)
[email protected]b24a8e12009-12-22 13:45:4824
[email protected]d5800f12009-11-12 20:03:4325
[email protected]fd9cbbb2010-01-08 23:04:0326def 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
[email protected]3c55d982010-05-06 14:25:4446def GenFakeDiff(filename):
47 """Generates a fake diff from a file."""
48 file_content = gclient_utils.FileRead(filename, 'rb').splitlines(True)
[email protected]c6d170e2010-06-03 00:06:0049 filename = filename.replace(os.sep, '/')
[email protected]3c55d982010-05-06 14:25:4450 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
[email protected]5c8c6de2011-03-18 16:20:1868def 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'
[email protected]c98c0c52011-04-06 13:39:4375 elif os.path.isdir(os.path.join(root, '.git')):
[email protected]5c8c6de2011-03-18 16:20:1876 return 'git'
77 else:
[email protected]c98c0c52011-04-06 13:39:4378 try:
[email protected]91def9b2011-09-14 16:28:0779 subprocess2.check_call(
[email protected]5c8c6de2011-03-18 16:20:1880 ['git', 'rev-parse', '--show-cdup'],
[email protected]c98c0c52011-04-06 13:39:4381 stdout=subprocess2.VOID,
[email protected]87e6d332011-09-09 19:01:2882 stderr=subprocess2.VOID,
[email protected]c98c0c52011-04-06 13:39:4383 cwd=root)
[email protected]5c8c6de2011-03-18 16:20:1884 return 'git'
[email protected]c98c0c52011-04-06 13:39:4385 except (OSError, subprocess2.CalledProcessError):
[email protected]5c8c6de2011-03-18 16:20:1886 return None
87
88
[email protected]36ac2392011-10-12 16:36:1189def only_int(val):
90 if val.isdigit():
91 return int(val)
92 else:
93 return 0
94
95
[email protected]5aeb7dd2009-11-17 18:09:0196class GIT(object):
[email protected]36ac2392011-10-12 16:36:1197 current_version = None
98
[email protected]5aeb7dd2009-11-17 18:09:0199 @staticmethod
[email protected]80a9ef12011-12-13 20:44:10100 def Capture(args, cwd, **kwargs):
[email protected]da64d632011-09-08 17:41:15101 return subprocess2.check_output(
[email protected]80a9ef12011-12-13 20:44:10102 ['git'] + args, cwd=cwd, stderr=subprocess2.PIPE, **kwargs)
[email protected]d5800f12009-11-12 20:03:43103
[email protected]5aeb7dd2009-11-17 18:09:01104 @staticmethod
[email protected]80a9ef12011-12-13 20:44:10105 def CaptureStatus(files, cwd, upstream_branch):
[email protected]5aeb7dd2009-11-17 18:09:01106 """Returns git status.
[email protected]d5800f12009-11-12 20:03:43107
[email protected]5aeb7dd2009-11-17 18:09:01108 @files can be a string (one file) or a list of files.
[email protected]d5800f12009-11-12 20:03:43109
[email protected]5aeb7dd2009-11-17 18:09:01110 Returns an array of (status, file) tuples."""
[email protected]786fb682010-06-02 15:16:23111 if upstream_branch is None:
[email protected]80a9ef12011-12-13 20:44:10112 upstream_branch = GIT.GetUpstreamBranch(cwd)
[email protected]786fb682010-06-02 15:16:23113 if upstream_branch is None:
[email protected]ad80e3b2010-09-09 14:18:28114 raise gclient_utils.Error('Cannot determine upstream branch')
115 command = ['diff', '--name-status', '-r', '%s...' % upstream_branch]
[email protected]5aeb7dd2009-11-17 18:09:01116 if not files:
117 pass
118 elif isinstance(files, basestring):
119 command.append(files)
120 else:
121 command.extend(files)
[email protected]80a9ef12011-12-13 20:44:10122 status = GIT.Capture(command, cwd).rstrip()
[email protected]5aeb7dd2009-11-17 18:09:01123 results = []
124 if status:
[email protected]ad80e3b2010-09-09 14:18:28125 for statusline in status.splitlines():
[email protected]cc1614b2010-09-20 17:13:17126 # 3-way merges can cause the status can be 'MMM' instead of 'M'. This
127 # can happen when the user has 2 local branches and he diffs between
128 # these 2 branches instead diffing to upstream.
129 m = re.match('^(\w)+\t(.+)$', statusline)
[email protected]5aeb7dd2009-11-17 18:09:01130 if not m:
[email protected]ad80e3b2010-09-09 14:18:28131 raise gclient_utils.Error(
132 'status currently unsupported: %s' % statusline)
[email protected]cc1614b2010-09-20 17:13:17133 # Only grab the first letter.
134 results.append(('%s ' % m.group(1)[0], m.group(2)))
[email protected]5aeb7dd2009-11-17 18:09:01135 return results
[email protected]d5800f12009-11-12 20:03:43136
[email protected]c78f2462009-11-21 01:20:57137 @staticmethod
[email protected]ad80e3b2010-09-09 14:18:28138 def GetEmail(cwd):
[email protected]c78f2462009-11-21 01:20:57139 """Retrieves the user email address if known."""
140 # We could want to look at the svn cred when it has a svn remote but it
141 # should be fine for now, users should simply configure their git settings.
[email protected]ad80e3b2010-09-09 14:18:28142 try:
143 return GIT.Capture(['config', 'user.email'], cwd=cwd).strip()
[email protected]da64d632011-09-08 17:41:15144 except subprocess2.CalledProcessError:
[email protected]ad80e3b2010-09-09 14:18:28145 return ''
[email protected]f2f9d552009-12-22 00:12:57146
147 @staticmethod
148 def ShortBranchName(branch):
149 """Converts a name like 'refs/heads/foo' to just 'foo'."""
150 return branch.replace('refs/heads/', '')
151
152 @staticmethod
153 def GetBranchRef(cwd):
[email protected]b24a8e12009-12-22 13:45:48154 """Returns the full branch reference, e.g. 'refs/heads/master'."""
[email protected]ad80e3b2010-09-09 14:18:28155 return GIT.Capture(['symbolic-ref', 'HEAD'], cwd=cwd).strip()
[email protected]f2f9d552009-12-22 00:12:57156
157 @staticmethod
[email protected]b24a8e12009-12-22 13:45:48158 def GetBranch(cwd):
159 """Returns the short branch name, e.g. 'master'."""
[email protected]c308a742009-12-22 18:29:33160 return GIT.ShortBranchName(GIT.GetBranchRef(cwd))
[email protected]b24a8e12009-12-22 13:45:48161
162 @staticmethod
[email protected]f2f9d552009-12-22 00:12:57163 def IsGitSvn(cwd):
164 """Returns true if this repo looks like it's using git-svn."""
165 # If you have any "svn-remote.*" config keys, we think you're using svn.
166 try:
[email protected]ad80e3b2010-09-09 14:18:28167 GIT.Capture(['config', '--get-regexp', r'^svn-remote\.'], cwd=cwd)
[email protected]f2f9d552009-12-22 00:12:57168 return True
[email protected]da64d632011-09-08 17:41:15169 except subprocess2.CalledProcessError:
[email protected]f2f9d552009-12-22 00:12:57170 return False
171
172 @staticmethod
[email protected]866276c2011-03-18 20:09:31173 def MatchSvnGlob(url, base_url, glob_spec, allow_wildcards):
174 """Return the corresponding git ref if |base_url| together with |glob_spec|
175 matches the full |url|.
176
177 If |allow_wildcards| is true, |glob_spec| can contain wildcards (see below).
178 """
179 fetch_suburl, as_ref = glob_spec.split(':')
180 if allow_wildcards:
181 glob_match = re.match('(.+/)?(\*|{[^/]*})(/.+)?', fetch_suburl)
182 if glob_match:
183 # Parse specs like "branches/*/src:refs/remotes/svn/*" or
184 # "branches/{472,597,648}/src:refs/remotes/svn/*".
185 branch_re = re.escape(base_url)
186 if glob_match.group(1):
187 branch_re += '/' + re.escape(glob_match.group(1))
188 wildcard = glob_match.group(2)
189 if wildcard == '*':
190 branch_re += '([^/]*)'
191 else:
192 # Escape and replace surrounding braces with parentheses and commas
193 # with pipe symbols.
194 wildcard = re.escape(wildcard)
195 wildcard = re.sub('^\\\\{', '(', wildcard)
196 wildcard = re.sub('\\\\,', '|', wildcard)
197 wildcard = re.sub('\\\\}$', ')', wildcard)
198 branch_re += wildcard
199 if glob_match.group(3):
200 branch_re += re.escape(glob_match.group(3))
201 match = re.match(branch_re, url)
202 if match:
203 return re.sub('\*$', match.group(1), as_ref)
204
205 # Parse specs like "trunk/src:refs/remotes/origin/trunk".
206 if fetch_suburl:
207 full_url = base_url + '/' + fetch_suburl
208 else:
209 full_url = base_url
210 if full_url == url:
211 return as_ref
212 return None
213
214 @staticmethod
[email protected]f2f9d552009-12-22 00:12:57215 def GetSVNBranch(cwd):
216 """Returns the svn branch name if found."""
217 # Try to figure out which remote branch we're based on.
218 # Strategy:
[email protected]ade368c2011-03-01 08:57:50219 # 1) iterate through our branch history and find the svn URL.
220 # 2) find the svn-remote that fetches from the URL.
[email protected]f2f9d552009-12-22 00:12:57221
222 # regexp matching the git-svn line that contains the URL.
223 git_svn_re = re.compile(r'^\s*git-svn-id: (\S+)@', re.MULTILINE)
224
[email protected]ade368c2011-03-01 08:57:50225 # We don't want to go through all of history, so read a line from the
226 # pipe at a time.
227 # The -100 is an arbitrary limit so we don't search forever.
228 cmd = ['git', 'log', '-100', '--pretty=medium']
[email protected]80a9ef12011-12-13 20:44:10229 proc = subprocess2.Popen(cmd, cwd, stdout=subprocess2.PIPE)
[email protected]e8c28622011-04-05 14:41:44230 url = None
[email protected]ade368c2011-03-01 08:57:50231 for line in proc.stdout:
232 match = git_svn_re.match(line)
233 if match:
234 url = match.group(1)
235 proc.stdout.close() # Cut pipe.
236 break
[email protected]f2f9d552009-12-22 00:12:57237
[email protected]ade368c2011-03-01 08:57:50238 if url:
239 svn_remote_re = re.compile(r'^svn-remote\.([^.]+)\.url (.*)$')
[email protected]80a9ef12011-12-13 20:44:10240 remotes = GIT.Capture(
241 ['config', '--get-regexp', r'^svn-remote\..*\.url'],
242 cwd=cwd).splitlines()
[email protected]ade368c2011-03-01 08:57:50243 for remote in remotes:
244 match = svn_remote_re.match(remote)
[email protected]f2f9d552009-12-22 00:12:57245 if match:
[email protected]ade368c2011-03-01 08:57:50246 remote = match.group(1)
247 base_url = match.group(2)
[email protected]866276c2011-03-18 20:09:31248 try:
249 fetch_spec = GIT.Capture(
250 ['config', 'svn-remote.%s.fetch' % remote],
251 cwd=cwd).strip()
252 branch = GIT.MatchSvnGlob(url, base_url, fetch_spec, False)
[email protected]da64d632011-09-08 17:41:15253 except subprocess2.CalledProcessError:
[email protected]866276c2011-03-18 20:09:31254 branch = None
255 if branch:
256 return branch
257 try:
258 branch_spec = GIT.Capture(
259 ['config', 'svn-remote.%s.branches' % remote],
260 cwd=cwd).strip()
261 branch = GIT.MatchSvnGlob(url, base_url, branch_spec, True)
[email protected]da64d632011-09-08 17:41:15262 except subprocess2.CalledProcessError:
[email protected]866276c2011-03-18 20:09:31263 branch = None
264 if branch:
265 return branch
266 try:
267 tag_spec = GIT.Capture(
268 ['config', 'svn-remote.%s.tags' % remote],
269 cwd=cwd).strip()
270 branch = GIT.MatchSvnGlob(url, base_url, tag_spec, True)
[email protected]da64d632011-09-08 17:41:15271 except subprocess2.CalledProcessError:
[email protected]866276c2011-03-18 20:09:31272 branch = None
273 if branch:
274 return branch
[email protected]f2f9d552009-12-22 00:12:57275
276 @staticmethod
277 def FetchUpstreamTuple(cwd):
278 """Returns a tuple containg remote and remote ref,
279 e.g. 'origin', 'refs/heads/master'
[email protected]81e012c2010-04-29 16:07:24280 Tries to be intelligent and understand git-svn.
[email protected]f2f9d552009-12-22 00:12:57281 """
282 remote = '.'
[email protected]b24a8e12009-12-22 13:45:48283 branch = GIT.GetBranch(cwd)
[email protected]ad80e3b2010-09-09 14:18:28284 try:
285 upstream_branch = GIT.Capture(
286 ['config', 'branch.%s.merge' % branch], cwd=cwd).strip()
[email protected]da64d632011-09-08 17:41:15287 except subprocess2.CalledProcessError:
[email protected]ad80e3b2010-09-09 14:18:28288 upstream_branch = None
[email protected]f2f9d552009-12-22 00:12:57289 if upstream_branch:
[email protected]ad80e3b2010-09-09 14:18:28290 try:
291 remote = GIT.Capture(
292 ['config', 'branch.%s.remote' % branch], cwd=cwd).strip()
[email protected]da64d632011-09-08 17:41:15293 except subprocess2.CalledProcessError:
[email protected]ad80e3b2010-09-09 14:18:28294 pass
[email protected]f2f9d552009-12-22 00:12:57295 else:
[email protected]ade368c2011-03-01 08:57:50296 try:
297 upstream_branch = GIT.Capture(
298 ['config', 'rietveld.upstream-branch'], cwd=cwd).strip()
[email protected]da64d632011-09-08 17:41:15299 except subprocess2.CalledProcessError:
[email protected]ade368c2011-03-01 08:57:50300 upstream_branch = None
301 if upstream_branch:
302 try:
303 remote = GIT.Capture(
304 ['config', 'rietveld.upstream-remote'], cwd=cwd).strip()
[email protected]da64d632011-09-08 17:41:15305 except subprocess2.CalledProcessError:
[email protected]ade368c2011-03-01 08:57:50306 pass
[email protected]81e012c2010-04-29 16:07:24307 else:
[email protected]ade368c2011-03-01 08:57:50308 # Fall back on trying a git-svn upstream branch.
309 if GIT.IsGitSvn(cwd):
310 upstream_branch = GIT.GetSVNBranch(cwd)
[email protected]a630bd72010-04-29 23:32:34311 else:
[email protected]ade368c2011-03-01 08:57:50312 # Else, try to guess the origin remote.
313 remote_branches = GIT.Capture(['branch', '-r'], cwd=cwd).split()
314 if 'origin/master' in remote_branches:
315 # Fall back on origin/master if it exits.
316 remote = 'origin'
317 upstream_branch = 'refs/heads/master'
318 elif 'origin/trunk' in remote_branches:
319 # Fall back on origin/trunk if it exists. Generally a shared
320 # git-svn clone
321 remote = 'origin'
322 upstream_branch = 'refs/heads/trunk'
323 else:
324 # Give up.
325 remote = None
326 upstream_branch = None
[email protected]f2f9d552009-12-22 00:12:57327 return remote, upstream_branch
328
329 @staticmethod
[email protected]81e012c2010-04-29 16:07:24330 def GetUpstreamBranch(cwd):
[email protected]f2f9d552009-12-22 00:12:57331 """Gets the current branch's upstream branch."""
332 remote, upstream_branch = GIT.FetchUpstreamTuple(cwd)
[email protected]a630bd72010-04-29 23:32:34333 if remote != '.' and upstream_branch:
[email protected]f2f9d552009-12-22 00:12:57334 upstream_branch = upstream_branch.replace('heads', 'remotes/' + remote)
335 return upstream_branch
336
337 @staticmethod
[email protected]8ede00e2010-01-12 14:35:28338 def GenerateDiff(cwd, branch=None, branch_head='HEAD', full_move=False,
339 files=None):
[email protected]a9371762009-12-22 18:27:38340 """Diffs against the upstream branch or optionally another branch.
341
342 full_move means that move or copy operations should completely recreate the
343 files, usually in the prospect to apply the patch for a try job."""
[email protected]f2f9d552009-12-22 00:12:57344 if not branch:
[email protected]81e012c2010-04-29 16:07:24345 branch = GIT.GetUpstreamBranch(cwd)
[email protected]400f3e72010-05-19 14:23:36346 command = ['diff', '-p', '--no-prefix', '--no-ext-diff',
347 branch + "..." + branch_head]
[email protected]a9371762009-12-22 18:27:38348 if not full_move:
349 command.append('-C')
[email protected]8ede00e2010-01-12 14:35:28350 # TODO(maruel): --binary support.
351 if files:
352 command.append('--')
353 command.extend(files)
[email protected]ad80e3b2010-09-09 14:18:28354 diff = GIT.Capture(command, cwd=cwd).splitlines(True)
[email protected]f2f9d552009-12-22 00:12:57355 for i in range(len(diff)):
356 # In the case of added files, replace /dev/null with the path to the
357 # file being added.
358 if diff[i].startswith('--- /dev/null'):
359 diff[i] = '--- %s' % diff[i+1][4:]
360 return ''.join(diff)
[email protected]c78f2462009-11-21 01:20:57361
[email protected]b24a8e12009-12-22 13:45:48362 @staticmethod
[email protected]8ede00e2010-01-12 14:35:28363 def GetDifferentFiles(cwd, branch=None, branch_head='HEAD'):
364 """Returns the list of modified files between two branches."""
365 if not branch:
[email protected]81e012c2010-04-29 16:07:24366 branch = GIT.GetUpstreamBranch(cwd)
[email protected]838f0f22010-04-09 17:02:50367 command = ['diff', '--name-only', branch + "..." + branch_head]
[email protected]ad80e3b2010-09-09 14:18:28368 return GIT.Capture(command, cwd=cwd).splitlines(False)
[email protected]8ede00e2010-01-12 14:35:28369
370 @staticmethod
[email protected]b24a8e12009-12-22 13:45:48371 def GetPatchName(cwd):
372 """Constructs a name for this patch."""
[email protected]ad80e3b2010-09-09 14:18:28373 short_sha = GIT.Capture(['rev-parse', '--short=4', 'HEAD'], cwd=cwd).strip()
[email protected]862ff8e2010-08-06 15:29:16374 return "%s#%s" % (GIT.GetBranch(cwd), short_sha)
[email protected]b24a8e12009-12-22 13:45:48375
376 @staticmethod
[email protected]ad80e3b2010-09-09 14:18:28377 def GetCheckoutRoot(cwd):
[email protected]01d8c1d2010-01-07 01:56:59378 """Returns the top level directory of a git checkout as an absolute path.
[email protected]b24a8e12009-12-22 13:45:48379 """
[email protected]ad80e3b2010-09-09 14:18:28380 root = GIT.Capture(['rev-parse', '--show-cdup'], cwd=cwd).strip()
381 return os.path.abspath(os.path.join(cwd, root))
[email protected]b24a8e12009-12-22 13:45:48382
[email protected]36ac2392011-10-12 16:36:11383 @classmethod
384 def AssertVersion(cls, min_version):
[email protected]d0f854a2010-03-11 19:35:53385 """Asserts git's version is at least min_version."""
[email protected]36ac2392011-10-12 16:36:11386 if cls.current_version is None:
[email protected]80a9ef12011-12-13 20:44:10387 cls.current_version = cls.Capture(['--version'], '.').split()[-1]
[email protected]36ac2392011-10-12 16:36:11388 current_version_list = map(only_int, cls.current_version.split('.'))
[email protected]d0f854a2010-03-11 19:35:53389 for min_ver in map(int, min_version.split('.')):
390 ver = current_version_list.pop(0)
391 if ver < min_ver:
[email protected]36ac2392011-10-12 16:36:11392 return (False, cls.current_version)
[email protected]d0f854a2010-03-11 19:35:53393 elif ver > min_ver:
[email protected]36ac2392011-10-12 16:36:11394 return (True, cls.current_version)
395 return (True, cls.current_version)
[email protected]d0f854a2010-03-11 19:35:53396
[email protected]d5800f12009-11-12 20:03:43397
[email protected]5aeb7dd2009-11-17 18:09:01398class SVN(object):
[email protected]57564662010-04-14 02:35:12399 current_version = None
[email protected]d5800f12009-11-12 20:03:43400
[email protected]5aeb7dd2009-11-17 18:09:01401 @staticmethod
[email protected]d579fcf2011-12-13 20:36:03402 def Capture(args, cwd, **kwargs):
[email protected]54019f32010-09-09 13:50:11403 """Always redirect stderr.
[email protected]d5800f12009-11-12 20:03:43404
[email protected]da64d632011-09-08 17:41:15405 Throws an exception if non-0 is returned.
406 """
[email protected]904af082011-09-08 22:06:09407 return subprocess2.check_output(
[email protected]d579fcf2011-12-13 20:36:03408 ['svn'] + args, stderr=subprocess2.PIPE, cwd=cwd, **kwargs)
[email protected]d5800f12009-11-12 20:03:43409
[email protected]5aeb7dd2009-11-17 18:09:01410 @staticmethod
[email protected]2b9aa8e2010-08-25 20:01:42411 def RunAndGetFileList(verbose, args, cwd, file_list, stdout=None):
[email protected]5aeb7dd2009-11-17 18:09:01412 """Runs svn checkout, update, or status, output to stdout.
[email protected]d5800f12009-11-12 20:03:43413
[email protected]5aeb7dd2009-11-17 18:09:01414 The first item in args must be either "checkout", "update", or "status".
[email protected]d5800f12009-11-12 20:03:43415
[email protected]5aeb7dd2009-11-17 18:09:01416 svn's stdout is parsed to collect a list of files checked out or updated.
417 These files are appended to file_list. svn's stdout is also printed to
418 sys.stdout as in Run.
[email protected]d5800f12009-11-12 20:03:43419
[email protected]5aeb7dd2009-11-17 18:09:01420 Args:
[email protected]03807072010-08-16 17:18:44421 verbose: If True, uses verbose output
[email protected]5aeb7dd2009-11-17 18:09:01422 args: A sequence of command line parameters to be passed to svn.
[email protected]2b9aa8e2010-08-25 20:01:42423 cwd: The directory where svn is to be run.
[email protected]d5800f12009-11-12 20:03:43424
[email protected]5aeb7dd2009-11-17 18:09:01425 Raises:
426 Error: An error occurred while running the svn command.
427 """
[email protected]2b9aa8e2010-08-25 20:01:42428 stdout = stdout or sys.stdout
[email protected]d5800f12009-11-12 20:03:43429
[email protected]5aeb7dd2009-11-17 18:09:01430 # svn update and svn checkout use the same pattern: the first three columns
431 # are for file status, property status, and lock status. This is followed
432 # by two spaces, and then the path to the file.
433 update_pattern = '^... (.*)$'
[email protected]d5800f12009-11-12 20:03:43434
[email protected]5aeb7dd2009-11-17 18:09:01435 # The first three columns of svn status are the same as for svn update and
436 # svn checkout. The next three columns indicate addition-with-history,
437 # switch, and remote lock status. This is followed by one space, and then
438 # the path to the file.
439 status_pattern = '^...... (.*)$'
[email protected]d5800f12009-11-12 20:03:43440
[email protected]5aeb7dd2009-11-17 18:09:01441 # args[0] must be a supported command. This will blow up if it's something
442 # else, which is good. Note that the patterns are only effective when
443 # these commands are used in their ordinary forms, the patterns are invalid
444 # for "svn status --show-updates", for example.
445 pattern = {
446 'checkout': update_pattern,
447 'status': status_pattern,
448 'update': update_pattern,
449 }[args[0]]
[email protected]5aeb7dd2009-11-17 18:09:01450 compiled_pattern = re.compile(pattern)
[email protected]b71b67e2009-11-24 20:48:19451 # Place an upper limit.
[email protected]2aee22982010-09-03 14:15:25452 backoff_time = 5
[email protected]bec588d2010-10-26 13:50:25453 retries = 0
[email protected]03507062010-10-26 00:58:27454 while True:
[email protected]bec588d2010-10-26 13:50:25455 retries += 1
[email protected]b71b67e2009-11-24 20:48:19456 previous_list_len = len(file_list)
457 failure = []
[email protected]54d1f1a2010-01-08 19:53:47458
[email protected]b71b67e2009-11-24 20:48:19459 def CaptureMatchingLines(line):
460 match = compiled_pattern.search(line)
461 if match:
462 file_list.append(match.group(1))
463 if line.startswith('svn: '):
[email protected]8599aa72010-02-08 20:27:14464 failure.append(line)
[email protected]54d1f1a2010-01-08 19:53:47465
[email protected]b71b67e2009-11-24 20:48:19466 try:
[email protected]17d01792010-09-01 18:07:10467 gclient_utils.CheckCallAndFilterAndHeader(
468 ['svn'] + args,
469 cwd=cwd,
470 always=verbose,
471 filter_fn=CaptureMatchingLines,
472 stdout=stdout)
[email protected]da64d632011-09-08 17:41:15473 except subprocess2.CalledProcessError:
[email protected]6133c5b2010-08-18 18:34:48474 def IsKnownFailure():
475 for x in failure:
476 if (x.startswith('svn: OPTIONS of') or
477 x.startswith('svn: PROPFIND of') or
478 x.startswith('svn: REPORT of') or
[email protected]f61fc932010-08-19 13:05:24479 x.startswith('svn: Unknown hostname') or
[email protected]7d8b97d2011-10-11 23:32:30480 x.startswith('svn: Server sent unexpected return value') or
481 x.startswith('svn: Can\'t connect to host')):
[email protected]6133c5b2010-08-18 18:34:48482 return True
483 return False
484
[email protected]953586a2010-06-15 14:22:24485 # Subversion client is really misbehaving with Google Code.
486 if args[0] == 'checkout':
487 # Ensure at least one file was checked out, otherwise *delete* the
488 # directory.
489 if len(file_list) == previous_list_len:
[email protected]6133c5b2010-08-18 18:34:48490 if not IsKnownFailure():
[email protected]953586a2010-06-15 14:22:24491 # No known svn error was found, bail out.
492 raise
[email protected]6133c5b2010-08-18 18:34:48493 # No file were checked out, so make sure the directory is
494 # deleted in case it's messed up and try again.
495 # Warning: It's bad, it assumes args[2] is the directory
496 # argument.
497 if os.path.isdir(args[2]):
498 gclient_utils.RemoveDirectory(args[2])
[email protected]953586a2010-06-15 14:22:24499 else:
500 # Progress was made, convert to update since an aborted checkout
501 # is now an update.
[email protected]2de10252010-02-08 01:10:39502 args = ['update'] + args[1:]
[email protected]953586a2010-06-15 14:22:24503 else:
504 # It was an update or export.
[email protected]6133c5b2010-08-18 18:34:48505 # We enforce that some progress has been made or a known failure.
506 if len(file_list) == previous_list_len and not IsKnownFailure():
507 # No known svn error was found and no progress, bail out.
508 raise
[email protected]bec588d2010-10-26 13:50:25509 if retries == 10:
[email protected]03507062010-10-26 00:58:27510 raise
[email protected]2aee22982010-09-03 14:15:25511 print "Sleeping %.1f seconds and retrying...." % backoff_time
512 time.sleep(backoff_time)
513 backoff_time *= 1.3
[email protected]953586a2010-06-15 14:22:24514 continue
[email protected]b71b67e2009-11-24 20:48:19515 break
[email protected]d5800f12009-11-12 20:03:43516
[email protected]5aeb7dd2009-11-17 18:09:01517 @staticmethod
[email protected]d579fcf2011-12-13 20:36:03518 def CaptureRemoteInfo(url):
519 """Returns a dictionary from the svn info output for the given url.
520
521 Throws an exception if svn info fails.
522 """
523 assert isinstance(url, str)
524 return SVN._CaptureInfo([url], None)
525
526 @staticmethod
527 def CaptureLocalInfo(files, cwd):
528 """Returns a dictionary from the svn info output for the given files.
529
530 Throws an exception if svn info fails.
531 """
532 assert isinstance(files, (list, tuple))
533 return SVN._CaptureInfo(files, cwd)
534
535 @staticmethod
536 def _CaptureInfo(files, cwd):
[email protected]5aeb7dd2009-11-17 18:09:01537 """Returns a dictionary from the svn info output for the given file.
[email protected]d5800f12009-11-12 20:03:43538
[email protected]54019f32010-09-09 13:50:11539 Throws an exception if svn info fails."""
[email protected]d25fb8f2011-04-07 13:40:15540 result = {}
[email protected]d579fcf2011-12-13 20:36:03541 info = ElementTree.XML(SVN.Capture(['info', '--xml'] + files, cwd))
[email protected]ade9c592011-04-07 15:59:11542 if info is None:
543 return result
544 entry = info.find('entry')
[email protected]6f323bb2011-04-26 15:42:53545 if entry is None:
546 return result
[email protected]ade9c592011-04-07 15:59:11547
548 # Use .text when the item is not optional.
549 result['Path'] = entry.attrib['path']
550 result['Revision'] = int(entry.attrib['revision'])
551 result['Node Kind'] = entry.attrib['kind']
552 # Differs across versions.
553 if result['Node Kind'] == 'dir':
554 result['Node Kind'] = 'directory'
555 result['URL'] = entry.find('url').text
556 repository = entry.find('repository')
557 result['Repository Root'] = repository.find('root').text
558 result['UUID'] = repository.find('uuid')
559 wc_info = entry.find('wc-info')
560 if wc_info is not None:
561 result['Schedule'] = wc_info.find('schedule').text
562 result['Copied From URL'] = wc_info.find('copy-from-url')
563 result['Copied From Rev'] = wc_info.find('copy-from-rev')
564 else:
565 result['Schedule'] = None
566 result['Copied From URL'] = None
567 result['Copied From Rev'] = None
568 for key in result.keys():
569 if isinstance(result[key], unicode):
570 # Unicode results interferes with the higher layers matching up things
571 # in the deps dictionary.
572 result[key] = result[key].encode()
573 # Automatic conversion of optional parameters.
574 result[key] = getattr(result[key], 'text', result[key])
[email protected]5aeb7dd2009-11-17 18:09:01575 return result
[email protected]d5800f12009-11-12 20:03:43576
[email protected]5aeb7dd2009-11-17 18:09:01577 @staticmethod
[email protected]54019f32010-09-09 13:50:11578 def CaptureRevision(cwd):
[email protected]5d63eb82010-03-24 23:22:09579 """Get the base revision of a SVN repository.
580
581 Returns:
582 Int base revision
583 """
[email protected]d579fcf2011-12-13 20:36:03584 return SVN.CaptureLocalInfo([], cwd).get('Revision')
[email protected]5d63eb82010-03-24 23:22:09585
586 @staticmethod
[email protected]d579fcf2011-12-13 20:36:03587 def CaptureStatus(files, cwd):
[email protected]5aeb7dd2009-11-17 18:09:01588 """Returns the svn 1.5 svn status emulated output.
[email protected]d5800f12009-11-12 20:03:43589
[email protected]5aeb7dd2009-11-17 18:09:01590 @files can be a string (one file) or a list of files.
[email protected]d5800f12009-11-12 20:03:43591
[email protected]5aeb7dd2009-11-17 18:09:01592 Returns an array of (status, file) tuples."""
593 command = ["status", "--xml"]
594 if not files:
595 pass
596 elif isinstance(files, basestring):
597 command.append(files)
598 else:
599 command.extend(files)
[email protected]d5800f12009-11-12 20:03:43600
[email protected]5aeb7dd2009-11-17 18:09:01601 status_letter = {
602 None: ' ',
603 '': ' ',
604 'added': 'A',
605 'conflicted': 'C',
606 'deleted': 'D',
607 'external': 'X',
608 'ignored': 'I',
609 'incomplete': '!',
610 'merged': 'G',
611 'missing': '!',
612 'modified': 'M',
613 'none': ' ',
614 'normal': ' ',
615 'obstructed': '~',
616 'replaced': 'R',
617 'unversioned': '?',
618 }
[email protected]d579fcf2011-12-13 20:36:03619 dom = ElementTree.XML(SVN.Capture(command, cwd))
[email protected]5aeb7dd2009-11-17 18:09:01620 results = []
[email protected]ade9c592011-04-07 15:59:11621 if dom is None:
622 return results
623 # /status/target/entry/(wc-status|commit|author|date)
624 for target in dom.findall('target'):
625 for entry in target.findall('entry'):
626 file_path = entry.attrib['path']
627 wc_status = entry.find('wc-status')
628 # Emulate svn 1.5 status ouput...
629 statuses = [' '] * 7
630 # Col 0
631 xml_item_status = wc_status.attrib['item']
632 if xml_item_status in status_letter:
633 statuses[0] = status_letter[xml_item_status]
634 else:
635 raise gclient_utils.Error(
636 'Unknown item status "%s"; please implement me!' %
637 xml_item_status)
638 # Col 1
639 xml_props_status = wc_status.attrib['props']
640 if xml_props_status == 'modified':
641 statuses[1] = 'M'
642 elif xml_props_status == 'conflicted':
643 statuses[1] = 'C'
644 elif (not xml_props_status or xml_props_status == 'none' or
645 xml_props_status == 'normal'):
646 pass
647 else:
648 raise gclient_utils.Error(
649 'Unknown props status "%s"; please implement me!' %
650 xml_props_status)
651 # Col 2
652 if wc_status.attrib.get('wc-locked') == 'true':
653 statuses[2] = 'L'
654 # Col 3
655 if wc_status.attrib.get('copied') == 'true':
656 statuses[3] = '+'
657 # Col 4
658 if wc_status.attrib.get('switched') == 'true':
659 statuses[4] = 'S'
660 # TODO(maruel): Col 5 and 6
661 item = (''.join(statuses), file_path)
662 results.append(item)
[email protected]5aeb7dd2009-11-17 18:09:01663 return results
[email protected]d5800f12009-11-12 20:03:43664
[email protected]5aeb7dd2009-11-17 18:09:01665 @staticmethod
[email protected]d579fcf2011-12-13 20:36:03666 def IsMoved(filename, cwd):
[email protected]5aeb7dd2009-11-17 18:09:01667 """Determine if a file has been added through svn mv"""
[email protected]d579fcf2011-12-13 20:36:03668 assert isinstance(filename, basestring)
669 return SVN.IsMovedInfo(SVN.CaptureLocalInfo([filename], cwd))
[email protected]3c55d982010-05-06 14:25:44670
671 @staticmethod
672 def IsMovedInfo(info):
673 """Determine if a file has been added through svn mv"""
[email protected]5aeb7dd2009-11-17 18:09:01674 return (info.get('Copied From URL') and
675 info.get('Copied From Rev') and
676 info.get('Schedule') == 'add')
[email protected]d5800f12009-11-12 20:03:43677
[email protected]5aeb7dd2009-11-17 18:09:01678 @staticmethod
[email protected]d579fcf2011-12-13 20:36:03679 def GetFileProperty(filename, property_name, cwd):
[email protected]5aeb7dd2009-11-17 18:09:01680 """Returns the value of an SVN property for the given file.
[email protected]d5800f12009-11-12 20:03:43681
[email protected]5aeb7dd2009-11-17 18:09:01682 Args:
[email protected]6e29d572010-06-04 17:32:20683 filename: The file to check
[email protected]5aeb7dd2009-11-17 18:09:01684 property_name: The name of the SVN property, e.g. "svn:mime-type"
[email protected]d5800f12009-11-12 20:03:43685
[email protected]5aeb7dd2009-11-17 18:09:01686 Returns:
687 The value of the property, which will be the empty string if the property
688 is not set on the file. If the file is not under version control, the
689 empty string is also returned.
690 """
[email protected]54019f32010-09-09 13:50:11691 try:
[email protected]d579fcf2011-12-13 20:36:03692 return SVN.Capture(['propget', property_name, filename], cwd)
[email protected]da64d632011-09-08 17:41:15693 except subprocess2.CalledProcessError:
[email protected]54019f32010-09-09 13:50:11694 return ''
[email protected]d5800f12009-11-12 20:03:43695
[email protected]5aeb7dd2009-11-17 18:09:01696 @staticmethod
[email protected]d579fcf2011-12-13 20:36:03697 def DiffItem(filename, cwd, full_move, revision):
[email protected]f2f9d552009-12-22 00:12:57698 """Diffs a single file.
699
[email protected]3c55d982010-05-06 14:25:44700 Should be simple, eh? No it isn't.
[email protected]f2f9d552009-12-22 00:12:57701 Be sure to be in the appropriate directory before calling to have the
[email protected]a9371762009-12-22 18:27:38702 expected relative path.
703 full_move means that move or copy operations should completely recreate the
704 files, usually in the prospect to apply the patch for a try job."""
[email protected]5aeb7dd2009-11-17 18:09:01705 # If the user specified a custom diff command in their svn config file,
706 # then it'll be used when we do svn diff, which we don't want to happen
707 # since we want the unified diff. Using --diff-cmd=diff doesn't always
708 # work, since they can have another diff executable in their path that
709 # gives different line endings. So we use a bogus temp directory as the
710 # config directory, which gets around these problems.
[email protected]f2f9d552009-12-22 00:12:57711 bogus_dir = tempfile.mkdtemp()
712 try:
[email protected]3c55d982010-05-06 14:25:44713 # Use "svn info" output instead of os.path.isdir because the latter fails
714 # when the file is deleted.
[email protected]d579fcf2011-12-13 20:36:03715 return SVN._DiffItemInternal(
716 filename,
717 cwd,
718 SVN.CaptureLocalInfo([filename], cwd),
719 bogus_dir,
720 full_move,
721 revision)
[email protected]3c55d982010-05-06 14:25:44722 finally:
[email protected]da64d632011-09-08 17:41:15723 gclient_utils.RemoveDirectory(bogus_dir)
[email protected]3c55d982010-05-06 14:25:44724
725 @staticmethod
[email protected]d579fcf2011-12-13 20:36:03726 def _DiffItemInternal(filename, cwd, info, bogus_dir, full_move, revision):
[email protected]3c55d982010-05-06 14:25:44727 """Grabs the diff data."""
728 command = ["diff", "--config-dir", bogus_dir, filename]
729 if revision:
730 command.extend(['--revision', revision])
731 data = None
732 if SVN.IsMovedInfo(info):
733 if full_move:
734 if info.get("Node Kind") == "directory":
735 # Things become tricky here. It's a directory copy/move. We need to
736 # diff all the files inside it.
737 # This will put a lot of pressure on the heap. This is why StringIO
738 # is used and converted back into a string at the end. The reason to
739 # return a string instead of a StringIO is that StringIO.write()
740 # doesn't accept a StringIO object. *sigh*.
741 for (dirpath, dirnames, filenames) in os.walk(filename):
742 # Cleanup all files starting with a '.'.
743 for d in dirnames:
744 if d.startswith('.'):
745 dirnames.remove(d)
746 for f in filenames:
747 if f.startswith('.'):
748 filenames.remove(f)
749 for f in filenames:
750 if data is None:
751 data = cStringIO.StringIO()
752 data.write(GenFakeDiff(os.path.join(dirpath, f)))
753 if data:
754 tmp = data.getvalue()
755 data.close()
756 data = tmp
[email protected]f2f9d552009-12-22 00:12:57757 else:
[email protected]3c55d982010-05-06 14:25:44758 data = GenFakeDiff(filename)
759 else:
760 if info.get("Node Kind") != "directory":
[email protected]0836c562010-01-22 01:10:06761 # svn diff on a mv/cp'd file outputs nothing if there was no change.
[email protected]d579fcf2011-12-13 20:36:03762 data = SVN.Capture(command, cwd)
[email protected]0836c562010-01-22 01:10:06763 if not data:
764 # We put in an empty Index entry so upload.py knows about them.
[email protected]c6d170e2010-06-03 00:06:00765 data = "Index: %s\n" % filename.replace(os.sep, '/')
[email protected]3c55d982010-05-06 14:25:44766 # Otherwise silently ignore directories.
767 else:
768 if info.get("Node Kind") != "directory":
769 # Normal simple case.
[email protected]f8b3f942011-03-24 17:33:50770 try:
[email protected]d579fcf2011-12-13 20:36:03771 data = SVN.Capture(command, cwd)
[email protected]da64d632011-09-08 17:41:15772 except subprocess2.CalledProcessError:
[email protected]f8b3f942011-03-24 17:33:50773 if revision:
774 data = GenFakeDiff(filename)
775 else:
776 raise
[email protected]3c55d982010-05-06 14:25:44777 # Otherwise silently ignore directories.
[email protected]5aeb7dd2009-11-17 18:09:01778 return data
[email protected]c78f2462009-11-21 01:20:57779
780 @staticmethod
[email protected]d579fcf2011-12-13 20:36:03781 def GenerateDiff(filenames, cwd, full_move, revision):
[email protected]f2f9d552009-12-22 00:12:57782 """Returns a string containing the diff for the given file list.
783
784 The files in the list should either be absolute paths or relative to the
785 given root. If no root directory is provided, the repository root will be
786 used.
787 The diff will always use relative paths.
788 """
[email protected]00fdcb32011-02-24 01:41:02789 assert isinstance(filenames, (list, tuple))
[email protected]d579fcf2011-12-13 20:36:03790 root = os.path.normcase(os.path.join(cwd, ''))
[email protected]f2f9d552009-12-22 00:12:57791 def RelativePath(path, root):
792 """We must use relative paths."""
[email protected]fd9cbbb2010-01-08 23:04:03793 if os.path.normcase(path).startswith(root):
[email protected]f2f9d552009-12-22 00:12:57794 return path[len(root):]
795 return path
[email protected]3c55d982010-05-06 14:25:44796 # If the user specified a custom diff command in their svn config file,
797 # then it'll be used when we do svn diff, which we don't want to happen
798 # since we want the unified diff. Using --diff-cmd=diff doesn't always
799 # work, since they can have another diff executable in their path that
800 # gives different line endings. So we use a bogus temp directory as the
801 # config directory, which gets around these problems.
802 bogus_dir = tempfile.mkdtemp()
[email protected]f2f9d552009-12-22 00:12:57803 try:
[email protected]3c55d982010-05-06 14:25:44804 # Cleanup filenames
805 filenames = [RelativePath(f, root) for f in filenames]
806 # Get information about the modified items (files and directories)
[email protected]d579fcf2011-12-13 20:36:03807 data = dict([(f, SVN.CaptureLocalInfo([f], root)) for f in filenames])
[email protected]3fda4cc2010-06-29 13:29:27808 diffs = []
[email protected]3c55d982010-05-06 14:25:44809 if full_move:
810 # Eliminate modified files inside moved/copied directory.
811 for (filename, info) in data.iteritems():
812 if SVN.IsMovedInfo(info) and info.get("Node Kind") == "directory":
813 # Remove files inside the directory.
814 filenames = [f for f in filenames
815 if not f.startswith(filename + os.path.sep)]
816 for filename in data.keys():
817 if not filename in filenames:
818 # Remove filtered out items.
819 del data[filename]
[email protected]3fda4cc2010-06-29 13:29:27820 else:
821 metaheaders = []
822 for (filename, info) in data.iteritems():
823 if SVN.IsMovedInfo(info):
824 # for now, the most common case is a head copy,
825 # so let's just encode that as a straight up cp.
826 srcurl = info.get('Copied From URL')
[email protected]d579fcf2011-12-13 20:36:03827 file_root = info.get('Repository Root')
[email protected]3fda4cc2010-06-29 13:29:27828 rev = int(info.get('Copied From Rev'))
[email protected]d579fcf2011-12-13 20:36:03829 assert srcurl.startswith(file_root)
830 src = srcurl[len(file_root)+1:]
[email protected]00fdcb32011-02-24 01:41:02831 try:
[email protected]d579fcf2011-12-13 20:36:03832 srcinfo = SVN.CaptureRemoteInfo(srcurl)
[email protected]da64d632011-09-08 17:41:15833 except subprocess2.CalledProcessError, e:
[email protected]00fdcb32011-02-24 01:41:02834 if not 'Not a valid URL' in e.stderr:
835 raise
836 # Assume the file was deleted. No idea how to figure out at which
837 # revision the file was deleted.
838 srcinfo = {'Revision': rev}
[email protected]3fda4cc2010-06-29 13:29:27839 if (srcinfo.get('Revision') != rev and
[email protected]d579fcf2011-12-13 20:36:03840 SVN.Capture(['diff', '-r', '%d:head' % rev, srcurl], cwd)):
[email protected]3fda4cc2010-06-29 13:29:27841 metaheaders.append("#$ svn cp -r %d %s %s "
842 "### WARNING: note non-trunk copy\n" %
843 (rev, src, filename))
844 else:
845 metaheaders.append("#$ cp %s %s\n" % (src,
846 filename))
847
848 if metaheaders:
849 diffs.append("### BEGIN SVN COPY METADATA\n")
850 diffs.extend(metaheaders)
851 diffs.append("### END SVN COPY METADATA\n")
[email protected]3c55d982010-05-06 14:25:44852 # Now ready to do the actual diff.
[email protected]3c55d982010-05-06 14:25:44853 for filename in sorted(data.iterkeys()):
[email protected]d579fcf2011-12-13 20:36:03854 diffs.append(SVN._DiffItemInternal(
855 filename, cwd, data[filename], bogus_dir, full_move, revision))
[email protected]3c55d982010-05-06 14:25:44856 # Use StringIO since it can be messy when diffing a directory move with
857 # full_move=True.
858 buf = cStringIO.StringIO()
859 for d in filter(None, diffs):
860 buf.write(d)
861 result = buf.getvalue()
862 buf.close()
863 return result
[email protected]f2f9d552009-12-22 00:12:57864 finally:
[email protected]da64d632011-09-08 17:41:15865 gclient_utils.RemoveDirectory(bogus_dir)
[email protected]f2f9d552009-12-22 00:12:57866
867 @staticmethod
[email protected]d579fcf2011-12-13 20:36:03868 def GetEmail(cwd):
[email protected]c78f2462009-11-21 01:20:57869 """Retrieves the svn account which we assume is an email address."""
[email protected]54019f32010-09-09 13:50:11870 try:
[email protected]d579fcf2011-12-13 20:36:03871 infos = SVN.CaptureLocalInfo([], cwd)
[email protected]da64d632011-09-08 17:41:15872 except subprocess2.CalledProcessError:
[email protected]c78f2462009-11-21 01:20:57873 return None
874
875 # Should check for uuid but it is incorrectly saved for https creds.
[email protected]54019f32010-09-09 13:50:11876 root = infos['Repository Root']
[email protected]c78f2462009-11-21 01:20:57877 realm = root.rsplit('/', 1)[0]
[email protected]54019f32010-09-09 13:50:11878 uuid = infos['UUID']
[email protected]c78f2462009-11-21 01:20:57879 if root.startswith('https') or not uuid:
880 regexp = re.compile(r'<%s:\d+>.*' % realm)
881 else:
882 regexp = re.compile(r'<%s:\d+> %s' % (realm, uuid))
883 if regexp is None:
884 return None
885 if sys.platform.startswith('win'):
886 if not 'APPDATA' in os.environ:
887 return None
[email protected]720d9f32009-11-21 17:38:57888 auth_dir = os.path.join(os.environ['APPDATA'], 'Subversion', 'auth',
889 'svn.simple')
[email protected]c78f2462009-11-21 01:20:57890 else:
891 if not 'HOME' in os.environ:
892 return None
893 auth_dir = os.path.join(os.environ['HOME'], '.subversion', 'auth',
894 'svn.simple')
895 for credfile in os.listdir(auth_dir):
896 cred_info = SVN.ReadSimpleAuth(os.path.join(auth_dir, credfile))
897 if regexp.match(cred_info.get('svn:realmstring')):
898 return cred_info.get('username')
899
900 @staticmethod
901 def ReadSimpleAuth(filename):
902 f = open(filename, 'r')
903 values = {}
[email protected]6e29d572010-06-04 17:32:20904 def ReadOneItem(item_type):
905 m = re.match(r'%s (\d+)' % item_type, f.readline())
[email protected]c78f2462009-11-21 01:20:57906 if not m:
907 return None
908 data = f.read(int(m.group(1)))
909 if f.read(1) != '\n':
910 return None
911 return data
912
913 while True:
914 key = ReadOneItem('K')
915 if not key:
916 break
917 value = ReadOneItem('V')
918 if not value:
919 break
920 values[key] = value
921 return values
[email protected]94b1ee92009-12-19 20:27:20922
923 @staticmethod
[email protected]d579fcf2011-12-13 20:36:03924 def GetCheckoutRoot(cwd):
[email protected]94b1ee92009-12-19 20:27:20925 """Returns the top level directory of the current repository.
926
927 The directory is returned as an absolute path.
928 """
[email protected]d579fcf2011-12-13 20:36:03929 cwd = os.path.abspath(cwd)
[email protected]54019f32010-09-09 13:50:11930 try:
[email protected]d579fcf2011-12-13 20:36:03931 info = SVN.CaptureLocalInfo([], cwd)
[email protected]885d6e82011-02-24 20:21:46932 cur_dir_repo_root = info['Repository Root']
933 url = info['URL']
[email protected]da64d632011-09-08 17:41:15934 except subprocess2.CalledProcessError:
[email protected]94b1ee92009-12-19 20:27:20935 return None
[email protected]94b1ee92009-12-19 20:27:20936 while True:
[email protected]d579fcf2011-12-13 20:36:03937 parent = os.path.dirname(cwd)
[email protected]54019f32010-09-09 13:50:11938 try:
[email protected]d579fcf2011-12-13 20:36:03939 info = SVN.CaptureLocalInfo([], parent)
[email protected]885d6e82011-02-24 20:21:46940 if (info['Repository Root'] != cur_dir_repo_root or
941 info['URL'] != os.path.dirname(url)):
[email protected]54019f32010-09-09 13:50:11942 break
[email protected]885d6e82011-02-24 20:21:46943 url = info['URL']
[email protected]da64d632011-09-08 17:41:15944 except subprocess2.CalledProcessError:
[email protected]94b1ee92009-12-19 20:27:20945 break
[email protected]d579fcf2011-12-13 20:36:03946 cwd = parent
947 return GetCasedPath(cwd)
[email protected]57564662010-04-14 02:35:12948
[email protected]36ac2392011-10-12 16:36:11949 @classmethod
950 def AssertVersion(cls, min_version):
[email protected]57564662010-04-14 02:35:12951 """Asserts svn's version is at least min_version."""
[email protected]36ac2392011-10-12 16:36:11952 if cls.current_version is None:
[email protected]d579fcf2011-12-13 20:36:03953 cls.current_version = cls.Capture(['--version'], None).split()[2]
[email protected]36ac2392011-10-12 16:36:11954 current_version_list = map(only_int, cls.current_version.split('.'))
[email protected]57564662010-04-14 02:35:12955 for min_ver in map(int, min_version.split('.')):
956 ver = current_version_list.pop(0)
957 if ver < min_ver:
[email protected]36ac2392011-10-12 16:36:11958 return (False, cls.current_version)
[email protected]57564662010-04-14 02:35:12959 elif ver > min_ver:
[email protected]36ac2392011-10-12 16:36:11960 return (True, cls.current_version)
961 return (True, cls.current_version)
[email protected]07ab60e2011-02-08 21:54:00962
963 @staticmethod
[email protected]d579fcf2011-12-13 20:36:03964 def Revert(cwd, callback=None, ignore_externals=False):
965 """Reverts all svn modifications in cwd, including properties.
[email protected]07ab60e2011-02-08 21:54:00966
967 Deletes any modified files or directory.
968
969 A "svn update --revision BASE" call is required after to revive deleted
970 files.
971 """
[email protected]d579fcf2011-12-13 20:36:03972 for file_status in SVN.CaptureStatus(None, cwd):
973 file_path = os.path.join(cwd, file_status[1])
[email protected]8c415122011-03-15 17:14:27974 if (ignore_externals and
975 file_status[0][0] == 'X' and
976 file_status[0][1:].isspace()):
[email protected]07ab60e2011-02-08 21:54:00977 # Ignore externals.
978 logging.info('Ignoring external %s' % file_status[1])
979 continue
980
981 if callback:
982 callback(file_status)
983
[email protected]8c415122011-03-15 17:14:27984 if os.path.exists(file_path):
985 # svn revert is really stupid. It fails on inconsistent line-endings,
986 # on switched directories, etc. So take no chance and delete everything!
987 # In theory, it wouldn't be necessary for property-only change but then
988 # it'd have to look for switched directories, etc so it's not worth
989 # optimizing this use case.
990 if os.path.isfile(file_path) or os.path.islink(file_path):
991 logging.info('os.remove(%s)' % file_path)
992 os.remove(file_path)
993 elif os.path.isdir(file_path):
[email protected]da64d632011-09-08 17:41:15994 logging.info('RemoveDirectory(%s)' % file_path)
[email protected]8c415122011-03-15 17:14:27995 gclient_utils.RemoveDirectory(file_path)
996 else:
997 logging.critical(
998 ('No idea what is %s.\nYou just found a bug in gclient'
999 ', please ping [email protected] ASAP!') % file_path)
[email protected]07ab60e2011-02-08 21:54:001000
[email protected]8c415122011-03-15 17:14:271001 if (file_status[0][0] in ('D', 'A', '!') or
1002 not file_status[0][1:].isspace()):
[email protected]af453492011-03-03 21:04:091003 # Added, deleted file requires manual intervention and require calling
[email protected]07ab60e2011-02-08 21:54:001004 # revert, like for properties.
[email protected]d579fcf2011-12-13 20:36:031005 if not os.path.isdir(cwd):
[email protected]8b322b32011-11-01 19:05:501006 # '.' was deleted. It's not worth continuing.
1007 return
[email protected]af453492011-03-03 21:04:091008 try:
[email protected]d579fcf2011-12-13 20:36:031009 SVN.Capture(['revert', file_status[1]], cwd=cwd)
[email protected]da64d632011-09-08 17:41:151010 except subprocess2.CalledProcessError:
[email protected]af453492011-03-03 21:04:091011 if not os.path.exists(file_path):
1012 continue
1013 raise