blob: 09871778f837912649d13f2c9bd5bedeace276b1 [file] [log] [blame]
maruel@chromium.orgd5800f12009-11-12 20:03:43 +00001# Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
2# 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.orgd5800f12009-11-12 20:03:43 +00009import os
10import re
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +000011import shutil
maruel@chromium.orgd5800f12009-11-12 20:03:43 +000012import subprocess
13import sys
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +000014import tempfile
maruel@chromium.orgfd876172010-04-30 14:01:05 +000015import time
maruel@chromium.orgd5800f12009-11-12 20:03:43 +000016import xml.dom.minidom
17
18import gclient_utils
19
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +000020def ValidateEmail(email):
maruel@chromium.org6e29d572010-06-04 17:32:20 +000021 return (re.match(r"^[a-zA-Z0-9._%-+]+@[a-zA-Z0-9._%-]+.[a-zA-Z]{2,6}$", email)
22 is not None)
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +000023
maruel@chromium.orgd5800f12009-11-12 20:03:43 +000024
maruel@chromium.orgfd9cbbb2010-01-08 23:04:03 +000025def GetCasedPath(path):
26 """Elcheapos way to get the real path case on Windows."""
27 if sys.platform.startswith('win') and os.path.exists(path):
28 # Reconstruct the path.
29 path = os.path.abspath(path)
30 paths = path.split('\\')
31 for i in range(len(paths)):
32 if i == 0:
33 # Skip drive letter.
34 continue
35 subpath = '\\'.join(paths[:i+1])
36 prev = len('\\'.join(paths[:i]))
37 # glob.glob will return the cased path for the last item only. This is why
38 # we are calling it in a loop. Extract the data we want and put it back
39 # into the list.
40 paths[i] = glob.glob(subpath + '*')[0][prev+1:len(subpath)]
41 path = '\\'.join(paths)
42 return path
43
44
maruel@chromium.org3c55d982010-05-06 14:25:44 +000045def GenFakeDiff(filename):
46 """Generates a fake diff from a file."""
47 file_content = gclient_utils.FileRead(filename, 'rb').splitlines(True)
maruel@chromium.orgc6d170e2010-06-03 00:06:00 +000048 filename = filename.replace(os.sep, '/')
maruel@chromium.org3c55d982010-05-06 14:25:44 +000049 nb_lines = len(file_content)
50 # We need to use / since patch on unix will fail otherwise.
51 data = cStringIO.StringIO()
52 data.write("Index: %s\n" % filename)
53 data.write('=' * 67 + '\n')
54 # Note: Should we use /dev/null instead?
55 data.write("--- %s\n" % filename)
56 data.write("+++ %s\n" % filename)
57 data.write("@@ -0,0 +1,%d @@\n" % nb_lines)
58 # Prepend '+' to every lines.
59 for line in file_content:
60 data.write('+')
61 data.write(line)
62 result = data.getvalue()
63 data.close()
64 return result
65
66
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +000067class GIT(object):
68 COMMAND = "git"
maruel@chromium.orgd5800f12009-11-12 20:03:43 +000069
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +000070 @staticmethod
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +000071 def Capture(args, in_directory=None, print_error=True, error_ok=False):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +000072 """Runs git, capturing output sent to stdout as a string.
73
74 Args:
75 args: A sequence of command line parameters to be passed to git.
76 in_directory: The directory where git is to be run.
77
78 Returns:
79 The output sent to stdout as a string.
80 """
81 c = [GIT.COMMAND]
82 c.extend(args)
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +000083 try:
84 return gclient_utils.CheckCall(c, in_directory, print_error)
85 except gclient_utils.CheckCallError:
86 if error_ok:
nasser@codeaurora.orgcd968c12010-02-01 06:05:00 +000087 return ('', '')
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +000088 raise
maruel@chromium.orgd5800f12009-11-12 20:03:43 +000089
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +000090 @staticmethod
msb@chromium.org786fb682010-06-02 15:16:23 +000091 def CaptureStatus(files, upstream_branch=None):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +000092 """Returns git status.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +000093
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +000094 @files can be a string (one file) or a list of files.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +000095
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +000096 Returns an array of (status, file) tuples."""
msb@chromium.org786fb682010-06-02 15:16:23 +000097 if upstream_branch is None:
98 upstream_branch = GIT.GetUpstreamBranch(os.getcwd())
99 if upstream_branch is None:
100 raise Exception("Cannot determine upstream branch")
bauerb@chromium.org14ec5042010-03-30 18:19:09 +0000101 command = ["diff", "--name-status", "-r", "%s..." % upstream_branch]
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000102 if not files:
103 pass
104 elif isinstance(files, basestring):
105 command.append(files)
106 else:
107 command.extend(files)
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000108
maruel@chromium.org7be5ef22010-01-30 22:31:50 +0000109 status = GIT.Capture(command)[0].rstrip()
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000110 results = []
111 if status:
112 for statusline in status.split('\n'):
113 m = re.match('^(\w)\t(.+)$', statusline)
114 if not m:
115 raise Exception("status currently unsupported: %s" % statusline)
116 results.append(('%s ' % m.group(1), m.group(2)))
117 return results
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000118
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000119 @staticmethod
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000120 def RunAndFilterOutput(args,
121 in_directory,
122 print_messages,
123 print_stdout,
maruel@chromium.org559c3f82010-08-23 19:26:08 +0000124 filter_fn,
125 stdout=None):
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000126 """Runs a command, optionally outputting to stdout.
127
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000128 stdout is passed line-by-line to the given filter_fn function. If
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000129 print_stdout is true, it is also printed to sys.stdout as in Run.
130
131 Args:
132 args: A sequence of command line parameters to be passed.
msb@chromium.orgd6504212010-01-13 17:34:31 +0000133 in_directory: The directory where git is to be run.
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000134 print_messages: Whether to print status messages to stdout about
135 which commands are being run.
136 print_stdout: Whether to forward program's output to stdout.
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000137 filter_fn: A function taking one argument (a string) which will be
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000138 passed each line (with the ending newline character removed) of
139 program's output for filtering.
140
141 Raises:
142 gclient_utils.Error: An error occurred while running the command.
143 """
144 command = [GIT.COMMAND]
145 command.extend(args)
146 gclient_utils.SubprocessCallAndFilter(command,
147 in_directory,
148 print_messages,
149 print_stdout,
maruel@chromium.org559c3f82010-08-23 19:26:08 +0000150 filter_fn=filter_fn,
151 stdout=stdout)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000152
153 @staticmethod
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000154 def GetEmail(repo_root):
155 """Retrieves the user email address if known."""
156 # We could want to look at the svn cred when it has a svn remote but it
157 # should be fine for now, users should simply configure their git settings.
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000158 return GIT.Capture(['config', 'user.email'],
maruel@chromium.org7be5ef22010-01-30 22:31:50 +0000159 repo_root, error_ok=True)[0].strip()
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000160
161 @staticmethod
162 def ShortBranchName(branch):
163 """Converts a name like 'refs/heads/foo' to just 'foo'."""
164 return branch.replace('refs/heads/', '')
165
166 @staticmethod
167 def GetBranchRef(cwd):
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000168 """Returns the full branch reference, e.g. 'refs/heads/master'."""
maruel@chromium.org7be5ef22010-01-30 22:31:50 +0000169 return GIT.Capture(['symbolic-ref', 'HEAD'], cwd)[0].strip()
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000170
171 @staticmethod
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000172 def GetBranch(cwd):
173 """Returns the short branch name, e.g. 'master'."""
maruel@chromium.orgc308a742009-12-22 18:29:33 +0000174 return GIT.ShortBranchName(GIT.GetBranchRef(cwd))
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000175
176 @staticmethod
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000177 def IsGitSvn(cwd):
178 """Returns true if this repo looks like it's using git-svn."""
179 # If you have any "svn-remote.*" config keys, we think you're using svn.
180 try:
181 GIT.Capture(['config', '--get-regexp', r'^svn-remote\.'], cwd)
182 return True
183 except gclient_utils.CheckCallError:
184 return False
185
186 @staticmethod
187 def GetSVNBranch(cwd):
188 """Returns the svn branch name if found."""
189 # Try to figure out which remote branch we're based on.
190 # Strategy:
191 # 1) find all git-svn branches and note their svn URLs.
192 # 2) iterate through our branch history and match up the URLs.
193
194 # regexp matching the git-svn line that contains the URL.
195 git_svn_re = re.compile(r'^\s*git-svn-id: (\S+)@', re.MULTILINE)
196
197 # Get the refname and svn url for all refs/remotes/*.
198 remotes = GIT.Capture(
199 ['for-each-ref', '--format=%(refname)', 'refs/remotes'],
maruel@chromium.org7be5ef22010-01-30 22:31:50 +0000200 cwd)[0].splitlines()
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000201 svn_refs = {}
202 for ref in remotes:
203 match = git_svn_re.search(
maruel@chromium.org7be5ef22010-01-30 22:31:50 +0000204 GIT.Capture(['cat-file', '-p', ref], cwd)[0])
sky@chromium.org42d8da52010-04-23 18:25:07 +0000205 # Prefer origin/HEAD over all others.
206 if match and (match.group(1) not in svn_refs or
207 ref == "refs/remotes/origin/HEAD"):
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000208 svn_refs[match.group(1)] = ref
209
210 svn_branch = ''
211 if len(svn_refs) == 1:
212 # Only one svn branch exists -- seems like a good candidate.
213 svn_branch = svn_refs.values()[0]
214 elif len(svn_refs) > 1:
215 # We have more than one remote branch available. We don't
216 # want to go through all of history, so read a line from the
217 # pipe at a time.
218 # The -100 is an arbitrary limit so we don't search forever.
219 cmd = ['git', 'log', '-100', '--pretty=medium']
maruel@chromium.org3a292682010-08-23 18:54:55 +0000220 proc = gclient_utils.Popen(cmd, stdout=subprocess.PIPE, cwd=cwd)
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000221 for line in proc.stdout:
222 match = git_svn_re.match(line)
223 if match:
224 url = match.group(1)
225 if url in svn_refs:
226 svn_branch = svn_refs[url]
227 proc.stdout.close() # Cut pipe.
228 break
229 return svn_branch
230
231 @staticmethod
232 def FetchUpstreamTuple(cwd):
233 """Returns a tuple containg remote and remote ref,
234 e.g. 'origin', 'refs/heads/master'
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000235 Tries to be intelligent and understand git-svn.
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000236 """
237 remote = '.'
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000238 branch = GIT.GetBranch(cwd)
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000239 upstream_branch = None
240 upstream_branch = GIT.Capture(
nasser@codeaurora.orgb65040a2010-02-01 16:29:14 +0000241 ['config', 'branch.%s.merge' % branch], in_directory=cwd,
242 error_ok=True)[0].strip()
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000243 if upstream_branch:
244 remote = GIT.Capture(
245 ['config', 'branch.%s.remote' % branch],
nasser@codeaurora.orgb65040a2010-02-01 16:29:14 +0000246 in_directory=cwd, error_ok=True)[0].strip()
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000247 else:
248 # Fall back on trying a git-svn upstream branch.
249 if GIT.IsGitSvn(cwd):
250 upstream_branch = GIT.GetSVNBranch(cwd)
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000251 else:
maruel@chromium.orga630bd72010-04-29 23:32:34 +0000252 # Else, try to guess the origin remote.
253 remote_branches = GIT.Capture(
254 ['branch', '-r'], in_directory=cwd)[0].split()
255 if 'origin/master' in remote_branches:
256 # Fall back on origin/master if it exits.
257 remote = 'origin'
258 upstream_branch = 'refs/heads/master'
259 elif 'origin/trunk' in remote_branches:
260 # Fall back on origin/trunk if it exists. Generally a shared
261 # git-svn clone
262 remote = 'origin'
263 upstream_branch = 'refs/heads/trunk'
264 else:
265 # Give up.
266 remote = None
267 upstream_branch = None
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000268 return remote, upstream_branch
269
270 @staticmethod
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000271 def GetUpstreamBranch(cwd):
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000272 """Gets the current branch's upstream branch."""
273 remote, upstream_branch = GIT.FetchUpstreamTuple(cwd)
maruel@chromium.orga630bd72010-04-29 23:32:34 +0000274 if remote != '.' and upstream_branch:
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000275 upstream_branch = upstream_branch.replace('heads', 'remotes/' + remote)
276 return upstream_branch
277
278 @staticmethod
maruel@chromium.org8ede00e2010-01-12 14:35:28 +0000279 def GenerateDiff(cwd, branch=None, branch_head='HEAD', full_move=False,
280 files=None):
maruel@chromium.orga9371762009-12-22 18:27:38 +0000281 """Diffs against the upstream branch or optionally another branch.
282
283 full_move means that move or copy operations should completely recreate the
284 files, usually in the prospect to apply the patch for a try job."""
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000285 if not branch:
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000286 branch = GIT.GetUpstreamBranch(cwd)
evan@chromium.org400f3e72010-05-19 14:23:36 +0000287 command = ['diff', '-p', '--no-prefix', '--no-ext-diff',
288 branch + "..." + branch_head]
maruel@chromium.orga9371762009-12-22 18:27:38 +0000289 if not full_move:
290 command.append('-C')
maruel@chromium.org8ede00e2010-01-12 14:35:28 +0000291 # TODO(maruel): --binary support.
292 if files:
293 command.append('--')
294 command.extend(files)
maruel@chromium.org7be5ef22010-01-30 22:31:50 +0000295 diff = GIT.Capture(command, cwd)[0].splitlines(True)
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000296 for i in range(len(diff)):
297 # In the case of added files, replace /dev/null with the path to the
298 # file being added.
299 if diff[i].startswith('--- /dev/null'):
300 diff[i] = '--- %s' % diff[i+1][4:]
301 return ''.join(diff)
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000302
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000303 @staticmethod
maruel@chromium.org8ede00e2010-01-12 14:35:28 +0000304 def GetDifferentFiles(cwd, branch=None, branch_head='HEAD'):
305 """Returns the list of modified files between two branches."""
306 if not branch:
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000307 branch = GIT.GetUpstreamBranch(cwd)
bauerb@chromium.org838f0f22010-04-09 17:02:50 +0000308 command = ['diff', '--name-only', branch + "..." + branch_head]
maruel@chromium.org7be5ef22010-01-30 22:31:50 +0000309 return GIT.Capture(command, cwd)[0].splitlines(False)
maruel@chromium.org8ede00e2010-01-12 14:35:28 +0000310
311 @staticmethod
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000312 def GetPatchName(cwd):
313 """Constructs a name for this patch."""
maruel@chromium.org7be5ef22010-01-30 22:31:50 +0000314 short_sha = GIT.Capture(['rev-parse', '--short=4', 'HEAD'], cwd)[0].strip()
maruel@chromium.org862ff8e2010-08-06 15:29:16 +0000315 return "%s#%s" % (GIT.GetBranch(cwd), short_sha)
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000316
317 @staticmethod
maruel@chromium.org01d8c1d2010-01-07 01:56:59 +0000318 def GetCheckoutRoot(path):
319 """Returns the top level directory of a git checkout as an absolute path.
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000320 """
maruel@chromium.org7be5ef22010-01-30 22:31:50 +0000321 root = GIT.Capture(['rev-parse', '--show-cdup'], path)[0].strip()
maruel@chromium.org01d8c1d2010-01-07 01:56:59 +0000322 return os.path.abspath(os.path.join(path, root))
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000323
maruel@chromium.orgd0f854a2010-03-11 19:35:53 +0000324 @staticmethod
325 def AssertVersion(min_version):
326 """Asserts git's version is at least min_version."""
327 def only_int(val):
328 if val.isdigit():
329 return int(val)
330 else:
331 return 0
332 current_version = GIT.Capture(['--version'])[0].split()[-1]
333 current_version_list = map(only_int, current_version.split('.'))
334 for min_ver in map(int, min_version.split('.')):
335 ver = current_version_list.pop(0)
336 if ver < min_ver:
337 return (False, current_version)
338 elif ver > min_ver:
339 return (True, current_version)
340 return (True, current_version)
341
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000342
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000343class SVN(object):
344 COMMAND = "svn"
tony@chromium.org57564662010-04-14 02:35:12 +0000345 current_version = None
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000346
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000347 @staticmethod
348 def Run(args, in_directory):
349 """Runs svn, sending output to stdout.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000350
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000351 Args:
352 args: A sequence of command line parameters to be passed to svn.
353 in_directory: The directory where svn is to be run.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000354
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000355 Raises:
356 Error: An error occurred while running the svn command.
357 """
358 c = [SVN.COMMAND]
359 c.extend(args)
maruel@chromium.org2185f002009-12-18 21:03:47 +0000360 # TODO(maruel): This is very gclient-specific.
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000361 gclient_utils.SubprocessCall(c, in_directory)
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000362
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000363 @staticmethod
364 def Capture(args, in_directory=None, print_error=True):
365 """Runs svn, capturing output sent to stdout as a string.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000366
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000367 Args:
368 args: A sequence of command line parameters to be passed to svn.
369 in_directory: The directory where svn is to be run.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000370
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000371 Returns:
372 The output sent to stdout as a string.
373 """
374 c = [SVN.COMMAND]
375 c.extend(args)
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000376 stderr = None
377 if not print_error:
378 stderr = subprocess.PIPE
maruel@chromium.org3a292682010-08-23 18:54:55 +0000379 return gclient_utils.Popen(c, cwd=in_directory, stdout=subprocess.PIPE,
380 stderr=stderr).communicate()[0]
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000381
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000382 @staticmethod
maruel@chromium.org559c3f82010-08-23 19:26:08 +0000383 def RunAndGetFileList(verbose, args, in_directory, file_list, stdout=None):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000384 """Runs svn checkout, update, or status, output to stdout.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000385
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000386 The first item in args must be either "checkout", "update", or "status".
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000387
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000388 svn's stdout is parsed to collect a list of files checked out or updated.
389 These files are appended to file_list. svn's stdout is also printed to
390 sys.stdout as in Run.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000391
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000392 Args:
maruel@chromium.org03807072010-08-16 17:18:44 +0000393 verbose: If True, uses verbose output
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000394 args: A sequence of command line parameters to be passed to svn.
395 in_directory: The directory where svn is to be run.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000396
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000397 Raises:
398 Error: An error occurred while running the svn command.
399 """
400 command = [SVN.COMMAND]
401 command.extend(args)
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000402
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000403 # svn update and svn checkout use the same pattern: the first three columns
404 # are for file status, property status, and lock status. This is followed
405 # by two spaces, and then the path to the file.
406 update_pattern = '^... (.*)$'
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000407
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000408 # The first three columns of svn status are the same as for svn update and
409 # svn checkout. The next three columns indicate addition-with-history,
410 # switch, and remote lock status. This is followed by one space, and then
411 # the path to the file.
412 status_pattern = '^...... (.*)$'
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000413
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000414 # args[0] must be a supported command. This will blow up if it's something
415 # else, which is good. Note that the patterns are only effective when
416 # these commands are used in their ordinary forms, the patterns are invalid
417 # for "svn status --show-updates", for example.
418 pattern = {
419 'checkout': update_pattern,
420 'status': status_pattern,
421 'update': update_pattern,
422 }[args[0]]
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000423 compiled_pattern = re.compile(pattern)
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000424 # Place an upper limit.
maruel@chromium.orgfd876172010-04-30 14:01:05 +0000425 for _ in range(10):
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000426 previous_list_len = len(file_list)
427 failure = []
maruel@chromium.org54d1f1a2010-01-08 19:53:47 +0000428
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000429 def CaptureMatchingLines(line):
430 match = compiled_pattern.search(line)
431 if match:
432 file_list.append(match.group(1))
433 if line.startswith('svn: '):
maruel@chromium.org8599aa72010-02-08 20:27:14 +0000434 failure.append(line)
maruel@chromium.org54d1f1a2010-01-08 19:53:47 +0000435
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000436 try:
437 SVN.RunAndFilterOutput(args,
438 in_directory,
maruel@chromium.org03807072010-08-16 17:18:44 +0000439 verbose,
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000440 True,
maruel@chromium.org559c3f82010-08-23 19:26:08 +0000441 CaptureMatchingLines,
442 stdout=stdout)
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000443 except gclient_utils.Error:
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000444 def IsKnownFailure():
445 for x in failure:
446 if (x.startswith('svn: OPTIONS of') or
447 x.startswith('svn: PROPFIND of') or
448 x.startswith('svn: REPORT of') or
maruel@chromium.orgf61fc932010-08-19 13:05:24 +0000449 x.startswith('svn: Unknown hostname') or
450 x.startswith('svn: Server sent unexpected return value')):
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000451 return True
452 return False
453
maruel@chromium.org953586a2010-06-15 14:22:24 +0000454 # Subversion client is really misbehaving with Google Code.
455 if args[0] == 'checkout':
456 # Ensure at least one file was checked out, otherwise *delete* the
457 # directory.
458 if len(file_list) == previous_list_len:
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000459 if not IsKnownFailure():
maruel@chromium.org953586a2010-06-15 14:22:24 +0000460 # No known svn error was found, bail out.
461 raise
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000462 # No file were checked out, so make sure the directory is
463 # deleted in case it's messed up and try again.
464 # Warning: It's bad, it assumes args[2] is the directory
465 # argument.
466 if os.path.isdir(args[2]):
467 gclient_utils.RemoveDirectory(args[2])
maruel@chromium.org953586a2010-06-15 14:22:24 +0000468 else:
469 # Progress was made, convert to update since an aborted checkout
470 # is now an update.
maruel@chromium.org2de10252010-02-08 01:10:39 +0000471 args = ['update'] + args[1:]
maruel@chromium.org953586a2010-06-15 14:22:24 +0000472 else:
473 # It was an update or export.
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000474 # We enforce that some progress has been made or a known failure.
475 if len(file_list) == previous_list_len and not IsKnownFailure():
476 # No known svn error was found and no progress, bail out.
477 raise
maruel@chromium.org953586a2010-06-15 14:22:24 +0000478 print "Sleeping 15 seconds and retrying...."
479 time.sleep(15)
480 continue
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000481 break
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000482
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000483 @staticmethod
484 def RunAndFilterOutput(args,
485 in_directory,
486 print_messages,
487 print_stdout,
maruel@chromium.org559c3f82010-08-23 19:26:08 +0000488 filter_fn,
489 stdout=None):
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000490 """Runs a command, optionally outputting to stdout.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000491
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000492 stdout is passed line-by-line to the given filter_fn function. If
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000493 print_stdout is true, it is also printed to sys.stdout as in Run.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000494
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000495 Args:
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000496 args: A sequence of command line parameters to be passed.
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000497 in_directory: The directory where svn is to be run.
498 print_messages: Whether to print status messages to stdout about
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000499 which commands are being run.
500 print_stdout: Whether to forward program's output to stdout.
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000501 filter_fn: A function taking one argument (a string) which will be
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000502 passed each line (with the ending newline character removed) of
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000503 program's output for filtering.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000504
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000505 Raises:
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000506 gclient_utils.Error: An error occurred while running the command.
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000507 """
508 command = [SVN.COMMAND]
509 command.extend(args)
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000510 gclient_utils.SubprocessCallAndFilter(command,
511 in_directory,
512 print_messages,
513 print_stdout,
maruel@chromium.org559c3f82010-08-23 19:26:08 +0000514 filter_fn=filter_fn,
515 stdout=stdout)
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000516
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000517 @staticmethod
518 def CaptureInfo(relpath, in_directory=None, print_error=True):
519 """Returns a dictionary from the svn info output for the given file.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000520
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000521 Args:
522 relpath: The directory where the working copy resides relative to
523 the directory given by in_directory.
524 in_directory: The directory where svn is to be run.
525 """
526 output = SVN.Capture(["info", "--xml", relpath], in_directory, print_error)
527 dom = gclient_utils.ParseXML(output)
528 result = {}
529 if dom:
530 GetNamedNodeText = gclient_utils.GetNamedNodeText
531 GetNodeNamedAttributeText = gclient_utils.GetNodeNamedAttributeText
532 def C(item, f):
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000533 if item is not None:
534 return f(item)
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000535 # /info/entry/
536 # url
537 # reposityory/(root|uuid)
538 # wc-info/(schedule|depth)
539 # commit/(author|date)
540 # str() the results because they may be returned as Unicode, which
541 # interferes with the higher layers matching up things in the deps
542 # dictionary.
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000543 result['Repository Root'] = C(GetNamedNodeText(dom, 'root'), str)
544 result['URL'] = C(GetNamedNodeText(dom, 'url'), str)
545 result['UUID'] = C(GetNamedNodeText(dom, 'uuid'), str)
546 result['Revision'] = C(GetNodeNamedAttributeText(dom, 'entry',
547 'revision'),
548 int)
549 result['Node Kind'] = C(GetNodeNamedAttributeText(dom, 'entry', 'kind'),
550 str)
551 # Differs across versions.
552 if result['Node Kind'] == 'dir':
553 result['Node Kind'] = 'directory'
554 result['Schedule'] = C(GetNamedNodeText(dom, 'schedule'), str)
555 result['Path'] = C(GetNodeNamedAttributeText(dom, 'entry', 'path'), str)
556 result['Copied From URL'] = C(GetNamedNodeText(dom, 'copy-from-url'), str)
557 result['Copied From Rev'] = C(GetNamedNodeText(dom, 'copy-from-rev'), str)
558 return result
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000559
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000560 @staticmethod
561 def CaptureHeadRevision(url):
562 """Get the head revision of a SVN repository.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000563
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000564 Returns:
565 Int head revision
566 """
567 info = SVN.Capture(["info", "--xml", url], os.getcwd())
568 dom = xml.dom.minidom.parseString(info)
569 return dom.getElementsByTagName('entry')[0].getAttribute('revision')
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000570
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000571 @staticmethod
nasser@codeaurora.org5d63eb82010-03-24 23:22:09 +0000572 def CaptureBaseRevision(cwd):
573 """Get the base revision of a SVN repository.
574
575 Returns:
576 Int base revision
577 """
578 info = SVN.Capture(["info", "--xml"], cwd)
579 dom = xml.dom.minidom.parseString(info)
580 return dom.getElementsByTagName('entry')[0].getAttribute('revision')
581
582 @staticmethod
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000583 def CaptureStatus(files):
584 """Returns the svn 1.5 svn status emulated output.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000585
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000586 @files can be a string (one file) or a list of files.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000587
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000588 Returns an array of (status, file) tuples."""
589 command = ["status", "--xml"]
590 if not files:
591 pass
592 elif isinstance(files, basestring):
593 command.append(files)
594 else:
595 command.extend(files)
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000596
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000597 status_letter = {
598 None: ' ',
599 '': ' ',
600 'added': 'A',
601 'conflicted': 'C',
602 'deleted': 'D',
603 'external': 'X',
604 'ignored': 'I',
605 'incomplete': '!',
606 'merged': 'G',
607 'missing': '!',
608 'modified': 'M',
609 'none': ' ',
610 'normal': ' ',
611 'obstructed': '~',
612 'replaced': 'R',
613 'unversioned': '?',
614 }
615 dom = gclient_utils.ParseXML(SVN.Capture(command))
616 results = []
617 if dom:
618 # /status/target/entry/(wc-status|commit|author|date)
619 for target in dom.getElementsByTagName('target'):
620 #base_path = target.getAttribute('path')
621 for entry in target.getElementsByTagName('entry'):
622 file_path = entry.getAttribute('path')
623 wc_status = entry.getElementsByTagName('wc-status')
624 assert len(wc_status) == 1
625 # Emulate svn 1.5 status ouput...
626 statuses = [' '] * 7
627 # Col 0
628 xml_item_status = wc_status[0].getAttribute('item')
629 if xml_item_status in status_letter:
630 statuses[0] = status_letter[xml_item_status]
631 else:
632 raise Exception('Unknown item status "%s"; please implement me!' %
633 xml_item_status)
634 # Col 1
635 xml_props_status = wc_status[0].getAttribute('props')
636 if xml_props_status == 'modified':
637 statuses[1] = 'M'
638 elif xml_props_status == 'conflicted':
639 statuses[1] = 'C'
640 elif (not xml_props_status or xml_props_status == 'none' or
641 xml_props_status == 'normal'):
642 pass
643 else:
644 raise Exception('Unknown props status "%s"; please implement me!' %
645 xml_props_status)
646 # Col 2
647 if wc_status[0].getAttribute('wc-locked') == 'true':
648 statuses[2] = 'L'
649 # Col 3
650 if wc_status[0].getAttribute('copied') == 'true':
651 statuses[3] = '+'
652 # Col 4
653 if wc_status[0].getAttribute('switched') == 'true':
654 statuses[4] = 'S'
655 # TODO(maruel): Col 5 and 6
656 item = (''.join(statuses), file_path)
657 results.append(item)
658 return results
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000659
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000660 @staticmethod
661 def IsMoved(filename):
662 """Determine if a file has been added through svn mv"""
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000663 return SVN.IsMovedInfo(SVN.CaptureInfo(filename))
664
665 @staticmethod
666 def IsMovedInfo(info):
667 """Determine if a file has been added through svn mv"""
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000668 return (info.get('Copied From URL') and
669 info.get('Copied From Rev') and
670 info.get('Schedule') == 'add')
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000671
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000672 @staticmethod
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000673 def GetFileProperty(filename, property_name):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000674 """Returns the value of an SVN property for the given file.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000675
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000676 Args:
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000677 filename: The file to check
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000678 property_name: The name of the SVN property, e.g. "svn:mime-type"
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000679
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000680 Returns:
681 The value of the property, which will be the empty string if the property
682 is not set on the file. If the file is not under version control, the
683 empty string is also returned.
684 """
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000685 output = SVN.Capture(["propget", property_name, filename])
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000686 if (output.startswith("svn: ") and
687 output.endswith("is not under version control")):
688 return ""
689 else:
690 return output
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000691
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000692 @staticmethod
maruel@chromium.org1c7db8e2010-01-07 02:00:19 +0000693 def DiffItem(filename, full_move=False, revision=None):
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000694 """Diffs a single file.
695
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000696 Should be simple, eh? No it isn't.
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000697 Be sure to be in the appropriate directory before calling to have the
maruel@chromium.orga9371762009-12-22 18:27:38 +0000698 expected relative path.
699 full_move means that move or copy operations should completely recreate the
700 files, usually in the prospect to apply the patch for a try job."""
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000701 # If the user specified a custom diff command in their svn config file,
702 # then it'll be used when we do svn diff, which we don't want to happen
703 # since we want the unified diff. Using --diff-cmd=diff doesn't always
704 # work, since they can have another diff executable in their path that
705 # gives different line endings. So we use a bogus temp directory as the
706 # config directory, which gets around these problems.
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000707 bogus_dir = tempfile.mkdtemp()
708 try:
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000709 # Use "svn info" output instead of os.path.isdir because the latter fails
710 # when the file is deleted.
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000711 return SVN._DiffItemInternal(filename, SVN.CaptureInfo(filename),
712 bogus_dir,
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000713 full_move=full_move, revision=revision)
714 finally:
715 shutil.rmtree(bogus_dir)
716
717 @staticmethod
718 def _DiffItemInternal(filename, info, bogus_dir, full_move=False,
719 revision=None):
720 """Grabs the diff data."""
721 command = ["diff", "--config-dir", bogus_dir, filename]
722 if revision:
723 command.extend(['--revision', revision])
724 data = None
725 if SVN.IsMovedInfo(info):
726 if full_move:
727 if info.get("Node Kind") == "directory":
728 # Things become tricky here. It's a directory copy/move. We need to
729 # diff all the files inside it.
730 # This will put a lot of pressure on the heap. This is why StringIO
731 # is used and converted back into a string at the end. The reason to
732 # return a string instead of a StringIO is that StringIO.write()
733 # doesn't accept a StringIO object. *sigh*.
734 for (dirpath, dirnames, filenames) in os.walk(filename):
735 # Cleanup all files starting with a '.'.
736 for d in dirnames:
737 if d.startswith('.'):
738 dirnames.remove(d)
739 for f in filenames:
740 if f.startswith('.'):
741 filenames.remove(f)
742 for f in filenames:
743 if data is None:
744 data = cStringIO.StringIO()
745 data.write(GenFakeDiff(os.path.join(dirpath, f)))
746 if data:
747 tmp = data.getvalue()
748 data.close()
749 data = tmp
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000750 else:
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000751 data = GenFakeDiff(filename)
752 else:
753 if info.get("Node Kind") != "directory":
maruel@chromium.org0836c562010-01-22 01:10:06 +0000754 # svn diff on a mv/cp'd file outputs nothing if there was no change.
755 data = SVN.Capture(command, None)
756 if not data:
757 # We put in an empty Index entry so upload.py knows about them.
maruel@chromium.orgc6d170e2010-06-03 00:06:00 +0000758 data = "Index: %s\n" % filename.replace(os.sep, '/')
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000759 # Otherwise silently ignore directories.
760 else:
761 if info.get("Node Kind") != "directory":
762 # Normal simple case.
maruel@chromium.org0836c562010-01-22 01:10:06 +0000763 data = SVN.Capture(command, None)
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000764 # Otherwise silently ignore directories.
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000765 return data
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000766
767 @staticmethod
maruel@chromium.org1c7db8e2010-01-07 02:00:19 +0000768 def GenerateDiff(filenames, root=None, full_move=False, revision=None):
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000769 """Returns a string containing the diff for the given file list.
770
771 The files in the list should either be absolute paths or relative to the
772 given root. If no root directory is provided, the repository root will be
773 used.
774 The diff will always use relative paths.
775 """
776 previous_cwd = os.getcwd()
maruel@chromium.orgfd9cbbb2010-01-08 23:04:03 +0000777 root = root or SVN.GetCheckoutRoot(previous_cwd)
778 root = os.path.normcase(os.path.join(root, ''))
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000779 def RelativePath(path, root):
780 """We must use relative paths."""
maruel@chromium.orgfd9cbbb2010-01-08 23:04:03 +0000781 if os.path.normcase(path).startswith(root):
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000782 return path[len(root):]
783 return path
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000784 # If the user specified a custom diff command in their svn config file,
785 # then it'll be used when we do svn diff, which we don't want to happen
786 # since we want the unified diff. Using --diff-cmd=diff doesn't always
787 # work, since they can have another diff executable in their path that
788 # gives different line endings. So we use a bogus temp directory as the
789 # config directory, which gets around these problems.
790 bogus_dir = tempfile.mkdtemp()
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000791 try:
792 os.chdir(root)
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000793 # Cleanup filenames
794 filenames = [RelativePath(f, root) for f in filenames]
795 # Get information about the modified items (files and directories)
796 data = dict([(f, SVN.CaptureInfo(f)) for f in filenames])
gavinp@google.com3fda4cc2010-06-29 13:29:27 +0000797 diffs = []
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000798 if full_move:
799 # Eliminate modified files inside moved/copied directory.
800 for (filename, info) in data.iteritems():
801 if SVN.IsMovedInfo(info) and info.get("Node Kind") == "directory":
802 # Remove files inside the directory.
803 filenames = [f for f in filenames
804 if not f.startswith(filename + os.path.sep)]
805 for filename in data.keys():
806 if not filename in filenames:
807 # Remove filtered out items.
808 del data[filename]
gavinp@google.com3fda4cc2010-06-29 13:29:27 +0000809 else:
810 metaheaders = []
811 for (filename, info) in data.iteritems():
812 if SVN.IsMovedInfo(info):
813 # for now, the most common case is a head copy,
814 # so let's just encode that as a straight up cp.
815 srcurl = info.get('Copied From URL')
816 root = info.get('Repository Root')
817 rev = int(info.get('Copied From Rev'))
818 assert srcurl.startswith(root)
819 src = srcurl[len(root)+1:]
820 srcinfo = SVN.CaptureInfo(srcurl)
821 if (srcinfo.get('Revision') != rev and
822 SVN.Capture(['diff', '-r', '%d:head' % rev, srcurl])):
823 metaheaders.append("#$ svn cp -r %d %s %s "
824 "### WARNING: note non-trunk copy\n" %
825 (rev, src, filename))
826 else:
827 metaheaders.append("#$ cp %s %s\n" % (src,
828 filename))
829
830 if metaheaders:
831 diffs.append("### BEGIN SVN COPY METADATA\n")
832 diffs.extend(metaheaders)
833 diffs.append("### END SVN COPY METADATA\n")
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000834 # Now ready to do the actual diff.
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000835 for filename in sorted(data.iterkeys()):
836 diffs.append(SVN._DiffItemInternal(filename, data[filename], bogus_dir,
837 full_move=full_move,
838 revision=revision))
839 # Use StringIO since it can be messy when diffing a directory move with
840 # full_move=True.
841 buf = cStringIO.StringIO()
842 for d in filter(None, diffs):
843 buf.write(d)
844 result = buf.getvalue()
845 buf.close()
846 return result
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000847 finally:
848 os.chdir(previous_cwd)
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000849 shutil.rmtree(bogus_dir)
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000850
851 @staticmethod
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000852 def GetEmail(repo_root):
853 """Retrieves the svn account which we assume is an email address."""
854 infos = SVN.CaptureInfo(repo_root)
855 uuid = infos.get('UUID')
856 root = infos.get('Repository Root')
857 if not root:
858 return None
859
860 # Should check for uuid but it is incorrectly saved for https creds.
861 realm = root.rsplit('/', 1)[0]
862 if root.startswith('https') or not uuid:
863 regexp = re.compile(r'<%s:\d+>.*' % realm)
864 else:
865 regexp = re.compile(r'<%s:\d+> %s' % (realm, uuid))
866 if regexp is None:
867 return None
868 if sys.platform.startswith('win'):
869 if not 'APPDATA' in os.environ:
870 return None
maruel@chromium.org720d9f32009-11-21 17:38:57 +0000871 auth_dir = os.path.join(os.environ['APPDATA'], 'Subversion', 'auth',
872 'svn.simple')
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000873 else:
874 if not 'HOME' in os.environ:
875 return None
876 auth_dir = os.path.join(os.environ['HOME'], '.subversion', 'auth',
877 'svn.simple')
878 for credfile in os.listdir(auth_dir):
879 cred_info = SVN.ReadSimpleAuth(os.path.join(auth_dir, credfile))
880 if regexp.match(cred_info.get('svn:realmstring')):
881 return cred_info.get('username')
882
883 @staticmethod
884 def ReadSimpleAuth(filename):
885 f = open(filename, 'r')
886 values = {}
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000887 def ReadOneItem(item_type):
888 m = re.match(r'%s (\d+)' % item_type, f.readline())
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000889 if not m:
890 return None
891 data = f.read(int(m.group(1)))
892 if f.read(1) != '\n':
893 return None
894 return data
895
896 while True:
897 key = ReadOneItem('K')
898 if not key:
899 break
900 value = ReadOneItem('V')
901 if not value:
902 break
903 values[key] = value
904 return values
maruel@chromium.org94b1ee92009-12-19 20:27:20 +0000905
906 @staticmethod
907 def GetCheckoutRoot(directory):
908 """Returns the top level directory of the current repository.
909
910 The directory is returned as an absolute path.
911 """
maruel@chromium.orgf7ae6d52009-12-22 20:49:04 +0000912 directory = os.path.abspath(directory)
maruel@chromium.org94b1ee92009-12-19 20:27:20 +0000913 infos = SVN.CaptureInfo(directory, print_error=False)
914 cur_dir_repo_root = infos.get("Repository Root")
915 if not cur_dir_repo_root:
916 return None
917
918 while True:
919 parent = os.path.dirname(directory)
920 if (SVN.CaptureInfo(parent, print_error=False).get(
921 "Repository Root") != cur_dir_repo_root):
922 break
923 directory = parent
maruel@chromium.orgfd9cbbb2010-01-08 23:04:03 +0000924 return GetCasedPath(directory)
tony@chromium.org57564662010-04-14 02:35:12 +0000925
926 @staticmethod
927 def AssertVersion(min_version):
928 """Asserts svn's version is at least min_version."""
929 def only_int(val):
930 if val.isdigit():
931 return int(val)
932 else:
933 return 0
934 if not SVN.current_version:
935 SVN.current_version = SVN.Capture(['--version']).split()[2]
936 current_version_list = map(only_int, SVN.current_version.split('.'))
937 for min_ver in map(int, min_version.split('.')):
938 ver = current_version_list.pop(0)
939 if ver < min_ver:
940 return (False, SVN.current_version)
941 elif ver > min_ver:
942 return (True, SVN.current_version)
943 return (True, SVN.current_version)