blob: 31b18f67796c0cc5659e12339067d6eaa97ffd5f [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.orgd25fb8f2011-04-07 13:40:15 +000017import xml.dom.minidom
maruel@chromium.orgd5800f12009-11-12 20:03:43 +000018
19import gclient_utils
maruel@chromium.org31cb48a2011-04-04 18:01:36 +000020import subprocess2
21
maruel@chromium.orgd5800f12009-11-12 20:03:43 +000022
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +000023def ValidateEmail(email):
maruel@chromium.org6e29d572010-06-04 17:32:20 +000024 return (re.match(r"^[a-zA-Z0-9._%-+]+@[a-zA-Z0-9._%-]+.[a-zA-Z]{2,6}$", email)
25 is not None)
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +000026
maruel@chromium.orgd5800f12009-11-12 20:03:43 +000027
maruel@chromium.orgfd9cbbb2010-01-08 23:04:03 +000028def GetCasedPath(path):
29 """Elcheapos way to get the real path case on Windows."""
30 if sys.platform.startswith('win') and os.path.exists(path):
31 # Reconstruct the path.
32 path = os.path.abspath(path)
33 paths = path.split('\\')
34 for i in range(len(paths)):
35 if i == 0:
36 # Skip drive letter.
37 continue
38 subpath = '\\'.join(paths[:i+1])
39 prev = len('\\'.join(paths[:i]))
40 # glob.glob will return the cased path for the last item only. This is why
41 # we are calling it in a loop. Extract the data we want and put it back
42 # into the list.
43 paths[i] = glob.glob(subpath + '*')[0][prev+1:len(subpath)]
44 path = '\\'.join(paths)
45 return path
46
47
maruel@chromium.org3c55d982010-05-06 14:25:44 +000048def GenFakeDiff(filename):
49 """Generates a fake diff from a file."""
50 file_content = gclient_utils.FileRead(filename, 'rb').splitlines(True)
maruel@chromium.orgc6d170e2010-06-03 00:06:00 +000051 filename = filename.replace(os.sep, '/')
maruel@chromium.org3c55d982010-05-06 14:25:44 +000052 nb_lines = len(file_content)
53 # We need to use / since patch on unix will fail otherwise.
54 data = cStringIO.StringIO()
55 data.write("Index: %s\n" % filename)
56 data.write('=' * 67 + '\n')
57 # Note: Should we use /dev/null instead?
58 data.write("--- %s\n" % filename)
59 data.write("+++ %s\n" % filename)
60 data.write("@@ -0,0 +1,%d @@\n" % nb_lines)
61 # Prepend '+' to every lines.
62 for line in file_content:
63 data.write('+')
64 data.write(line)
65 result = data.getvalue()
66 data.close()
67 return result
68
69
maruel@chromium.org5c8c6de2011-03-18 16:20:18 +000070def determine_scm(root):
71 """Similar to upload.py's version but much simpler.
72
73 Returns 'svn', 'git' or None.
74 """
75 if os.path.isdir(os.path.join(root, '.svn')):
76 return 'svn'
maruel@chromium.orgc98c0c52011-04-06 13:39:43 +000077 elif os.path.isdir(os.path.join(root, '.git')):
maruel@chromium.org5c8c6de2011-03-18 16:20:18 +000078 return 'git'
79 else:
maruel@chromium.orgc98c0c52011-04-06 13:39:43 +000080 try:
81 subprocess2.check_output(
maruel@chromium.org5c8c6de2011-03-18 16:20:18 +000082 ['git', 'rev-parse', '--show-cdup'],
maruel@chromium.orgc98c0c52011-04-06 13:39:43 +000083 stdout=subprocess2.VOID,
84 cwd=root)
maruel@chromium.org5c8c6de2011-03-18 16:20:18 +000085 return 'git'
maruel@chromium.orgc98c0c52011-04-06 13:39:43 +000086 except (OSError, subprocess2.CalledProcessError):
maruel@chromium.org5c8c6de2011-03-18 16:20:18 +000087 return None
88
89
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +000090class GIT(object):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +000091 @staticmethod
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +000092 def Capture(args, **kwargs):
93 return gclient_utils.CheckCall(['git'] + args, print_error=False,
94 **kwargs)[0]
maruel@chromium.orgd5800f12009-11-12 20:03:43 +000095
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +000096 @staticmethod
msb@chromium.org786fb682010-06-02 15:16:23 +000097 def CaptureStatus(files, upstream_branch=None):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +000098 """Returns git status.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +000099
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000100 @files can be a string (one file) or a list of files.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000101
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000102 Returns an array of (status, file) tuples."""
msb@chromium.org786fb682010-06-02 15:16:23 +0000103 if upstream_branch is None:
104 upstream_branch = GIT.GetUpstreamBranch(os.getcwd())
105 if upstream_branch is None:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000106 raise gclient_utils.Error('Cannot determine upstream branch')
107 command = ['diff', '--name-status', '-r', '%s...' % upstream_branch]
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000108 if not files:
109 pass
110 elif isinstance(files, basestring):
111 command.append(files)
112 else:
113 command.extend(files)
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000114 status = GIT.Capture(command).rstrip()
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000115 results = []
116 if status:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000117 for statusline in status.splitlines():
maruel@chromium.orgcc1614b2010-09-20 17:13:17 +0000118 # 3-way merges can cause the status can be 'MMM' instead of 'M'. This
119 # can happen when the user has 2 local branches and he diffs between
120 # these 2 branches instead diffing to upstream.
121 m = re.match('^(\w)+\t(.+)$', statusline)
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000122 if not m:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000123 raise gclient_utils.Error(
124 'status currently unsupported: %s' % statusline)
maruel@chromium.orgcc1614b2010-09-20 17:13:17 +0000125 # Only grab the first letter.
126 results.append(('%s ' % m.group(1)[0], m.group(2)))
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000127 return results
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000128
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000129 @staticmethod
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000130 def GetEmail(cwd):
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000131 """Retrieves the user email address if known."""
132 # We could want to look at the svn cred when it has a svn remote but it
133 # should be fine for now, users should simply configure their git settings.
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000134 try:
135 return GIT.Capture(['config', 'user.email'], cwd=cwd).strip()
136 except gclient_utils.CheckCallError:
137 return ''
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000138
139 @staticmethod
140 def ShortBranchName(branch):
141 """Converts a name like 'refs/heads/foo' to just 'foo'."""
142 return branch.replace('refs/heads/', '')
143
144 @staticmethod
145 def GetBranchRef(cwd):
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000146 """Returns the full branch reference, e.g. 'refs/heads/master'."""
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000147 return GIT.Capture(['symbolic-ref', 'HEAD'], cwd=cwd).strip()
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000148
149 @staticmethod
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000150 def GetBranch(cwd):
151 """Returns the short branch name, e.g. 'master'."""
maruel@chromium.orgc308a742009-12-22 18:29:33 +0000152 return GIT.ShortBranchName(GIT.GetBranchRef(cwd))
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000153
154 @staticmethod
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000155 def IsGitSvn(cwd):
156 """Returns true if this repo looks like it's using git-svn."""
157 # If you have any "svn-remote.*" config keys, we think you're using svn.
158 try:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000159 GIT.Capture(['config', '--get-regexp', r'^svn-remote\.'], cwd=cwd)
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000160 return True
161 except gclient_utils.CheckCallError:
162 return False
163
164 @staticmethod
bauerb@chromium.org866276c2011-03-18 20:09:31 +0000165 def MatchSvnGlob(url, base_url, glob_spec, allow_wildcards):
166 """Return the corresponding git ref if |base_url| together with |glob_spec|
167 matches the full |url|.
168
169 If |allow_wildcards| is true, |glob_spec| can contain wildcards (see below).
170 """
171 fetch_suburl, as_ref = glob_spec.split(':')
172 if allow_wildcards:
173 glob_match = re.match('(.+/)?(\*|{[^/]*})(/.+)?', fetch_suburl)
174 if glob_match:
175 # Parse specs like "branches/*/src:refs/remotes/svn/*" or
176 # "branches/{472,597,648}/src:refs/remotes/svn/*".
177 branch_re = re.escape(base_url)
178 if glob_match.group(1):
179 branch_re += '/' + re.escape(glob_match.group(1))
180 wildcard = glob_match.group(2)
181 if wildcard == '*':
182 branch_re += '([^/]*)'
183 else:
184 # Escape and replace surrounding braces with parentheses and commas
185 # with pipe symbols.
186 wildcard = re.escape(wildcard)
187 wildcard = re.sub('^\\\\{', '(', wildcard)
188 wildcard = re.sub('\\\\,', '|', wildcard)
189 wildcard = re.sub('\\\\}$', ')', wildcard)
190 branch_re += wildcard
191 if glob_match.group(3):
192 branch_re += re.escape(glob_match.group(3))
193 match = re.match(branch_re, url)
194 if match:
195 return re.sub('\*$', match.group(1), as_ref)
196
197 # Parse specs like "trunk/src:refs/remotes/origin/trunk".
198 if fetch_suburl:
199 full_url = base_url + '/' + fetch_suburl
200 else:
201 full_url = base_url
202 if full_url == url:
203 return as_ref
204 return None
205
206 @staticmethod
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000207 def GetSVNBranch(cwd):
208 """Returns the svn branch name if found."""
209 # Try to figure out which remote branch we're based on.
210 # Strategy:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000211 # 1) iterate through our branch history and find the svn URL.
212 # 2) find the svn-remote that fetches from the URL.
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000213
214 # regexp matching the git-svn line that contains the URL.
215 git_svn_re = re.compile(r'^\s*git-svn-id: (\S+)@', re.MULTILINE)
216
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000217 # We don't want to go through all of history, so read a line from the
218 # pipe at a time.
219 # The -100 is an arbitrary limit so we don't search forever.
220 cmd = ['git', 'log', '-100', '--pretty=medium']
221 proc = gclient_utils.Popen(cmd, stdout=subprocess.PIPE)
maruel@chromium.orge8c28622011-04-05 14:41:44 +0000222 url = None
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000223 for line in proc.stdout:
224 match = git_svn_re.match(line)
225 if match:
226 url = match.group(1)
227 proc.stdout.close() # Cut pipe.
228 break
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000229
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000230 if url:
231 svn_remote_re = re.compile(r'^svn-remote\.([^.]+)\.url (.*)$')
232 remotes = GIT.Capture(['config', '--get-regexp',
233 r'^svn-remote\..*\.url'], cwd=cwd).splitlines()
234 for remote in remotes:
235 match = svn_remote_re.match(remote)
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000236 if match:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000237 remote = match.group(1)
238 base_url = match.group(2)
bauerb@chromium.org866276c2011-03-18 20:09:31 +0000239 try:
240 fetch_spec = GIT.Capture(
241 ['config', 'svn-remote.%s.fetch' % remote],
242 cwd=cwd).strip()
243 branch = GIT.MatchSvnGlob(url, base_url, fetch_spec, False)
244 except gclient_utils.CheckCallError:
245 branch = None
246 if branch:
247 return branch
248 try:
249 branch_spec = GIT.Capture(
250 ['config', 'svn-remote.%s.branches' % remote],
251 cwd=cwd).strip()
252 branch = GIT.MatchSvnGlob(url, base_url, branch_spec, True)
253 except gclient_utils.CheckCallError:
254 branch = None
255 if branch:
256 return branch
257 try:
258 tag_spec = GIT.Capture(
259 ['config', 'svn-remote.%s.tags' % remote],
260 cwd=cwd).strip()
261 branch = GIT.MatchSvnGlob(url, base_url, tag_spec, True)
262 except gclient_utils.CheckCallError:
263 branch = None
264 if branch:
265 return branch
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000266
267 @staticmethod
268 def FetchUpstreamTuple(cwd):
269 """Returns a tuple containg remote and remote ref,
270 e.g. 'origin', 'refs/heads/master'
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000271 Tries to be intelligent and understand git-svn.
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000272 """
273 remote = '.'
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000274 branch = GIT.GetBranch(cwd)
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000275 try:
276 upstream_branch = GIT.Capture(
277 ['config', 'branch.%s.merge' % branch], cwd=cwd).strip()
maruel@chromium.org31cb48a2011-04-04 18:01:36 +0000278 except (gclient_utils.Error, subprocess2.CalledProcessError):
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000279 upstream_branch = None
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000280 if upstream_branch:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000281 try:
282 remote = GIT.Capture(
283 ['config', 'branch.%s.remote' % branch], cwd=cwd).strip()
maruel@chromium.org31cb48a2011-04-04 18:01:36 +0000284 except (gclient_utils.Error, subprocess2.CalledProcessError):
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000285 pass
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000286 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000287 try:
288 upstream_branch = GIT.Capture(
289 ['config', 'rietveld.upstream-branch'], cwd=cwd).strip()
maruel@chromium.org31cb48a2011-04-04 18:01:36 +0000290 except (gclient_utils.Error, subprocess2.CalledProcessError):
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000291 upstream_branch = None
292 if upstream_branch:
293 try:
294 remote = GIT.Capture(
295 ['config', 'rietveld.upstream-remote'], cwd=cwd).strip()
maruel@chromium.org31cb48a2011-04-04 18:01:36 +0000296 except (gclient_utils.Error, subprocess2.CalledProcessError):
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000297 pass
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000298 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000299 # Fall back on trying a git-svn upstream branch.
300 if GIT.IsGitSvn(cwd):
301 upstream_branch = GIT.GetSVNBranch(cwd)
maruel@chromium.orga630bd72010-04-29 23:32:34 +0000302 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000303 # Else, try to guess the origin remote.
304 remote_branches = GIT.Capture(['branch', '-r'], cwd=cwd).split()
305 if 'origin/master' in remote_branches:
306 # Fall back on origin/master if it exits.
307 remote = 'origin'
308 upstream_branch = 'refs/heads/master'
309 elif 'origin/trunk' in remote_branches:
310 # Fall back on origin/trunk if it exists. Generally a shared
311 # git-svn clone
312 remote = 'origin'
313 upstream_branch = 'refs/heads/trunk'
314 else:
315 # Give up.
316 remote = None
317 upstream_branch = None
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000318 return remote, upstream_branch
319
320 @staticmethod
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000321 def GetUpstreamBranch(cwd):
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000322 """Gets the current branch's upstream branch."""
323 remote, upstream_branch = GIT.FetchUpstreamTuple(cwd)
maruel@chromium.orga630bd72010-04-29 23:32:34 +0000324 if remote != '.' and upstream_branch:
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000325 upstream_branch = upstream_branch.replace('heads', 'remotes/' + remote)
326 return upstream_branch
327
328 @staticmethod
maruel@chromium.org8ede00e2010-01-12 14:35:28 +0000329 def GenerateDiff(cwd, branch=None, branch_head='HEAD', full_move=False,
330 files=None):
maruel@chromium.orga9371762009-12-22 18:27:38 +0000331 """Diffs against the upstream branch or optionally another branch.
332
333 full_move means that move or copy operations should completely recreate the
334 files, usually in the prospect to apply the patch for a try job."""
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000335 if not branch:
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000336 branch = GIT.GetUpstreamBranch(cwd)
evan@chromium.org400f3e72010-05-19 14:23:36 +0000337 command = ['diff', '-p', '--no-prefix', '--no-ext-diff',
338 branch + "..." + branch_head]
maruel@chromium.orga9371762009-12-22 18:27:38 +0000339 if not full_move:
340 command.append('-C')
maruel@chromium.org8ede00e2010-01-12 14:35:28 +0000341 # TODO(maruel): --binary support.
342 if files:
343 command.append('--')
344 command.extend(files)
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000345 diff = GIT.Capture(command, cwd=cwd).splitlines(True)
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000346 for i in range(len(diff)):
347 # In the case of added files, replace /dev/null with the path to the
348 # file being added.
349 if diff[i].startswith('--- /dev/null'):
350 diff[i] = '--- %s' % diff[i+1][4:]
351 return ''.join(diff)
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000352
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000353 @staticmethod
maruel@chromium.org8ede00e2010-01-12 14:35:28 +0000354 def GetDifferentFiles(cwd, branch=None, branch_head='HEAD'):
355 """Returns the list of modified files between two branches."""
356 if not branch:
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000357 branch = GIT.GetUpstreamBranch(cwd)
bauerb@chromium.org838f0f22010-04-09 17:02:50 +0000358 command = ['diff', '--name-only', branch + "..." + branch_head]
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000359 return GIT.Capture(command, cwd=cwd).splitlines(False)
maruel@chromium.org8ede00e2010-01-12 14:35:28 +0000360
361 @staticmethod
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000362 def GetPatchName(cwd):
363 """Constructs a name for this patch."""
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000364 short_sha = GIT.Capture(['rev-parse', '--short=4', 'HEAD'], cwd=cwd).strip()
maruel@chromium.org862ff8e2010-08-06 15:29:16 +0000365 return "%s#%s" % (GIT.GetBranch(cwd), short_sha)
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000366
367 @staticmethod
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000368 def GetCheckoutRoot(cwd):
maruel@chromium.org01d8c1d2010-01-07 01:56:59 +0000369 """Returns the top level directory of a git checkout as an absolute path.
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000370 """
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000371 root = GIT.Capture(['rev-parse', '--show-cdup'], cwd=cwd).strip()
372 return os.path.abspath(os.path.join(cwd, root))
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000373
maruel@chromium.orgd0f854a2010-03-11 19:35:53 +0000374 @staticmethod
375 def AssertVersion(min_version):
376 """Asserts git's version is at least min_version."""
377 def only_int(val):
378 if val.isdigit():
379 return int(val)
380 else:
381 return 0
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000382 current_version = GIT.Capture(['--version']).split()[-1]
maruel@chromium.orgd0f854a2010-03-11 19:35:53 +0000383 current_version_list = map(only_int, current_version.split('.'))
384 for min_ver in map(int, min_version.split('.')):
385 ver = current_version_list.pop(0)
386 if ver < min_ver:
387 return (False, current_version)
388 elif ver > min_ver:
389 return (True, current_version)
390 return (True, current_version)
391
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000392
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000393class SVN(object):
tony@chromium.org57564662010-04-14 02:35:12 +0000394 current_version = None
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000395
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000396 @staticmethod
maruel@chromium.org54019f32010-09-09 13:50:11 +0000397 def Capture(args, **kwargs):
398 """Always redirect stderr.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000399
maruel@chromium.org54019f32010-09-09 13:50:11 +0000400 Throws an exception if non-0 is returned."""
401 return gclient_utils.CheckCall(['svn'] + args, print_error=False,
402 **kwargs)[0]
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000403
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000404 @staticmethod
maruel@chromium.org2b9aa8e2010-08-25 20:01:42 +0000405 def RunAndGetFileList(verbose, args, cwd, file_list, stdout=None):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000406 """Runs svn checkout, update, or status, output to stdout.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000407
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000408 The first item in args must be either "checkout", "update", or "status".
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000409
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000410 svn's stdout is parsed to collect a list of files checked out or updated.
411 These files are appended to file_list. svn's stdout is also printed to
412 sys.stdout as in Run.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000413
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000414 Args:
maruel@chromium.org03807072010-08-16 17:18:44 +0000415 verbose: If True, uses verbose output
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000416 args: A sequence of command line parameters to be passed to svn.
maruel@chromium.org2b9aa8e2010-08-25 20:01:42 +0000417 cwd: The directory where svn is to be run.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000418
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000419 Raises:
420 Error: An error occurred while running the svn command.
421 """
maruel@chromium.org2b9aa8e2010-08-25 20:01:42 +0000422 stdout = stdout or sys.stdout
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000423
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000424 # svn update and svn checkout use the same pattern: the first three columns
425 # are for file status, property status, and lock status. This is followed
426 # by two spaces, and then the path to the file.
427 update_pattern = '^... (.*)$'
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000428
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000429 # The first three columns of svn status are the same as for svn update and
430 # svn checkout. The next three columns indicate addition-with-history,
431 # switch, and remote lock status. This is followed by one space, and then
432 # the path to the file.
433 status_pattern = '^...... (.*)$'
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000434
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000435 # args[0] must be a supported command. This will blow up if it's something
436 # else, which is good. Note that the patterns are only effective when
437 # these commands are used in their ordinary forms, the patterns are invalid
438 # for "svn status --show-updates", for example.
439 pattern = {
440 'checkout': update_pattern,
441 'status': status_pattern,
442 'update': update_pattern,
443 }[args[0]]
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000444 compiled_pattern = re.compile(pattern)
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000445 # Place an upper limit.
cbentzel@chromium.org2aee2292010-09-03 14:15:25 +0000446 backoff_time = 5
maruel@chromium.orgbec588d2010-10-26 13:50:25 +0000447 retries = 0
maruel@chromium.org03507062010-10-26 00:58:27 +0000448 while True:
maruel@chromium.orgbec588d2010-10-26 13:50:25 +0000449 retries += 1
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000450 previous_list_len = len(file_list)
451 failure = []
maruel@chromium.org54d1f1a2010-01-08 19:53:47 +0000452
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000453 def CaptureMatchingLines(line):
454 match = compiled_pattern.search(line)
455 if match:
456 file_list.append(match.group(1))
457 if line.startswith('svn: '):
maruel@chromium.org8599aa72010-02-08 20:27:14 +0000458 failure.append(line)
maruel@chromium.org54d1f1a2010-01-08 19:53:47 +0000459
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000460 try:
maruel@chromium.org17d01792010-09-01 18:07:10 +0000461 gclient_utils.CheckCallAndFilterAndHeader(
462 ['svn'] + args,
463 cwd=cwd,
464 always=verbose,
465 filter_fn=CaptureMatchingLines,
466 stdout=stdout)
maruel@chromium.org31cb48a2011-04-04 18:01:36 +0000467 except (gclient_utils.Error, subprocess2.CalledProcessError):
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000468 def IsKnownFailure():
469 for x in failure:
470 if (x.startswith('svn: OPTIONS of') or
471 x.startswith('svn: PROPFIND of') or
472 x.startswith('svn: REPORT of') or
maruel@chromium.orgf61fc932010-08-19 13:05:24 +0000473 x.startswith('svn: Unknown hostname') or
474 x.startswith('svn: Server sent unexpected return value')):
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000475 return True
476 return False
477
maruel@chromium.org953586a2010-06-15 14:22:24 +0000478 # Subversion client is really misbehaving with Google Code.
479 if args[0] == 'checkout':
480 # Ensure at least one file was checked out, otherwise *delete* the
481 # directory.
482 if len(file_list) == previous_list_len:
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000483 if not IsKnownFailure():
maruel@chromium.org953586a2010-06-15 14:22:24 +0000484 # No known svn error was found, bail out.
485 raise
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000486 # No file were checked out, so make sure the directory is
487 # deleted in case it's messed up and try again.
488 # Warning: It's bad, it assumes args[2] is the directory
489 # argument.
490 if os.path.isdir(args[2]):
491 gclient_utils.RemoveDirectory(args[2])
maruel@chromium.org953586a2010-06-15 14:22:24 +0000492 else:
493 # Progress was made, convert to update since an aborted checkout
494 # is now an update.
maruel@chromium.org2de10252010-02-08 01:10:39 +0000495 args = ['update'] + args[1:]
maruel@chromium.org953586a2010-06-15 14:22:24 +0000496 else:
497 # It was an update or export.
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000498 # We enforce that some progress has been made or a known failure.
499 if len(file_list) == previous_list_len and not IsKnownFailure():
500 # No known svn error was found and no progress, bail out.
501 raise
maruel@chromium.orgbec588d2010-10-26 13:50:25 +0000502 if retries == 10:
maruel@chromium.org03507062010-10-26 00:58:27 +0000503 raise
cbentzel@chromium.org2aee2292010-09-03 14:15:25 +0000504 print "Sleeping %.1f seconds and retrying...." % backoff_time
505 time.sleep(backoff_time)
506 backoff_time *= 1.3
maruel@chromium.org953586a2010-06-15 14:22:24 +0000507 continue
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000508 break
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000509
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000510 @staticmethod
maruel@chromium.org54019f32010-09-09 13:50:11 +0000511 def CaptureInfo(cwd):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000512 """Returns a dictionary from the svn info output for the given file.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000513
maruel@chromium.org54019f32010-09-09 13:50:11 +0000514 Throws an exception if svn info fails."""
maruel@chromium.org949d1a62011-04-07 13:38:15 +0000515 output = SVN.Capture(['info', '--xml', cwd])
maruel@chromium.orgd25fb8f2011-04-07 13:40:15 +0000516 dom = gclient_utils.ParseXML(output)
517 result = {}
518 if dom:
519 GetNamedNodeText = gclient_utils.GetNamedNodeText
520 GetNodeNamedAttributeText = gclient_utils.GetNodeNamedAttributeText
521 def C(item, f):
522 if item is not None:
523 return f(item)
524 # /info/entry/
525 # url
526 # reposityory/(root|uuid)
527 # wc-info/(schedule|depth)
528 # commit/(author|date)
529 # str() the results because they may be returned as Unicode, which
530 # interferes with the higher layers matching up things in the deps
531 # dictionary.
532 result['Repository Root'] = C(GetNamedNodeText(dom, 'root'), str)
533 result['URL'] = C(GetNamedNodeText(dom, 'url'), str)
534 result['UUID'] = C(GetNamedNodeText(dom, 'uuid'), str)
535 result['Revision'] = C(GetNodeNamedAttributeText(dom, 'entry',
536 'revision'),
537 int)
538 result['Node Kind'] = C(GetNodeNamedAttributeText(dom, 'entry', 'kind'),
539 str)
540 # Differs across versions.
541 if result['Node Kind'] == 'dir':
542 result['Node Kind'] = 'directory'
543 result['Schedule'] = C(GetNamedNodeText(dom, 'schedule'), str)
544 result['Path'] = C(GetNodeNamedAttributeText(dom, 'entry', 'path'), str)
545 result['Copied From URL'] = C(GetNamedNodeText(dom, 'copy-from-url'), str)
546 result['Copied From Rev'] = C(GetNamedNodeText(dom, 'copy-from-rev'), str)
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000547 return result
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000548
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000549 @staticmethod
maruel@chromium.org54019f32010-09-09 13:50:11 +0000550 def CaptureRevision(cwd):
nasser@codeaurora.org5d63eb82010-03-24 23:22:09 +0000551 """Get the base revision of a SVN repository.
552
553 Returns:
554 Int base revision
555 """
maruel@chromium.orgd25fb8f2011-04-07 13:40:15 +0000556 info = SVN.Capture(['info', '--xml'], cwd=cwd)
557 dom = xml.dom.minidom.parseString(info)
558 return dom.getElementsByTagName('entry')[0].getAttribute('revision')
nasser@codeaurora.org5d63eb82010-03-24 23:22:09 +0000559
560 @staticmethod
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000561 def CaptureStatus(files):
562 """Returns the svn 1.5 svn status emulated output.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000563
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000564 @files can be a string (one file) or a list of files.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000565
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000566 Returns an array of (status, file) tuples."""
567 command = ["status", "--xml"]
568 if not files:
569 pass
570 elif isinstance(files, basestring):
571 command.append(files)
572 else:
573 command.extend(files)
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000574
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000575 status_letter = {
576 None: ' ',
577 '': ' ',
578 'added': 'A',
579 'conflicted': 'C',
580 'deleted': 'D',
581 'external': 'X',
582 'ignored': 'I',
583 'incomplete': '!',
584 'merged': 'G',
585 'missing': '!',
586 'modified': 'M',
587 'none': ' ',
588 'normal': ' ',
589 'obstructed': '~',
590 'replaced': 'R',
591 'unversioned': '?',
592 }
maruel@chromium.orgd25fb8f2011-04-07 13:40:15 +0000593 dom = gclient_utils.ParseXML(SVN.Capture(command))
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000594 results = []
maruel@chromium.orgd25fb8f2011-04-07 13:40:15 +0000595 if dom:
596 # /status/target/entry/(wc-status|commit|author|date)
597 for target in dom.getElementsByTagName('target'):
598 #base_path = target.getAttribute('path')
599 for entry in target.getElementsByTagName('entry'):
600 file_path = entry.getAttribute('path')
601 wc_status = entry.getElementsByTagName('wc-status')
602 assert len(wc_status) == 1
603 # Emulate svn 1.5 status ouput...
604 statuses = [' '] * 7
605 # Col 0
606 xml_item_status = wc_status[0].getAttribute('item')
607 if xml_item_status in status_letter:
608 statuses[0] = status_letter[xml_item_status]
609 else:
610 raise gclient_utils.Error(
611 'Unknown item status "%s"; please implement me!' %
612 xml_item_status)
613 # Col 1
614 xml_props_status = wc_status[0].getAttribute('props')
615 if xml_props_status == 'modified':
616 statuses[1] = 'M'
617 elif xml_props_status == 'conflicted':
618 statuses[1] = 'C'
619 elif (not xml_props_status or xml_props_status == 'none' or
620 xml_props_status == 'normal'):
621 pass
622 else:
623 raise gclient_utils.Error(
624 'Unknown props status "%s"; please implement me!' %
625 xml_props_status)
626 # Col 2
627 if wc_status[0].getAttribute('wc-locked') == 'true':
628 statuses[2] = 'L'
629 # Col 3
630 if wc_status[0].getAttribute('copied') == 'true':
631 statuses[3] = '+'
632 # Col 4
633 if wc_status[0].getAttribute('switched') == 'true':
634 statuses[4] = 'S'
635 # TODO(maruel): Col 5 and 6
636 item = (''.join(statuses), file_path)
637 results.append(item)
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000638 return results
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000639
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000640 @staticmethod
641 def IsMoved(filename):
642 """Determine if a file has been added through svn mv"""
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000643 return SVN.IsMovedInfo(SVN.CaptureInfo(filename))
644
645 @staticmethod
646 def IsMovedInfo(info):
647 """Determine if a file has been added through svn mv"""
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000648 return (info.get('Copied From URL') and
649 info.get('Copied From Rev') and
650 info.get('Schedule') == 'add')
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000651
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000652 @staticmethod
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000653 def GetFileProperty(filename, property_name):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000654 """Returns the value of an SVN property for the given file.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000655
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000656 Args:
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000657 filename: The file to check
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000658 property_name: The name of the SVN property, e.g. "svn:mime-type"
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000659
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000660 Returns:
661 The value of the property, which will be the empty string if the property
662 is not set on the file. If the file is not under version control, the
663 empty string is also returned.
664 """
maruel@chromium.org54019f32010-09-09 13:50:11 +0000665 try:
666 return SVN.Capture(['propget', property_name, filename])
maruel@chromium.org31cb48a2011-04-04 18:01:36 +0000667 except (gclient_utils.Error, subprocess2.CalledProcessError):
maruel@chromium.org54019f32010-09-09 13:50:11 +0000668 return ''
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000669
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000670 @staticmethod
maruel@chromium.org1c7db8e2010-01-07 02:00:19 +0000671 def DiffItem(filename, full_move=False, revision=None):
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000672 """Diffs a single file.
673
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000674 Should be simple, eh? No it isn't.
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000675 Be sure to be in the appropriate directory before calling to have the
maruel@chromium.orga9371762009-12-22 18:27:38 +0000676 expected relative path.
677 full_move means that move or copy operations should completely recreate the
678 files, usually in the prospect to apply the patch for a try job."""
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000679 # If the user specified a custom diff command in their svn config file,
680 # then it'll be used when we do svn diff, which we don't want to happen
681 # since we want the unified diff. Using --diff-cmd=diff doesn't always
682 # work, since they can have another diff executable in their path that
683 # gives different line endings. So we use a bogus temp directory as the
684 # config directory, which gets around these problems.
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000685 bogus_dir = tempfile.mkdtemp()
686 try:
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000687 # Use "svn info" output instead of os.path.isdir because the latter fails
688 # when the file is deleted.
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000689 return SVN._DiffItemInternal(filename, SVN.CaptureInfo(filename),
690 bogus_dir,
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000691 full_move=full_move, revision=revision)
692 finally:
693 shutil.rmtree(bogus_dir)
694
695 @staticmethod
696 def _DiffItemInternal(filename, info, bogus_dir, full_move=False,
697 revision=None):
698 """Grabs the diff data."""
699 command = ["diff", "--config-dir", bogus_dir, filename]
700 if revision:
701 command.extend(['--revision', revision])
702 data = None
703 if SVN.IsMovedInfo(info):
704 if full_move:
705 if info.get("Node Kind") == "directory":
706 # Things become tricky here. It's a directory copy/move. We need to
707 # diff all the files inside it.
708 # This will put a lot of pressure on the heap. This is why StringIO
709 # is used and converted back into a string at the end. The reason to
710 # return a string instead of a StringIO is that StringIO.write()
711 # doesn't accept a StringIO object. *sigh*.
712 for (dirpath, dirnames, filenames) in os.walk(filename):
713 # Cleanup all files starting with a '.'.
714 for d in dirnames:
715 if d.startswith('.'):
716 dirnames.remove(d)
717 for f in filenames:
718 if f.startswith('.'):
719 filenames.remove(f)
720 for f in filenames:
721 if data is None:
722 data = cStringIO.StringIO()
723 data.write(GenFakeDiff(os.path.join(dirpath, f)))
724 if data:
725 tmp = data.getvalue()
726 data.close()
727 data = tmp
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000728 else:
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000729 data = GenFakeDiff(filename)
730 else:
731 if info.get("Node Kind") != "directory":
maruel@chromium.org0836c562010-01-22 01:10:06 +0000732 # svn diff on a mv/cp'd file outputs nothing if there was no change.
maruel@chromium.org54019f32010-09-09 13:50:11 +0000733 data = SVN.Capture(command)
maruel@chromium.org0836c562010-01-22 01:10:06 +0000734 if not data:
735 # We put in an empty Index entry so upload.py knows about them.
maruel@chromium.orgc6d170e2010-06-03 00:06:00 +0000736 data = "Index: %s\n" % filename.replace(os.sep, '/')
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000737 # Otherwise silently ignore directories.
738 else:
739 if info.get("Node Kind") != "directory":
740 # Normal simple case.
maruel@chromium.orgf8b3f942011-03-24 17:33:50 +0000741 try:
742 data = SVN.Capture(command)
743 except gclient_utils.CheckCallError:
744 if revision:
745 data = GenFakeDiff(filename)
746 else:
747 raise
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000748 # Otherwise silently ignore directories.
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000749 return data
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000750
751 @staticmethod
maruel@chromium.org1c7db8e2010-01-07 02:00:19 +0000752 def GenerateDiff(filenames, root=None, full_move=False, revision=None):
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000753 """Returns a string containing the diff for the given file list.
754
755 The files in the list should either be absolute paths or relative to the
756 given root. If no root directory is provided, the repository root will be
757 used.
758 The diff will always use relative paths.
759 """
maruel@chromium.org00fdcb32011-02-24 01:41:02 +0000760 assert isinstance(filenames, (list, tuple))
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000761 previous_cwd = os.getcwd()
maruel@chromium.orgfd9cbbb2010-01-08 23:04:03 +0000762 root = root or SVN.GetCheckoutRoot(previous_cwd)
763 root = os.path.normcase(os.path.join(root, ''))
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000764 def RelativePath(path, root):
765 """We must use relative paths."""
maruel@chromium.orgfd9cbbb2010-01-08 23:04:03 +0000766 if os.path.normcase(path).startswith(root):
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000767 return path[len(root):]
768 return path
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000769 # If the user specified a custom diff command in their svn config file,
770 # then it'll be used when we do svn diff, which we don't want to happen
771 # since we want the unified diff. Using --diff-cmd=diff doesn't always
772 # work, since they can have another diff executable in their path that
773 # gives different line endings. So we use a bogus temp directory as the
774 # config directory, which gets around these problems.
775 bogus_dir = tempfile.mkdtemp()
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000776 try:
777 os.chdir(root)
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000778 # Cleanup filenames
779 filenames = [RelativePath(f, root) for f in filenames]
780 # Get information about the modified items (files and directories)
781 data = dict([(f, SVN.CaptureInfo(f)) for f in filenames])
gavinp@google.com3fda4cc2010-06-29 13:29:27 +0000782 diffs = []
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000783 if full_move:
784 # Eliminate modified files inside moved/copied directory.
785 for (filename, info) in data.iteritems():
786 if SVN.IsMovedInfo(info) and info.get("Node Kind") == "directory":
787 # Remove files inside the directory.
788 filenames = [f for f in filenames
789 if not f.startswith(filename + os.path.sep)]
790 for filename in data.keys():
791 if not filename in filenames:
792 # Remove filtered out items.
793 del data[filename]
gavinp@google.com3fda4cc2010-06-29 13:29:27 +0000794 else:
795 metaheaders = []
796 for (filename, info) in data.iteritems():
797 if SVN.IsMovedInfo(info):
798 # for now, the most common case is a head copy,
799 # so let's just encode that as a straight up cp.
800 srcurl = info.get('Copied From URL')
801 root = info.get('Repository Root')
802 rev = int(info.get('Copied From Rev'))
803 assert srcurl.startswith(root)
804 src = srcurl[len(root)+1:]
maruel@chromium.org00fdcb32011-02-24 01:41:02 +0000805 try:
806 srcinfo = SVN.CaptureInfo(srcurl)
807 except gclient_utils.CheckCallError, e:
808 if not 'Not a valid URL' in e.stderr:
809 raise
810 # Assume the file was deleted. No idea how to figure out at which
811 # revision the file was deleted.
812 srcinfo = {'Revision': rev}
gavinp@google.com3fda4cc2010-06-29 13:29:27 +0000813 if (srcinfo.get('Revision') != rev and
814 SVN.Capture(['diff', '-r', '%d:head' % rev, srcurl])):
815 metaheaders.append("#$ svn cp -r %d %s %s "
816 "### WARNING: note non-trunk copy\n" %
817 (rev, src, filename))
818 else:
819 metaheaders.append("#$ cp %s %s\n" % (src,
820 filename))
821
822 if metaheaders:
823 diffs.append("### BEGIN SVN COPY METADATA\n")
824 diffs.extend(metaheaders)
825 diffs.append("### END SVN COPY METADATA\n")
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000826 # Now ready to do the actual diff.
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000827 for filename in sorted(data.iterkeys()):
828 diffs.append(SVN._DiffItemInternal(filename, data[filename], bogus_dir,
829 full_move=full_move,
830 revision=revision))
831 # Use StringIO since it can be messy when diffing a directory move with
832 # full_move=True.
833 buf = cStringIO.StringIO()
834 for d in filter(None, diffs):
835 buf.write(d)
836 result = buf.getvalue()
837 buf.close()
838 return result
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000839 finally:
840 os.chdir(previous_cwd)
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000841 shutil.rmtree(bogus_dir)
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000842
843 @staticmethod
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000844 def GetEmail(repo_root):
845 """Retrieves the svn account which we assume is an email address."""
maruel@chromium.org54019f32010-09-09 13:50:11 +0000846 try:
847 infos = SVN.CaptureInfo(repo_root)
maruel@chromium.org31cb48a2011-04-04 18:01:36 +0000848 except (gclient_utils.Error, subprocess2.CalledProcessError):
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000849 return None
850
851 # Should check for uuid but it is incorrectly saved for https creds.
maruel@chromium.org54019f32010-09-09 13:50:11 +0000852 root = infos['Repository Root']
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000853 realm = root.rsplit('/', 1)[0]
maruel@chromium.org54019f32010-09-09 13:50:11 +0000854 uuid = infos['UUID']
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000855 if root.startswith('https') or not uuid:
856 regexp = re.compile(r'<%s:\d+>.*' % realm)
857 else:
858 regexp = re.compile(r'<%s:\d+> %s' % (realm, uuid))
859 if regexp is None:
860 return None
861 if sys.platform.startswith('win'):
862 if not 'APPDATA' in os.environ:
863 return None
maruel@chromium.org720d9f32009-11-21 17:38:57 +0000864 auth_dir = os.path.join(os.environ['APPDATA'], 'Subversion', 'auth',
865 'svn.simple')
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000866 else:
867 if not 'HOME' in os.environ:
868 return None
869 auth_dir = os.path.join(os.environ['HOME'], '.subversion', 'auth',
870 'svn.simple')
871 for credfile in os.listdir(auth_dir):
872 cred_info = SVN.ReadSimpleAuth(os.path.join(auth_dir, credfile))
873 if regexp.match(cred_info.get('svn:realmstring')):
874 return cred_info.get('username')
875
876 @staticmethod
877 def ReadSimpleAuth(filename):
878 f = open(filename, 'r')
879 values = {}
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000880 def ReadOneItem(item_type):
881 m = re.match(r'%s (\d+)' % item_type, f.readline())
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000882 if not m:
883 return None
884 data = f.read(int(m.group(1)))
885 if f.read(1) != '\n':
886 return None
887 return data
888
889 while True:
890 key = ReadOneItem('K')
891 if not key:
892 break
893 value = ReadOneItem('V')
894 if not value:
895 break
896 values[key] = value
897 return values
maruel@chromium.org94b1ee92009-12-19 20:27:20 +0000898
899 @staticmethod
900 def GetCheckoutRoot(directory):
901 """Returns the top level directory of the current repository.
902
903 The directory is returned as an absolute path.
904 """
maruel@chromium.orgf7ae6d52009-12-22 20:49:04 +0000905 directory = os.path.abspath(directory)
maruel@chromium.org54019f32010-09-09 13:50:11 +0000906 try:
maruel@chromium.org885d6e82011-02-24 20:21:46 +0000907 info = SVN.CaptureInfo(directory)
908 cur_dir_repo_root = info['Repository Root']
909 url = info['URL']
maruel@chromium.org31cb48a2011-04-04 18:01:36 +0000910 except (gclient_utils.Error, subprocess2.CalledProcessError):
maruel@chromium.org94b1ee92009-12-19 20:27:20 +0000911 return None
maruel@chromium.org94b1ee92009-12-19 20:27:20 +0000912 while True:
913 parent = os.path.dirname(directory)
maruel@chromium.org54019f32010-09-09 13:50:11 +0000914 try:
maruel@chromium.org885d6e82011-02-24 20:21:46 +0000915 info = SVN.CaptureInfo(parent)
916 if (info['Repository Root'] != cur_dir_repo_root or
917 info['URL'] != os.path.dirname(url)):
maruel@chromium.org54019f32010-09-09 13:50:11 +0000918 break
maruel@chromium.org885d6e82011-02-24 20:21:46 +0000919 url = info['URL']
maruel@chromium.org31cb48a2011-04-04 18:01:36 +0000920 except (gclient_utils.Error, subprocess2.CalledProcessError):
maruel@chromium.org94b1ee92009-12-19 20:27:20 +0000921 break
922 directory = parent
maruel@chromium.orgfd9cbbb2010-01-08 23:04:03 +0000923 return GetCasedPath(directory)
tony@chromium.org57564662010-04-14 02:35:12 +0000924
925 @staticmethod
926 def AssertVersion(min_version):
927 """Asserts svn's version is at least min_version."""
928 def only_int(val):
929 if val.isdigit():
930 return int(val)
931 else:
932 return 0
933 if not SVN.current_version:
934 SVN.current_version = SVN.Capture(['--version']).split()[2]
935 current_version_list = map(only_int, SVN.current_version.split('.'))
936 for min_ver in map(int, min_version.split('.')):
937 ver = current_version_list.pop(0)
938 if ver < min_ver:
939 return (False, SVN.current_version)
940 elif ver > min_ver:
941 return (True, SVN.current_version)
942 return (True, SVN.current_version)
maruel@chromium.org07ab60e2011-02-08 21:54:00 +0000943
944 @staticmethod
945 def Revert(repo_root, callback=None, ignore_externals=False):
946 """Reverts all svn modifications in repo_root, including properties.
947
948 Deletes any modified files or directory.
949
950 A "svn update --revision BASE" call is required after to revive deleted
951 files.
952 """
953 for file_status in SVN.CaptureStatus(repo_root):
954 file_path = os.path.join(repo_root, file_status[1])
maruel@chromium.org8c415122011-03-15 17:14:27 +0000955 if (ignore_externals and
956 file_status[0][0] == 'X' and
957 file_status[0][1:].isspace()):
maruel@chromium.org07ab60e2011-02-08 21:54:00 +0000958 # Ignore externals.
959 logging.info('Ignoring external %s' % file_status[1])
960 continue
961
962 if callback:
963 callback(file_status)
964
maruel@chromium.org8c415122011-03-15 17:14:27 +0000965 if os.path.exists(file_path):
966 # svn revert is really stupid. It fails on inconsistent line-endings,
967 # on switched directories, etc. So take no chance and delete everything!
968 # In theory, it wouldn't be necessary for property-only change but then
969 # it'd have to look for switched directories, etc so it's not worth
970 # optimizing this use case.
971 if os.path.isfile(file_path) or os.path.islink(file_path):
972 logging.info('os.remove(%s)' % file_path)
973 os.remove(file_path)
974 elif os.path.isdir(file_path):
975 logging.info('gclient_utils.RemoveDirectory(%s)' % file_path)
976 gclient_utils.RemoveDirectory(file_path)
977 else:
978 logging.critical(
979 ('No idea what is %s.\nYou just found a bug in gclient'
980 ', please ping maruel@chromium.org ASAP!') % file_path)
maruel@chromium.org07ab60e2011-02-08 21:54:00 +0000981
maruel@chromium.org8c415122011-03-15 17:14:27 +0000982 if (file_status[0][0] in ('D', 'A', '!') or
983 not file_status[0][1:].isspace()):
maruel@chromium.orgaf453492011-03-03 21:04:09 +0000984 # Added, deleted file requires manual intervention and require calling
maruel@chromium.org07ab60e2011-02-08 21:54:00 +0000985 # revert, like for properties.
maruel@chromium.orgaf453492011-03-03 21:04:09 +0000986 try:
987 SVN.Capture(['revert', file_status[1]], cwd=repo_root)
988 except gclient_utils.CheckCallError:
989 if not os.path.exists(file_path):
990 continue
991 raise