blob: 58f11b3de1b713e88cf833022c451ca5c4cec1c2 [file] [log] [blame]
[email protected]bec588d2010-10-26 13:50:251# Copyright (c) 2010 The Chromium Authors. All rights reserved.
[email protected]d5800f12009-11-12 20:03:432# Use of this source code is governed by a BSD-style license that can be
3# found in the LICENSE file.
4
[email protected]5aeb7dd2009-11-17 18:09:015"""SCM-specific utility classes."""
[email protected]d5800f12009-11-12 20:03:436
[email protected]3c55d982010-05-06 14:25:447import cStringIO
[email protected]fd9cbbb2010-01-08 23:04:038import glob
[email protected]07ab60e2011-02-08 21:54:009import logging
[email protected]d5800f12009-11-12 20:03:4310import os
11import re
[email protected]f2f9d552009-12-22 00:12:5712import shutil
[email protected]d5800f12009-11-12 20:03:4313import subprocess
14import sys
[email protected]5aeb7dd2009-11-17 18:09:0115import tempfile
[email protected]fd876172010-04-30 14:01:0516import time
[email protected]d5800f12009-11-12 20:03:4317import xml.dom.minidom
18
19import gclient_utils
20
[email protected]b24a8e12009-12-22 13:45:4821def ValidateEmail(email):
[email protected]6e29d572010-06-04 17:32:2022 return (re.match(r"^[a-zA-Z0-9._%-+]+@[a-zA-Z0-9._%-]+.[a-zA-Z]{2,6}$", email)
23 is not None)
[email protected]b24a8e12009-12-22 13:45:4824
[email protected]d5800f12009-11-12 20:03:4325
[email protected]fd9cbbb2010-01-08 23:04:0326def GetCasedPath(path):
27 """Elcheapos way to get the real path case on Windows."""
28 if sys.platform.startswith('win') and os.path.exists(path):
29 # Reconstruct the path.
30 path = os.path.abspath(path)
31 paths = path.split('\\')
32 for i in range(len(paths)):
33 if i == 0:
34 # Skip drive letter.
35 continue
36 subpath = '\\'.join(paths[:i+1])
37 prev = len('\\'.join(paths[:i]))
38 # glob.glob will return the cased path for the last item only. This is why
39 # we are calling it in a loop. Extract the data we want and put it back
40 # into the list.
41 paths[i] = glob.glob(subpath + '*')[0][prev+1:len(subpath)]
42 path = '\\'.join(paths)
43 return path
44
45
[email protected]3c55d982010-05-06 14:25:4446def GenFakeDiff(filename):
47 """Generates a fake diff from a file."""
48 file_content = gclient_utils.FileRead(filename, 'rb').splitlines(True)
[email protected]c6d170e2010-06-03 00:06:0049 filename = filename.replace(os.sep, '/')
[email protected]3c55d982010-05-06 14:25:4450 nb_lines = len(file_content)
51 # We need to use / since patch on unix will fail otherwise.
52 data = cStringIO.StringIO()
53 data.write("Index: %s\n" % filename)
54 data.write('=' * 67 + '\n')
55 # Note: Should we use /dev/null instead?
56 data.write("--- %s\n" % filename)
57 data.write("+++ %s\n" % filename)
58 data.write("@@ -0,0 +1,%d @@\n" % nb_lines)
59 # Prepend '+' to every lines.
60 for line in file_content:
61 data.write('+')
62 data.write(line)
63 result = data.getvalue()
64 data.close()
65 return result
66
67
[email protected]5aeb7dd2009-11-17 18:09:0168class GIT(object):
[email protected]5aeb7dd2009-11-17 18:09:0169 @staticmethod
[email protected]ad80e3b2010-09-09 14:18:2870 def Capture(args, **kwargs):
71 return gclient_utils.CheckCall(['git'] + args, print_error=False,
72 **kwargs)[0]
[email protected]d5800f12009-11-12 20:03:4373
[email protected]5aeb7dd2009-11-17 18:09:0174 @staticmethod
[email protected]786fb682010-06-02 15:16:2375 def CaptureStatus(files, upstream_branch=None):
[email protected]5aeb7dd2009-11-17 18:09:0176 """Returns git status.
[email protected]d5800f12009-11-12 20:03:4377
[email protected]5aeb7dd2009-11-17 18:09:0178 @files can be a string (one file) or a list of files.
[email protected]d5800f12009-11-12 20:03:4379
[email protected]5aeb7dd2009-11-17 18:09:0180 Returns an array of (status, file) tuples."""
[email protected]786fb682010-06-02 15:16:2381 if upstream_branch is None:
82 upstream_branch = GIT.GetUpstreamBranch(os.getcwd())
83 if upstream_branch is None:
[email protected]ad80e3b2010-09-09 14:18:2884 raise gclient_utils.Error('Cannot determine upstream branch')
85 command = ['diff', '--name-status', '-r', '%s...' % upstream_branch]
[email protected]5aeb7dd2009-11-17 18:09:0186 if not files:
87 pass
88 elif isinstance(files, basestring):
89 command.append(files)
90 else:
91 command.extend(files)
[email protected]ad80e3b2010-09-09 14:18:2892 status = GIT.Capture(command).rstrip()
[email protected]5aeb7dd2009-11-17 18:09:0193 results = []
94 if status:
[email protected]ad80e3b2010-09-09 14:18:2895 for statusline in status.splitlines():
[email protected]cc1614b2010-09-20 17:13:1796 # 3-way merges can cause the status can be 'MMM' instead of 'M'. This
97 # can happen when the user has 2 local branches and he diffs between
98 # these 2 branches instead diffing to upstream.
99 m = re.match('^(\w)+\t(.+)$', statusline)
[email protected]5aeb7dd2009-11-17 18:09:01100 if not m:
[email protected]ad80e3b2010-09-09 14:18:28101 raise gclient_utils.Error(
102 'status currently unsupported: %s' % statusline)
[email protected]cc1614b2010-09-20 17:13:17103 # Only grab the first letter.
104 results.append(('%s ' % m.group(1)[0], m.group(2)))
[email protected]5aeb7dd2009-11-17 18:09:01105 return results
[email protected]d5800f12009-11-12 20:03:43106
[email protected]c78f2462009-11-21 01:20:57107 @staticmethod
[email protected]ad80e3b2010-09-09 14:18:28108 def GetEmail(cwd):
[email protected]c78f2462009-11-21 01:20:57109 """Retrieves the user email address if known."""
110 # We could want to look at the svn cred when it has a svn remote but it
111 # should be fine for now, users should simply configure their git settings.
[email protected]ad80e3b2010-09-09 14:18:28112 try:
113 return GIT.Capture(['config', 'user.email'], cwd=cwd).strip()
114 except gclient_utils.CheckCallError:
115 return ''
[email protected]f2f9d552009-12-22 00:12:57116
117 @staticmethod
118 def ShortBranchName(branch):
119 """Converts a name like 'refs/heads/foo' to just 'foo'."""
120 return branch.replace('refs/heads/', '')
121
122 @staticmethod
123 def GetBranchRef(cwd):
[email protected]b24a8e12009-12-22 13:45:48124 """Returns the full branch reference, e.g. 'refs/heads/master'."""
[email protected]ad80e3b2010-09-09 14:18:28125 return GIT.Capture(['symbolic-ref', 'HEAD'], cwd=cwd).strip()
[email protected]f2f9d552009-12-22 00:12:57126
127 @staticmethod
[email protected]b24a8e12009-12-22 13:45:48128 def GetBranch(cwd):
129 """Returns the short branch name, e.g. 'master'."""
[email protected]c308a742009-12-22 18:29:33130 return GIT.ShortBranchName(GIT.GetBranchRef(cwd))
[email protected]b24a8e12009-12-22 13:45:48131
132 @staticmethod
[email protected]f2f9d552009-12-22 00:12:57133 def IsGitSvn(cwd):
134 """Returns true if this repo looks like it's using git-svn."""
135 # If you have any "svn-remote.*" config keys, we think you're using svn.
136 try:
[email protected]ad80e3b2010-09-09 14:18:28137 GIT.Capture(['config', '--get-regexp', r'^svn-remote\.'], cwd=cwd)
[email protected]f2f9d552009-12-22 00:12:57138 return True
139 except gclient_utils.CheckCallError:
140 return False
141
142 @staticmethod
143 def GetSVNBranch(cwd):
144 """Returns the svn branch name if found."""
145 # Try to figure out which remote branch we're based on.
146 # Strategy:
[email protected]ade368c2011-03-01 08:57:50147 # 1) iterate through our branch history and find the svn URL.
148 # 2) find the svn-remote that fetches from the URL.
[email protected]f2f9d552009-12-22 00:12:57149
150 # regexp matching the git-svn line that contains the URL.
151 git_svn_re = re.compile(r'^\s*git-svn-id: (\S+)@', re.MULTILINE)
152
[email protected]ade368c2011-03-01 08:57:50153 # We don't want to go through all of history, so read a line from the
154 # pipe at a time.
155 # The -100 is an arbitrary limit so we don't search forever.
156 cmd = ['git', 'log', '-100', '--pretty=medium']
157 proc = gclient_utils.Popen(cmd, stdout=subprocess.PIPE)
158 for line in proc.stdout:
159 match = git_svn_re.match(line)
160 if match:
161 url = match.group(1)
162 proc.stdout.close() # Cut pipe.
163 break
[email protected]f2f9d552009-12-22 00:12:57164
[email protected]ade368c2011-03-01 08:57:50165 if url:
166 svn_remote_re = re.compile(r'^svn-remote\.([^.]+)\.url (.*)$')
167 remotes = GIT.Capture(['config', '--get-regexp',
168 r'^svn-remote\..*\.url'], cwd=cwd).splitlines()
169 for remote in remotes:
170 match = svn_remote_re.match(remote)
[email protected]f2f9d552009-12-22 00:12:57171 if match:
[email protected]ade368c2011-03-01 08:57:50172 remote = match.group(1)
173 base_url = match.group(2)
174 fetch_spec = GIT.Capture(
175 ['config', 'svn-remote.%s.fetch' % remote],
176 cwd=cwd).strip().split(':')
177 if fetch_spec[0]:
178 full_url = base_url + '/' + fetch_spec[0]
179 else:
180 full_url = base_url
181 if full_url == url:
182 return fetch_spec[1]
[email protected]f2f9d552009-12-22 00:12:57183
184 @staticmethod
185 def FetchUpstreamTuple(cwd):
186 """Returns a tuple containg remote and remote ref,
187 e.g. 'origin', 'refs/heads/master'
[email protected]81e012c2010-04-29 16:07:24188 Tries to be intelligent and understand git-svn.
[email protected]f2f9d552009-12-22 00:12:57189 """
190 remote = '.'
[email protected]b24a8e12009-12-22 13:45:48191 branch = GIT.GetBranch(cwd)
[email protected]ad80e3b2010-09-09 14:18:28192 try:
193 upstream_branch = GIT.Capture(
194 ['config', 'branch.%s.merge' % branch], cwd=cwd).strip()
195 except gclient_utils.Error:
196 upstream_branch = None
[email protected]f2f9d552009-12-22 00:12:57197 if upstream_branch:
[email protected]ad80e3b2010-09-09 14:18:28198 try:
199 remote = GIT.Capture(
200 ['config', 'branch.%s.remote' % branch], cwd=cwd).strip()
201 except gclient_utils.Error:
202 pass
[email protected]f2f9d552009-12-22 00:12:57203 else:
[email protected]ade368c2011-03-01 08:57:50204 try:
205 upstream_branch = GIT.Capture(
206 ['config', 'rietveld.upstream-branch'], cwd=cwd).strip()
207 except gclient_utils.Error:
208 upstream_branch = None
209 if upstream_branch:
210 try:
211 remote = GIT.Capture(
212 ['config', 'rietveld.upstream-remote'], cwd=cwd).strip()
213 except gclient_utils.Error:
214 pass
[email protected]81e012c2010-04-29 16:07:24215 else:
[email protected]ade368c2011-03-01 08:57:50216 # Fall back on trying a git-svn upstream branch.
217 if GIT.IsGitSvn(cwd):
218 upstream_branch = GIT.GetSVNBranch(cwd)
[email protected]a630bd72010-04-29 23:32:34219 else:
[email protected]ade368c2011-03-01 08:57:50220 # Else, try to guess the origin remote.
221 remote_branches = GIT.Capture(['branch', '-r'], cwd=cwd).split()
222 if 'origin/master' in remote_branches:
223 # Fall back on origin/master if it exits.
224 remote = 'origin'
225 upstream_branch = 'refs/heads/master'
226 elif 'origin/trunk' in remote_branches:
227 # Fall back on origin/trunk if it exists. Generally a shared
228 # git-svn clone
229 remote = 'origin'
230 upstream_branch = 'refs/heads/trunk'
231 else:
232 # Give up.
233 remote = None
234 upstream_branch = None
[email protected]f2f9d552009-12-22 00:12:57235 return remote, upstream_branch
236
237 @staticmethod
[email protected]81e012c2010-04-29 16:07:24238 def GetUpstreamBranch(cwd):
[email protected]f2f9d552009-12-22 00:12:57239 """Gets the current branch's upstream branch."""
240 remote, upstream_branch = GIT.FetchUpstreamTuple(cwd)
[email protected]a630bd72010-04-29 23:32:34241 if remote != '.' and upstream_branch:
[email protected]f2f9d552009-12-22 00:12:57242 upstream_branch = upstream_branch.replace('heads', 'remotes/' + remote)
243 return upstream_branch
244
245 @staticmethod
[email protected]8ede00e2010-01-12 14:35:28246 def GenerateDiff(cwd, branch=None, branch_head='HEAD', full_move=False,
247 files=None):
[email protected]a9371762009-12-22 18:27:38248 """Diffs against the upstream branch or optionally another branch.
249
250 full_move means that move or copy operations should completely recreate the
251 files, usually in the prospect to apply the patch for a try job."""
[email protected]f2f9d552009-12-22 00:12:57252 if not branch:
[email protected]81e012c2010-04-29 16:07:24253 branch = GIT.GetUpstreamBranch(cwd)
[email protected]400f3e72010-05-19 14:23:36254 command = ['diff', '-p', '--no-prefix', '--no-ext-diff',
255 branch + "..." + branch_head]
[email protected]a9371762009-12-22 18:27:38256 if not full_move:
257 command.append('-C')
[email protected]8ede00e2010-01-12 14:35:28258 # TODO(maruel): --binary support.
259 if files:
260 command.append('--')
261 command.extend(files)
[email protected]ad80e3b2010-09-09 14:18:28262 diff = GIT.Capture(command, cwd=cwd).splitlines(True)
[email protected]f2f9d552009-12-22 00:12:57263 for i in range(len(diff)):
264 # In the case of added files, replace /dev/null with the path to the
265 # file being added.
266 if diff[i].startswith('--- /dev/null'):
267 diff[i] = '--- %s' % diff[i+1][4:]
268 return ''.join(diff)
[email protected]c78f2462009-11-21 01:20:57269
[email protected]b24a8e12009-12-22 13:45:48270 @staticmethod
[email protected]8ede00e2010-01-12 14:35:28271 def GetDifferentFiles(cwd, branch=None, branch_head='HEAD'):
272 """Returns the list of modified files between two branches."""
273 if not branch:
[email protected]81e012c2010-04-29 16:07:24274 branch = GIT.GetUpstreamBranch(cwd)
[email protected]838f0f22010-04-09 17:02:50275 command = ['diff', '--name-only', branch + "..." + branch_head]
[email protected]ad80e3b2010-09-09 14:18:28276 return GIT.Capture(command, cwd=cwd).splitlines(False)
[email protected]8ede00e2010-01-12 14:35:28277
278 @staticmethod
[email protected]b24a8e12009-12-22 13:45:48279 def GetPatchName(cwd):
280 """Constructs a name for this patch."""
[email protected]ad80e3b2010-09-09 14:18:28281 short_sha = GIT.Capture(['rev-parse', '--short=4', 'HEAD'], cwd=cwd).strip()
[email protected]862ff8e2010-08-06 15:29:16282 return "%s#%s" % (GIT.GetBranch(cwd), short_sha)
[email protected]b24a8e12009-12-22 13:45:48283
284 @staticmethod
[email protected]ad80e3b2010-09-09 14:18:28285 def GetCheckoutRoot(cwd):
[email protected]01d8c1d2010-01-07 01:56:59286 """Returns the top level directory of a git checkout as an absolute path.
[email protected]b24a8e12009-12-22 13:45:48287 """
[email protected]ad80e3b2010-09-09 14:18:28288 root = GIT.Capture(['rev-parse', '--show-cdup'], cwd=cwd).strip()
289 return os.path.abspath(os.path.join(cwd, root))
[email protected]b24a8e12009-12-22 13:45:48290
[email protected]d0f854a2010-03-11 19:35:53291 @staticmethod
292 def AssertVersion(min_version):
293 """Asserts git's version is at least min_version."""
294 def only_int(val):
295 if val.isdigit():
296 return int(val)
297 else:
298 return 0
[email protected]ad80e3b2010-09-09 14:18:28299 current_version = GIT.Capture(['--version']).split()[-1]
[email protected]d0f854a2010-03-11 19:35:53300 current_version_list = map(only_int, current_version.split('.'))
301 for min_ver in map(int, min_version.split('.')):
302 ver = current_version_list.pop(0)
303 if ver < min_ver:
304 return (False, current_version)
305 elif ver > min_ver:
306 return (True, current_version)
307 return (True, current_version)
308
[email protected]d5800f12009-11-12 20:03:43309
[email protected]5aeb7dd2009-11-17 18:09:01310class SVN(object):
[email protected]57564662010-04-14 02:35:12311 current_version = None
[email protected]d5800f12009-11-12 20:03:43312
[email protected]5aeb7dd2009-11-17 18:09:01313 @staticmethod
[email protected]54019f32010-09-09 13:50:11314 def Capture(args, **kwargs):
315 """Always redirect stderr.
[email protected]d5800f12009-11-12 20:03:43316
[email protected]54019f32010-09-09 13:50:11317 Throws an exception if non-0 is returned."""
318 return gclient_utils.CheckCall(['svn'] + args, print_error=False,
319 **kwargs)[0]
[email protected]d5800f12009-11-12 20:03:43320
[email protected]5aeb7dd2009-11-17 18:09:01321 @staticmethod
[email protected]2b9aa8e2010-08-25 20:01:42322 def RunAndGetFileList(verbose, args, cwd, file_list, stdout=None):
[email protected]5aeb7dd2009-11-17 18:09:01323 """Runs svn checkout, update, or status, output to stdout.
[email protected]d5800f12009-11-12 20:03:43324
[email protected]5aeb7dd2009-11-17 18:09:01325 The first item in args must be either "checkout", "update", or "status".
[email protected]d5800f12009-11-12 20:03:43326
[email protected]5aeb7dd2009-11-17 18:09:01327 svn's stdout is parsed to collect a list of files checked out or updated.
328 These files are appended to file_list. svn's stdout is also printed to
329 sys.stdout as in Run.
[email protected]d5800f12009-11-12 20:03:43330
[email protected]5aeb7dd2009-11-17 18:09:01331 Args:
[email protected]03807072010-08-16 17:18:44332 verbose: If True, uses verbose output
[email protected]5aeb7dd2009-11-17 18:09:01333 args: A sequence of command line parameters to be passed to svn.
[email protected]2b9aa8e2010-08-25 20:01:42334 cwd: The directory where svn is to be run.
[email protected]d5800f12009-11-12 20:03:43335
[email protected]5aeb7dd2009-11-17 18:09:01336 Raises:
337 Error: An error occurred while running the svn command.
338 """
[email protected]2b9aa8e2010-08-25 20:01:42339 stdout = stdout or sys.stdout
[email protected]d5800f12009-11-12 20:03:43340
[email protected]5aeb7dd2009-11-17 18:09:01341 # svn update and svn checkout use the same pattern: the first three columns
342 # are for file status, property status, and lock status. This is followed
343 # by two spaces, and then the path to the file.
344 update_pattern = '^... (.*)$'
[email protected]d5800f12009-11-12 20:03:43345
[email protected]5aeb7dd2009-11-17 18:09:01346 # The first three columns of svn status are the same as for svn update and
347 # svn checkout. The next three columns indicate addition-with-history,
348 # switch, and remote lock status. This is followed by one space, and then
349 # the path to the file.
350 status_pattern = '^...... (.*)$'
[email protected]d5800f12009-11-12 20:03:43351
[email protected]5aeb7dd2009-11-17 18:09:01352 # args[0] must be a supported command. This will blow up if it's something
353 # else, which is good. Note that the patterns are only effective when
354 # these commands are used in their ordinary forms, the patterns are invalid
355 # for "svn status --show-updates", for example.
356 pattern = {
357 'checkout': update_pattern,
358 'status': status_pattern,
359 'update': update_pattern,
360 }[args[0]]
[email protected]5aeb7dd2009-11-17 18:09:01361 compiled_pattern = re.compile(pattern)
[email protected]b71b67e2009-11-24 20:48:19362 # Place an upper limit.
[email protected]2aee22982010-09-03 14:15:25363 backoff_time = 5
[email protected]bec588d2010-10-26 13:50:25364 retries = 0
[email protected]03507062010-10-26 00:58:27365 while True:
[email protected]bec588d2010-10-26 13:50:25366 retries += 1
[email protected]b71b67e2009-11-24 20:48:19367 previous_list_len = len(file_list)
368 failure = []
[email protected]54d1f1a2010-01-08 19:53:47369
[email protected]b71b67e2009-11-24 20:48:19370 def CaptureMatchingLines(line):
371 match = compiled_pattern.search(line)
372 if match:
373 file_list.append(match.group(1))
374 if line.startswith('svn: '):
[email protected]8599aa72010-02-08 20:27:14375 failure.append(line)
[email protected]54d1f1a2010-01-08 19:53:47376
[email protected]b71b67e2009-11-24 20:48:19377 try:
[email protected]17d01792010-09-01 18:07:10378 gclient_utils.CheckCallAndFilterAndHeader(
379 ['svn'] + args,
380 cwd=cwd,
381 always=verbose,
382 filter_fn=CaptureMatchingLines,
383 stdout=stdout)
[email protected]b71b67e2009-11-24 20:48:19384 except gclient_utils.Error:
[email protected]6133c5b2010-08-18 18:34:48385 def IsKnownFailure():
386 for x in failure:
387 if (x.startswith('svn: OPTIONS of') or
388 x.startswith('svn: PROPFIND of') or
389 x.startswith('svn: REPORT of') or
[email protected]f61fc932010-08-19 13:05:24390 x.startswith('svn: Unknown hostname') or
391 x.startswith('svn: Server sent unexpected return value')):
[email protected]6133c5b2010-08-18 18:34:48392 return True
393 return False
394
[email protected]953586a2010-06-15 14:22:24395 # Subversion client is really misbehaving with Google Code.
396 if args[0] == 'checkout':
397 # Ensure at least one file was checked out, otherwise *delete* the
398 # directory.
399 if len(file_list) == previous_list_len:
[email protected]6133c5b2010-08-18 18:34:48400 if not IsKnownFailure():
[email protected]953586a2010-06-15 14:22:24401 # No known svn error was found, bail out.
402 raise
[email protected]6133c5b2010-08-18 18:34:48403 # No file were checked out, so make sure the directory is
404 # deleted in case it's messed up and try again.
405 # Warning: It's bad, it assumes args[2] is the directory
406 # argument.
407 if os.path.isdir(args[2]):
408 gclient_utils.RemoveDirectory(args[2])
[email protected]953586a2010-06-15 14:22:24409 else:
410 # Progress was made, convert to update since an aborted checkout
411 # is now an update.
[email protected]2de10252010-02-08 01:10:39412 args = ['update'] + args[1:]
[email protected]953586a2010-06-15 14:22:24413 else:
414 # It was an update or export.
[email protected]6133c5b2010-08-18 18:34:48415 # We enforce that some progress has been made or a known failure.
416 if len(file_list) == previous_list_len and not IsKnownFailure():
417 # No known svn error was found and no progress, bail out.
418 raise
[email protected]bec588d2010-10-26 13:50:25419 if retries == 10:
[email protected]03507062010-10-26 00:58:27420 raise
[email protected]2aee22982010-09-03 14:15:25421 print "Sleeping %.1f seconds and retrying...." % backoff_time
422 time.sleep(backoff_time)
423 backoff_time *= 1.3
[email protected]953586a2010-06-15 14:22:24424 continue
[email protected]b71b67e2009-11-24 20:48:19425 break
[email protected]d5800f12009-11-12 20:03:43426
[email protected]5aeb7dd2009-11-17 18:09:01427 @staticmethod
[email protected]54019f32010-09-09 13:50:11428 def CaptureInfo(cwd):
[email protected]5aeb7dd2009-11-17 18:09:01429 """Returns a dictionary from the svn info output for the given file.
[email protected]d5800f12009-11-12 20:03:43430
[email protected]54019f32010-09-09 13:50:11431 Throws an exception if svn info fails."""
432 output = SVN.Capture(['info', '--xml', cwd])
[email protected]5aeb7dd2009-11-17 18:09:01433 dom = gclient_utils.ParseXML(output)
434 result = {}
435 if dom:
436 GetNamedNodeText = gclient_utils.GetNamedNodeText
437 GetNodeNamedAttributeText = gclient_utils.GetNodeNamedAttributeText
438 def C(item, f):
[email protected]6e29d572010-06-04 17:32:20439 if item is not None:
440 return f(item)
[email protected]5aeb7dd2009-11-17 18:09:01441 # /info/entry/
442 # url
443 # reposityory/(root|uuid)
444 # wc-info/(schedule|depth)
445 # commit/(author|date)
446 # str() the results because they may be returned as Unicode, which
447 # interferes with the higher layers matching up things in the deps
448 # dictionary.
[email protected]5aeb7dd2009-11-17 18:09:01449 result['Repository Root'] = C(GetNamedNodeText(dom, 'root'), str)
450 result['URL'] = C(GetNamedNodeText(dom, 'url'), str)
451 result['UUID'] = C(GetNamedNodeText(dom, 'uuid'), str)
452 result['Revision'] = C(GetNodeNamedAttributeText(dom, 'entry',
453 'revision'),
454 int)
455 result['Node Kind'] = C(GetNodeNamedAttributeText(dom, 'entry', 'kind'),
456 str)
457 # Differs across versions.
458 if result['Node Kind'] == 'dir':
459 result['Node Kind'] = 'directory'
460 result['Schedule'] = C(GetNamedNodeText(dom, 'schedule'), str)
461 result['Path'] = C(GetNodeNamedAttributeText(dom, 'entry', 'path'), str)
462 result['Copied From URL'] = C(GetNamedNodeText(dom, 'copy-from-url'), str)
463 result['Copied From Rev'] = C(GetNamedNodeText(dom, 'copy-from-rev'), str)
464 return result
[email protected]d5800f12009-11-12 20:03:43465
[email protected]5aeb7dd2009-11-17 18:09:01466 @staticmethod
[email protected]54019f32010-09-09 13:50:11467 def CaptureRevision(cwd):
[email protected]5d63eb82010-03-24 23:22:09468 """Get the base revision of a SVN repository.
469
470 Returns:
471 Int base revision
472 """
[email protected]54019f32010-09-09 13:50:11473 info = SVN.Capture(['info', '--xml'], cwd=cwd)
[email protected]5d63eb82010-03-24 23:22:09474 dom = xml.dom.minidom.parseString(info)
475 return dom.getElementsByTagName('entry')[0].getAttribute('revision')
476
477 @staticmethod
[email protected]5aeb7dd2009-11-17 18:09:01478 def CaptureStatus(files):
479 """Returns the svn 1.5 svn status emulated output.
[email protected]d5800f12009-11-12 20:03:43480
[email protected]5aeb7dd2009-11-17 18:09:01481 @files can be a string (one file) or a list of files.
[email protected]d5800f12009-11-12 20:03:43482
[email protected]5aeb7dd2009-11-17 18:09:01483 Returns an array of (status, file) tuples."""
484 command = ["status", "--xml"]
485 if not files:
486 pass
487 elif isinstance(files, basestring):
488 command.append(files)
489 else:
490 command.extend(files)
[email protected]d5800f12009-11-12 20:03:43491
[email protected]5aeb7dd2009-11-17 18:09:01492 status_letter = {
493 None: ' ',
494 '': ' ',
495 'added': 'A',
496 'conflicted': 'C',
497 'deleted': 'D',
498 'external': 'X',
499 'ignored': 'I',
500 'incomplete': '!',
501 'merged': 'G',
502 'missing': '!',
503 'modified': 'M',
504 'none': ' ',
505 'normal': ' ',
506 'obstructed': '~',
507 'replaced': 'R',
508 'unversioned': '?',
509 }
510 dom = gclient_utils.ParseXML(SVN.Capture(command))
511 results = []
512 if dom:
513 # /status/target/entry/(wc-status|commit|author|date)
514 for target in dom.getElementsByTagName('target'):
515 #base_path = target.getAttribute('path')
516 for entry in target.getElementsByTagName('entry'):
517 file_path = entry.getAttribute('path')
518 wc_status = entry.getElementsByTagName('wc-status')
519 assert len(wc_status) == 1
520 # Emulate svn 1.5 status ouput...
521 statuses = [' '] * 7
522 # Col 0
523 xml_item_status = wc_status[0].getAttribute('item')
524 if xml_item_status in status_letter:
525 statuses[0] = status_letter[xml_item_status]
526 else:
[email protected]54019f32010-09-09 13:50:11527 raise gclient_utils.Error(
528 'Unknown item status "%s"; please implement me!' %
529 xml_item_status)
[email protected]5aeb7dd2009-11-17 18:09:01530 # Col 1
531 xml_props_status = wc_status[0].getAttribute('props')
532 if xml_props_status == 'modified':
533 statuses[1] = 'M'
534 elif xml_props_status == 'conflicted':
535 statuses[1] = 'C'
536 elif (not xml_props_status or xml_props_status == 'none' or
537 xml_props_status == 'normal'):
538 pass
539 else:
[email protected]54019f32010-09-09 13:50:11540 raise gclient_utils.Error(
541 'Unknown props status "%s"; please implement me!' %
542 xml_props_status)
[email protected]5aeb7dd2009-11-17 18:09:01543 # Col 2
544 if wc_status[0].getAttribute('wc-locked') == 'true':
545 statuses[2] = 'L'
546 # Col 3
547 if wc_status[0].getAttribute('copied') == 'true':
548 statuses[3] = '+'
549 # Col 4
550 if wc_status[0].getAttribute('switched') == 'true':
551 statuses[4] = 'S'
552 # TODO(maruel): Col 5 and 6
553 item = (''.join(statuses), file_path)
554 results.append(item)
555 return results
[email protected]d5800f12009-11-12 20:03:43556
[email protected]5aeb7dd2009-11-17 18:09:01557 @staticmethod
558 def IsMoved(filename):
559 """Determine if a file has been added through svn mv"""
[email protected]3c55d982010-05-06 14:25:44560 return SVN.IsMovedInfo(SVN.CaptureInfo(filename))
561
562 @staticmethod
563 def IsMovedInfo(info):
564 """Determine if a file has been added through svn mv"""
[email protected]5aeb7dd2009-11-17 18:09:01565 return (info.get('Copied From URL') and
566 info.get('Copied From Rev') and
567 info.get('Schedule') == 'add')
[email protected]d5800f12009-11-12 20:03:43568
[email protected]5aeb7dd2009-11-17 18:09:01569 @staticmethod
[email protected]6e29d572010-06-04 17:32:20570 def GetFileProperty(filename, property_name):
[email protected]5aeb7dd2009-11-17 18:09:01571 """Returns the value of an SVN property for the given file.
[email protected]d5800f12009-11-12 20:03:43572
[email protected]5aeb7dd2009-11-17 18:09:01573 Args:
[email protected]6e29d572010-06-04 17:32:20574 filename: The file to check
[email protected]5aeb7dd2009-11-17 18:09:01575 property_name: The name of the SVN property, e.g. "svn:mime-type"
[email protected]d5800f12009-11-12 20:03:43576
[email protected]5aeb7dd2009-11-17 18:09:01577 Returns:
578 The value of the property, which will be the empty string if the property
579 is not set on the file. If the file is not under version control, the
580 empty string is also returned.
581 """
[email protected]54019f32010-09-09 13:50:11582 try:
583 return SVN.Capture(['propget', property_name, filename])
584 except gclient_utils.Error:
585 return ''
[email protected]d5800f12009-11-12 20:03:43586
[email protected]5aeb7dd2009-11-17 18:09:01587 @staticmethod
[email protected]1c7db8e2010-01-07 02:00:19588 def DiffItem(filename, full_move=False, revision=None):
[email protected]f2f9d552009-12-22 00:12:57589 """Diffs a single file.
590
[email protected]3c55d982010-05-06 14:25:44591 Should be simple, eh? No it isn't.
[email protected]f2f9d552009-12-22 00:12:57592 Be sure to be in the appropriate directory before calling to have the
[email protected]a9371762009-12-22 18:27:38593 expected relative path.
594 full_move means that move or copy operations should completely recreate the
595 files, usually in the prospect to apply the patch for a try job."""
[email protected]5aeb7dd2009-11-17 18:09:01596 # If the user specified a custom diff command in their svn config file,
597 # then it'll be used when we do svn diff, which we don't want to happen
598 # since we want the unified diff. Using --diff-cmd=diff doesn't always
599 # work, since they can have another diff executable in their path that
600 # gives different line endings. So we use a bogus temp directory as the
601 # config directory, which gets around these problems.
[email protected]f2f9d552009-12-22 00:12:57602 bogus_dir = tempfile.mkdtemp()
603 try:
[email protected]3c55d982010-05-06 14:25:44604 # Use "svn info" output instead of os.path.isdir because the latter fails
605 # when the file is deleted.
[email protected]6e29d572010-06-04 17:32:20606 return SVN._DiffItemInternal(filename, SVN.CaptureInfo(filename),
607 bogus_dir,
[email protected]3c55d982010-05-06 14:25:44608 full_move=full_move, revision=revision)
609 finally:
610 shutil.rmtree(bogus_dir)
611
612 @staticmethod
613 def _DiffItemInternal(filename, info, bogus_dir, full_move=False,
614 revision=None):
615 """Grabs the diff data."""
616 command = ["diff", "--config-dir", bogus_dir, filename]
617 if revision:
618 command.extend(['--revision', revision])
619 data = None
620 if SVN.IsMovedInfo(info):
621 if full_move:
622 if info.get("Node Kind") == "directory":
623 # Things become tricky here. It's a directory copy/move. We need to
624 # diff all the files inside it.
625 # This will put a lot of pressure on the heap. This is why StringIO
626 # is used and converted back into a string at the end. The reason to
627 # return a string instead of a StringIO is that StringIO.write()
628 # doesn't accept a StringIO object. *sigh*.
629 for (dirpath, dirnames, filenames) in os.walk(filename):
630 # Cleanup all files starting with a '.'.
631 for d in dirnames:
632 if d.startswith('.'):
633 dirnames.remove(d)
634 for f in filenames:
635 if f.startswith('.'):
636 filenames.remove(f)
637 for f in filenames:
638 if data is None:
639 data = cStringIO.StringIO()
640 data.write(GenFakeDiff(os.path.join(dirpath, f)))
641 if data:
642 tmp = data.getvalue()
643 data.close()
644 data = tmp
[email protected]f2f9d552009-12-22 00:12:57645 else:
[email protected]3c55d982010-05-06 14:25:44646 data = GenFakeDiff(filename)
647 else:
648 if info.get("Node Kind") != "directory":
[email protected]0836c562010-01-22 01:10:06649 # svn diff on a mv/cp'd file outputs nothing if there was no change.
[email protected]54019f32010-09-09 13:50:11650 data = SVN.Capture(command)
[email protected]0836c562010-01-22 01:10:06651 if not data:
652 # We put in an empty Index entry so upload.py knows about them.
[email protected]c6d170e2010-06-03 00:06:00653 data = "Index: %s\n" % filename.replace(os.sep, '/')
[email protected]3c55d982010-05-06 14:25:44654 # Otherwise silently ignore directories.
655 else:
656 if info.get("Node Kind") != "directory":
657 # Normal simple case.
[email protected]54019f32010-09-09 13:50:11658 data = SVN.Capture(command)
[email protected]3c55d982010-05-06 14:25:44659 # Otherwise silently ignore directories.
[email protected]5aeb7dd2009-11-17 18:09:01660 return data
[email protected]c78f2462009-11-21 01:20:57661
662 @staticmethod
[email protected]1c7db8e2010-01-07 02:00:19663 def GenerateDiff(filenames, root=None, full_move=False, revision=None):
[email protected]f2f9d552009-12-22 00:12:57664 """Returns a string containing the diff for the given file list.
665
666 The files in the list should either be absolute paths or relative to the
667 given root. If no root directory is provided, the repository root will be
668 used.
669 The diff will always use relative paths.
670 """
[email protected]00fdcb32011-02-24 01:41:02671 assert isinstance(filenames, (list, tuple))
[email protected]f2f9d552009-12-22 00:12:57672 previous_cwd = os.getcwd()
[email protected]fd9cbbb2010-01-08 23:04:03673 root = root or SVN.GetCheckoutRoot(previous_cwd)
674 root = os.path.normcase(os.path.join(root, ''))
[email protected]f2f9d552009-12-22 00:12:57675 def RelativePath(path, root):
676 """We must use relative paths."""
[email protected]fd9cbbb2010-01-08 23:04:03677 if os.path.normcase(path).startswith(root):
[email protected]f2f9d552009-12-22 00:12:57678 return path[len(root):]
679 return path
[email protected]3c55d982010-05-06 14:25:44680 # If the user specified a custom diff command in their svn config file,
681 # then it'll be used when we do svn diff, which we don't want to happen
682 # since we want the unified diff. Using --diff-cmd=diff doesn't always
683 # work, since they can have another diff executable in their path that
684 # gives different line endings. So we use a bogus temp directory as the
685 # config directory, which gets around these problems.
686 bogus_dir = tempfile.mkdtemp()
[email protected]f2f9d552009-12-22 00:12:57687 try:
688 os.chdir(root)
[email protected]3c55d982010-05-06 14:25:44689 # Cleanup filenames
690 filenames = [RelativePath(f, root) for f in filenames]
691 # Get information about the modified items (files and directories)
692 data = dict([(f, SVN.CaptureInfo(f)) for f in filenames])
[email protected]3fda4cc2010-06-29 13:29:27693 diffs = []
[email protected]3c55d982010-05-06 14:25:44694 if full_move:
695 # Eliminate modified files inside moved/copied directory.
696 for (filename, info) in data.iteritems():
697 if SVN.IsMovedInfo(info) and info.get("Node Kind") == "directory":
698 # Remove files inside the directory.
699 filenames = [f for f in filenames
700 if not f.startswith(filename + os.path.sep)]
701 for filename in data.keys():
702 if not filename in filenames:
703 # Remove filtered out items.
704 del data[filename]
[email protected]3fda4cc2010-06-29 13:29:27705 else:
706 metaheaders = []
707 for (filename, info) in data.iteritems():
708 if SVN.IsMovedInfo(info):
709 # for now, the most common case is a head copy,
710 # so let's just encode that as a straight up cp.
711 srcurl = info.get('Copied From URL')
712 root = info.get('Repository Root')
713 rev = int(info.get('Copied From Rev'))
714 assert srcurl.startswith(root)
715 src = srcurl[len(root)+1:]
[email protected]00fdcb32011-02-24 01:41:02716 try:
717 srcinfo = SVN.CaptureInfo(srcurl)
718 except gclient_utils.CheckCallError, e:
719 if not 'Not a valid URL' in e.stderr:
720 raise
721 # Assume the file was deleted. No idea how to figure out at which
722 # revision the file was deleted.
723 srcinfo = {'Revision': rev}
[email protected]3fda4cc2010-06-29 13:29:27724 if (srcinfo.get('Revision') != rev and
725 SVN.Capture(['diff', '-r', '%d:head' % rev, srcurl])):
726 metaheaders.append("#$ svn cp -r %d %s %s "
727 "### WARNING: note non-trunk copy\n" %
728 (rev, src, filename))
729 else:
730 metaheaders.append("#$ cp %s %s\n" % (src,
731 filename))
732
733 if metaheaders:
734 diffs.append("### BEGIN SVN COPY METADATA\n")
735 diffs.extend(metaheaders)
736 diffs.append("### END SVN COPY METADATA\n")
[email protected]3c55d982010-05-06 14:25:44737 # Now ready to do the actual diff.
[email protected]3c55d982010-05-06 14:25:44738 for filename in sorted(data.iterkeys()):
739 diffs.append(SVN._DiffItemInternal(filename, data[filename], bogus_dir,
740 full_move=full_move,
741 revision=revision))
742 # Use StringIO since it can be messy when diffing a directory move with
743 # full_move=True.
744 buf = cStringIO.StringIO()
745 for d in filter(None, diffs):
746 buf.write(d)
747 result = buf.getvalue()
748 buf.close()
749 return result
[email protected]f2f9d552009-12-22 00:12:57750 finally:
751 os.chdir(previous_cwd)
[email protected]3c55d982010-05-06 14:25:44752 shutil.rmtree(bogus_dir)
[email protected]f2f9d552009-12-22 00:12:57753
754 @staticmethod
[email protected]c78f2462009-11-21 01:20:57755 def GetEmail(repo_root):
756 """Retrieves the svn account which we assume is an email address."""
[email protected]54019f32010-09-09 13:50:11757 try:
758 infos = SVN.CaptureInfo(repo_root)
759 except gclient_utils.Error:
[email protected]c78f2462009-11-21 01:20:57760 return None
761
762 # Should check for uuid but it is incorrectly saved for https creds.
[email protected]54019f32010-09-09 13:50:11763 root = infos['Repository Root']
[email protected]c78f2462009-11-21 01:20:57764 realm = root.rsplit('/', 1)[0]
[email protected]54019f32010-09-09 13:50:11765 uuid = infos['UUID']
[email protected]c78f2462009-11-21 01:20:57766 if root.startswith('https') or not uuid:
767 regexp = re.compile(r'<%s:\d+>.*' % realm)
768 else:
769 regexp = re.compile(r'<%s:\d+> %s' % (realm, uuid))
770 if regexp is None:
771 return None
772 if sys.platform.startswith('win'):
773 if not 'APPDATA' in os.environ:
774 return None
[email protected]720d9f32009-11-21 17:38:57775 auth_dir = os.path.join(os.environ['APPDATA'], 'Subversion', 'auth',
776 'svn.simple')
[email protected]c78f2462009-11-21 01:20:57777 else:
778 if not 'HOME' in os.environ:
779 return None
780 auth_dir = os.path.join(os.environ['HOME'], '.subversion', 'auth',
781 'svn.simple')
782 for credfile in os.listdir(auth_dir):
783 cred_info = SVN.ReadSimpleAuth(os.path.join(auth_dir, credfile))
784 if regexp.match(cred_info.get('svn:realmstring')):
785 return cred_info.get('username')
786
787 @staticmethod
788 def ReadSimpleAuth(filename):
789 f = open(filename, 'r')
790 values = {}
[email protected]6e29d572010-06-04 17:32:20791 def ReadOneItem(item_type):
792 m = re.match(r'%s (\d+)' % item_type, f.readline())
[email protected]c78f2462009-11-21 01:20:57793 if not m:
794 return None
795 data = f.read(int(m.group(1)))
796 if f.read(1) != '\n':
797 return None
798 return data
799
800 while True:
801 key = ReadOneItem('K')
802 if not key:
803 break
804 value = ReadOneItem('V')
805 if not value:
806 break
807 values[key] = value
808 return values
[email protected]94b1ee92009-12-19 20:27:20809
810 @staticmethod
811 def GetCheckoutRoot(directory):
812 """Returns the top level directory of the current repository.
813
814 The directory is returned as an absolute path.
815 """
[email protected]f7ae6d52009-12-22 20:49:04816 directory = os.path.abspath(directory)
[email protected]54019f32010-09-09 13:50:11817 try:
[email protected]885d6e82011-02-24 20:21:46818 info = SVN.CaptureInfo(directory)
819 cur_dir_repo_root = info['Repository Root']
820 url = info['URL']
[email protected]54019f32010-09-09 13:50:11821 except gclient_utils.Error:
[email protected]94b1ee92009-12-19 20:27:20822 return None
[email protected]94b1ee92009-12-19 20:27:20823 while True:
824 parent = os.path.dirname(directory)
[email protected]54019f32010-09-09 13:50:11825 try:
[email protected]885d6e82011-02-24 20:21:46826 info = SVN.CaptureInfo(parent)
827 if (info['Repository Root'] != cur_dir_repo_root or
828 info['URL'] != os.path.dirname(url)):
[email protected]54019f32010-09-09 13:50:11829 break
[email protected]885d6e82011-02-24 20:21:46830 url = info['URL']
[email protected]54019f32010-09-09 13:50:11831 except gclient_utils.Error:
[email protected]94b1ee92009-12-19 20:27:20832 break
833 directory = parent
[email protected]fd9cbbb2010-01-08 23:04:03834 return GetCasedPath(directory)
[email protected]57564662010-04-14 02:35:12835
836 @staticmethod
837 def AssertVersion(min_version):
838 """Asserts svn's version is at least min_version."""
839 def only_int(val):
840 if val.isdigit():
841 return int(val)
842 else:
843 return 0
844 if not SVN.current_version:
845 SVN.current_version = SVN.Capture(['--version']).split()[2]
846 current_version_list = map(only_int, SVN.current_version.split('.'))
847 for min_ver in map(int, min_version.split('.')):
848 ver = current_version_list.pop(0)
849 if ver < min_ver:
850 return (False, SVN.current_version)
851 elif ver > min_ver:
852 return (True, SVN.current_version)
853 return (True, SVN.current_version)
[email protected]07ab60e2011-02-08 21:54:00854
855 @staticmethod
856 def Revert(repo_root, callback=None, ignore_externals=False):
857 """Reverts all svn modifications in repo_root, including properties.
858
859 Deletes any modified files or directory.
860
861 A "svn update --revision BASE" call is required after to revive deleted
862 files.
863 """
864 for file_status in SVN.CaptureStatus(repo_root):
865 file_path = os.path.join(repo_root, file_status[1])
[email protected]8c415122011-03-15 17:14:27866 if (ignore_externals and
867 file_status[0][0] == 'X' and
868 file_status[0][1:].isspace()):
[email protected]07ab60e2011-02-08 21:54:00869 # Ignore externals.
870 logging.info('Ignoring external %s' % file_status[1])
871 continue
872
873 if callback:
874 callback(file_status)
875
[email protected]8c415122011-03-15 17:14:27876 if os.path.exists(file_path):
877 # svn revert is really stupid. It fails on inconsistent line-endings,
878 # on switched directories, etc. So take no chance and delete everything!
879 # In theory, it wouldn't be necessary for property-only change but then
880 # it'd have to look for switched directories, etc so it's not worth
881 # optimizing this use case.
882 if os.path.isfile(file_path) or os.path.islink(file_path):
883 logging.info('os.remove(%s)' % file_path)
884 os.remove(file_path)
885 elif os.path.isdir(file_path):
886 logging.info('gclient_utils.RemoveDirectory(%s)' % file_path)
887 gclient_utils.RemoveDirectory(file_path)
888 else:
889 logging.critical(
890 ('No idea what is %s.\nYou just found a bug in gclient'
891 ', please ping [email protected] ASAP!') % file_path)
[email protected]07ab60e2011-02-08 21:54:00892
[email protected]8c415122011-03-15 17:14:27893 if (file_status[0][0] in ('D', 'A', '!') or
894 not file_status[0][1:].isspace()):
[email protected]af453492011-03-03 21:04:09895 # Added, deleted file requires manual intervention and require calling
[email protected]07ab60e2011-02-08 21:54:00896 # revert, like for properties.
[email protected]af453492011-03-03 21:04:09897 try:
898 SVN.Capture(['revert', file_status[1]], cwd=repo_root)
899 except gclient_utils.CheckCallError:
900 if not os.path.exists(file_path):
901 continue
902 raise