blob: 856370504bdd45cce91152e06ade84bd6119f36d [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:
147 # 1) find all git-svn branches and note their svn URLs.
148 # 2) iterate through our branch history and match up the URLs.
149
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
153 # Get the refname and svn url for all refs/remotes/*.
154 remotes = GIT.Capture(
155 ['for-each-ref', '--format=%(refname)', 'refs/remotes'],
[email protected]ad80e3b2010-09-09 14:18:28156 cwd=cwd).splitlines()
[email protected]f2f9d552009-12-22 00:12:57157 svn_refs = {}
158 for ref in remotes:
159 match = git_svn_re.search(
[email protected]ad80e3b2010-09-09 14:18:28160 GIT.Capture(['cat-file', '-p', ref], cwd=cwd))
[email protected]42d8da52010-04-23 18:25:07161 # Prefer origin/HEAD over all others.
162 if match and (match.group(1) not in svn_refs or
163 ref == "refs/remotes/origin/HEAD"):
[email protected]f2f9d552009-12-22 00:12:57164 svn_refs[match.group(1)] = ref
165
166 svn_branch = ''
167 if len(svn_refs) == 1:
168 # Only one svn branch exists -- seems like a good candidate.
169 svn_branch = svn_refs.values()[0]
170 elif len(svn_refs) > 1:
171 # We have more than one remote branch available. We don't
172 # want to go through all of history, so read a line from the
173 # pipe at a time.
174 # The -100 is an arbitrary limit so we don't search forever.
175 cmd = ['git', 'log', '-100', '--pretty=medium']
[email protected]3a292682010-08-23 18:54:55176 proc = gclient_utils.Popen(cmd, stdout=subprocess.PIPE, cwd=cwd)
[email protected]f2f9d552009-12-22 00:12:57177 for line in proc.stdout:
178 match = git_svn_re.match(line)
179 if match:
180 url = match.group(1)
181 if url in svn_refs:
182 svn_branch = svn_refs[url]
183 proc.stdout.close() # Cut pipe.
184 break
185 return svn_branch
186
187 @staticmethod
188 def FetchUpstreamTuple(cwd):
189 """Returns a tuple containg remote and remote ref,
190 e.g. 'origin', 'refs/heads/master'
[email protected]81e012c2010-04-29 16:07:24191 Tries to be intelligent and understand git-svn.
[email protected]f2f9d552009-12-22 00:12:57192 """
193 remote = '.'
[email protected]b24a8e12009-12-22 13:45:48194 branch = GIT.GetBranch(cwd)
[email protected]ad80e3b2010-09-09 14:18:28195 try:
196 upstream_branch = GIT.Capture(
197 ['config', 'branch.%s.merge' % branch], cwd=cwd).strip()
198 except gclient_utils.Error:
199 upstream_branch = None
[email protected]f2f9d552009-12-22 00:12:57200 if upstream_branch:
[email protected]ad80e3b2010-09-09 14:18:28201 try:
202 remote = GIT.Capture(
203 ['config', 'branch.%s.remote' % branch], cwd=cwd).strip()
204 except gclient_utils.Error:
205 pass
[email protected]f2f9d552009-12-22 00:12:57206 else:
207 # Fall back on trying a git-svn upstream branch.
208 if GIT.IsGitSvn(cwd):
209 upstream_branch = GIT.GetSVNBranch(cwd)
[email protected]81e012c2010-04-29 16:07:24210 else:
[email protected]a630bd72010-04-29 23:32:34211 # Else, try to guess the origin remote.
[email protected]ad80e3b2010-09-09 14:18:28212 remote_branches = GIT.Capture(['branch', '-r'], cwd=cwd).split()
[email protected]a630bd72010-04-29 23:32:34213 if 'origin/master' in remote_branches:
214 # Fall back on origin/master if it exits.
215 remote = 'origin'
216 upstream_branch = 'refs/heads/master'
217 elif 'origin/trunk' in remote_branches:
218 # Fall back on origin/trunk if it exists. Generally a shared
219 # git-svn clone
220 remote = 'origin'
221 upstream_branch = 'refs/heads/trunk'
222 else:
223 # Give up.
224 remote = None
225 upstream_branch = None
[email protected]f2f9d552009-12-22 00:12:57226 return remote, upstream_branch
227
228 @staticmethod
[email protected]81e012c2010-04-29 16:07:24229 def GetUpstreamBranch(cwd):
[email protected]f2f9d552009-12-22 00:12:57230 """Gets the current branch's upstream branch."""
231 remote, upstream_branch = GIT.FetchUpstreamTuple(cwd)
[email protected]a630bd72010-04-29 23:32:34232 if remote != '.' and upstream_branch:
[email protected]f2f9d552009-12-22 00:12:57233 upstream_branch = upstream_branch.replace('heads', 'remotes/' + remote)
234 return upstream_branch
235
236 @staticmethod
[email protected]8ede00e2010-01-12 14:35:28237 def GenerateDiff(cwd, branch=None, branch_head='HEAD', full_move=False,
238 files=None):
[email protected]a9371762009-12-22 18:27:38239 """Diffs against the upstream branch or optionally another branch.
240
241 full_move means that move or copy operations should completely recreate the
242 files, usually in the prospect to apply the patch for a try job."""
[email protected]f2f9d552009-12-22 00:12:57243 if not branch:
[email protected]81e012c2010-04-29 16:07:24244 branch = GIT.GetUpstreamBranch(cwd)
[email protected]400f3e72010-05-19 14:23:36245 command = ['diff', '-p', '--no-prefix', '--no-ext-diff',
246 branch + "..." + branch_head]
[email protected]a9371762009-12-22 18:27:38247 if not full_move:
248 command.append('-C')
[email protected]8ede00e2010-01-12 14:35:28249 # TODO(maruel): --binary support.
250 if files:
251 command.append('--')
252 command.extend(files)
[email protected]ad80e3b2010-09-09 14:18:28253 diff = GIT.Capture(command, cwd=cwd).splitlines(True)
[email protected]f2f9d552009-12-22 00:12:57254 for i in range(len(diff)):
255 # In the case of added files, replace /dev/null with the path to the
256 # file being added.
257 if diff[i].startswith('--- /dev/null'):
258 diff[i] = '--- %s' % diff[i+1][4:]
259 return ''.join(diff)
[email protected]c78f2462009-11-21 01:20:57260
[email protected]b24a8e12009-12-22 13:45:48261 @staticmethod
[email protected]8ede00e2010-01-12 14:35:28262 def GetDifferentFiles(cwd, branch=None, branch_head='HEAD'):
263 """Returns the list of modified files between two branches."""
264 if not branch:
[email protected]81e012c2010-04-29 16:07:24265 branch = GIT.GetUpstreamBranch(cwd)
[email protected]838f0f22010-04-09 17:02:50266 command = ['diff', '--name-only', branch + "..." + branch_head]
[email protected]ad80e3b2010-09-09 14:18:28267 return GIT.Capture(command, cwd=cwd).splitlines(False)
[email protected]8ede00e2010-01-12 14:35:28268
269 @staticmethod
[email protected]b24a8e12009-12-22 13:45:48270 def GetPatchName(cwd):
271 """Constructs a name for this patch."""
[email protected]ad80e3b2010-09-09 14:18:28272 short_sha = GIT.Capture(['rev-parse', '--short=4', 'HEAD'], cwd=cwd).strip()
[email protected]862ff8e2010-08-06 15:29:16273 return "%s#%s" % (GIT.GetBranch(cwd), short_sha)
[email protected]b24a8e12009-12-22 13:45:48274
275 @staticmethod
[email protected]ad80e3b2010-09-09 14:18:28276 def GetCheckoutRoot(cwd):
[email protected]01d8c1d2010-01-07 01:56:59277 """Returns the top level directory of a git checkout as an absolute path.
[email protected]b24a8e12009-12-22 13:45:48278 """
[email protected]ad80e3b2010-09-09 14:18:28279 root = GIT.Capture(['rev-parse', '--show-cdup'], cwd=cwd).strip()
280 return os.path.abspath(os.path.join(cwd, root))
[email protected]b24a8e12009-12-22 13:45:48281
[email protected]d0f854a2010-03-11 19:35:53282 @staticmethod
283 def AssertVersion(min_version):
284 """Asserts git's version is at least min_version."""
285 def only_int(val):
286 if val.isdigit():
287 return int(val)
288 else:
289 return 0
[email protected]ad80e3b2010-09-09 14:18:28290 current_version = GIT.Capture(['--version']).split()[-1]
[email protected]d0f854a2010-03-11 19:35:53291 current_version_list = map(only_int, current_version.split('.'))
292 for min_ver in map(int, min_version.split('.')):
293 ver = current_version_list.pop(0)
294 if ver < min_ver:
295 return (False, current_version)
296 elif ver > min_ver:
297 return (True, current_version)
298 return (True, current_version)
299
[email protected]d5800f12009-11-12 20:03:43300
[email protected]5aeb7dd2009-11-17 18:09:01301class SVN(object):
[email protected]57564662010-04-14 02:35:12302 current_version = None
[email protected]d5800f12009-11-12 20:03:43303
[email protected]5aeb7dd2009-11-17 18:09:01304 @staticmethod
[email protected]54019f32010-09-09 13:50:11305 def Capture(args, **kwargs):
306 """Always redirect stderr.
[email protected]d5800f12009-11-12 20:03:43307
[email protected]54019f32010-09-09 13:50:11308 Throws an exception if non-0 is returned."""
309 return gclient_utils.CheckCall(['svn'] + args, print_error=False,
310 **kwargs)[0]
[email protected]d5800f12009-11-12 20:03:43311
[email protected]5aeb7dd2009-11-17 18:09:01312 @staticmethod
[email protected]2b9aa8e2010-08-25 20:01:42313 def RunAndGetFileList(verbose, args, cwd, file_list, stdout=None):
[email protected]5aeb7dd2009-11-17 18:09:01314 """Runs svn checkout, update, or status, output to stdout.
[email protected]d5800f12009-11-12 20:03:43315
[email protected]5aeb7dd2009-11-17 18:09:01316 The first item in args must be either "checkout", "update", or "status".
[email protected]d5800f12009-11-12 20:03:43317
[email protected]5aeb7dd2009-11-17 18:09:01318 svn's stdout is parsed to collect a list of files checked out or updated.
319 These files are appended to file_list. svn's stdout is also printed to
320 sys.stdout as in Run.
[email protected]d5800f12009-11-12 20:03:43321
[email protected]5aeb7dd2009-11-17 18:09:01322 Args:
[email protected]03807072010-08-16 17:18:44323 verbose: If True, uses verbose output
[email protected]5aeb7dd2009-11-17 18:09:01324 args: A sequence of command line parameters to be passed to svn.
[email protected]2b9aa8e2010-08-25 20:01:42325 cwd: The directory where svn is to be run.
[email protected]d5800f12009-11-12 20:03:43326
[email protected]5aeb7dd2009-11-17 18:09:01327 Raises:
328 Error: An error occurred while running the svn command.
329 """
[email protected]2b9aa8e2010-08-25 20:01:42330 stdout = stdout or sys.stdout
[email protected]d5800f12009-11-12 20:03:43331
[email protected]5aeb7dd2009-11-17 18:09:01332 # svn update and svn checkout use the same pattern: the first three columns
333 # are for file status, property status, and lock status. This is followed
334 # by two spaces, and then the path to the file.
335 update_pattern = '^... (.*)$'
[email protected]d5800f12009-11-12 20:03:43336
[email protected]5aeb7dd2009-11-17 18:09:01337 # The first three columns of svn status are the same as for svn update and
338 # svn checkout. The next three columns indicate addition-with-history,
339 # switch, and remote lock status. This is followed by one space, and then
340 # the path to the file.
341 status_pattern = '^...... (.*)$'
[email protected]d5800f12009-11-12 20:03:43342
[email protected]5aeb7dd2009-11-17 18:09:01343 # args[0] must be a supported command. This will blow up if it's something
344 # else, which is good. Note that the patterns are only effective when
345 # these commands are used in their ordinary forms, the patterns are invalid
346 # for "svn status --show-updates", for example.
347 pattern = {
348 'checkout': update_pattern,
349 'status': status_pattern,
350 'update': update_pattern,
351 }[args[0]]
[email protected]5aeb7dd2009-11-17 18:09:01352 compiled_pattern = re.compile(pattern)
[email protected]b71b67e2009-11-24 20:48:19353 # Place an upper limit.
[email protected]2aee22982010-09-03 14:15:25354 backoff_time = 5
[email protected]bec588d2010-10-26 13:50:25355 retries = 0
[email protected]03507062010-10-26 00:58:27356 while True:
[email protected]bec588d2010-10-26 13:50:25357 retries += 1
[email protected]b71b67e2009-11-24 20:48:19358 previous_list_len = len(file_list)
359 failure = []
[email protected]54d1f1a2010-01-08 19:53:47360
[email protected]b71b67e2009-11-24 20:48:19361 def CaptureMatchingLines(line):
362 match = compiled_pattern.search(line)
363 if match:
364 file_list.append(match.group(1))
365 if line.startswith('svn: '):
[email protected]8599aa72010-02-08 20:27:14366 failure.append(line)
[email protected]54d1f1a2010-01-08 19:53:47367
[email protected]b71b67e2009-11-24 20:48:19368 try:
[email protected]17d01792010-09-01 18:07:10369 gclient_utils.CheckCallAndFilterAndHeader(
370 ['svn'] + args,
371 cwd=cwd,
372 always=verbose,
373 filter_fn=CaptureMatchingLines,
374 stdout=stdout)
[email protected]b71b67e2009-11-24 20:48:19375 except gclient_utils.Error:
[email protected]6133c5b2010-08-18 18:34:48376 def IsKnownFailure():
377 for x in failure:
378 if (x.startswith('svn: OPTIONS of') or
379 x.startswith('svn: PROPFIND of') or
380 x.startswith('svn: REPORT of') or
[email protected]f61fc932010-08-19 13:05:24381 x.startswith('svn: Unknown hostname') or
382 x.startswith('svn: Server sent unexpected return value')):
[email protected]6133c5b2010-08-18 18:34:48383 return True
384 return False
385
[email protected]953586a2010-06-15 14:22:24386 # Subversion client is really misbehaving with Google Code.
387 if args[0] == 'checkout':
388 # Ensure at least one file was checked out, otherwise *delete* the
389 # directory.
390 if len(file_list) == previous_list_len:
[email protected]6133c5b2010-08-18 18:34:48391 if not IsKnownFailure():
[email protected]953586a2010-06-15 14:22:24392 # No known svn error was found, bail out.
393 raise
[email protected]6133c5b2010-08-18 18:34:48394 # No file were checked out, so make sure the directory is
395 # deleted in case it's messed up and try again.
396 # Warning: It's bad, it assumes args[2] is the directory
397 # argument.
398 if os.path.isdir(args[2]):
399 gclient_utils.RemoveDirectory(args[2])
[email protected]953586a2010-06-15 14:22:24400 else:
401 # Progress was made, convert to update since an aborted checkout
402 # is now an update.
[email protected]2de10252010-02-08 01:10:39403 args = ['update'] + args[1:]
[email protected]953586a2010-06-15 14:22:24404 else:
405 # It was an update or export.
[email protected]6133c5b2010-08-18 18:34:48406 # We enforce that some progress has been made or a known failure.
407 if len(file_list) == previous_list_len and not IsKnownFailure():
408 # No known svn error was found and no progress, bail out.
409 raise
[email protected]bec588d2010-10-26 13:50:25410 if retries == 10:
[email protected]03507062010-10-26 00:58:27411 raise
[email protected]2aee22982010-09-03 14:15:25412 print "Sleeping %.1f seconds and retrying...." % backoff_time
413 time.sleep(backoff_time)
414 backoff_time *= 1.3
[email protected]953586a2010-06-15 14:22:24415 continue
[email protected]b71b67e2009-11-24 20:48:19416 break
[email protected]d5800f12009-11-12 20:03:43417
[email protected]5aeb7dd2009-11-17 18:09:01418 @staticmethod
[email protected]54019f32010-09-09 13:50:11419 def CaptureInfo(cwd):
[email protected]5aeb7dd2009-11-17 18:09:01420 """Returns a dictionary from the svn info output for the given file.
[email protected]d5800f12009-11-12 20:03:43421
[email protected]54019f32010-09-09 13:50:11422 Throws an exception if svn info fails."""
423 output = SVN.Capture(['info', '--xml', cwd])
[email protected]5aeb7dd2009-11-17 18:09:01424 dom = gclient_utils.ParseXML(output)
425 result = {}
426 if dom:
427 GetNamedNodeText = gclient_utils.GetNamedNodeText
428 GetNodeNamedAttributeText = gclient_utils.GetNodeNamedAttributeText
429 def C(item, f):
[email protected]6e29d572010-06-04 17:32:20430 if item is not None:
431 return f(item)
[email protected]5aeb7dd2009-11-17 18:09:01432 # /info/entry/
433 # url
434 # reposityory/(root|uuid)
435 # wc-info/(schedule|depth)
436 # commit/(author|date)
437 # str() the results because they may be returned as Unicode, which
438 # interferes with the higher layers matching up things in the deps
439 # dictionary.
[email protected]5aeb7dd2009-11-17 18:09:01440 result['Repository Root'] = C(GetNamedNodeText(dom, 'root'), str)
441 result['URL'] = C(GetNamedNodeText(dom, 'url'), str)
442 result['UUID'] = C(GetNamedNodeText(dom, 'uuid'), str)
443 result['Revision'] = C(GetNodeNamedAttributeText(dom, 'entry',
444 'revision'),
445 int)
446 result['Node Kind'] = C(GetNodeNamedAttributeText(dom, 'entry', 'kind'),
447 str)
448 # Differs across versions.
449 if result['Node Kind'] == 'dir':
450 result['Node Kind'] = 'directory'
451 result['Schedule'] = C(GetNamedNodeText(dom, 'schedule'), str)
452 result['Path'] = C(GetNodeNamedAttributeText(dom, 'entry', 'path'), str)
453 result['Copied From URL'] = C(GetNamedNodeText(dom, 'copy-from-url'), str)
454 result['Copied From Rev'] = C(GetNamedNodeText(dom, 'copy-from-rev'), str)
455 return result
[email protected]d5800f12009-11-12 20:03:43456
[email protected]5aeb7dd2009-11-17 18:09:01457 @staticmethod
[email protected]54019f32010-09-09 13:50:11458 def CaptureRevision(cwd):
[email protected]5d63eb82010-03-24 23:22:09459 """Get the base revision of a SVN repository.
460
461 Returns:
462 Int base revision
463 """
[email protected]54019f32010-09-09 13:50:11464 info = SVN.Capture(['info', '--xml'], cwd=cwd)
[email protected]5d63eb82010-03-24 23:22:09465 dom = xml.dom.minidom.parseString(info)
466 return dom.getElementsByTagName('entry')[0].getAttribute('revision')
467
468 @staticmethod
[email protected]5aeb7dd2009-11-17 18:09:01469 def CaptureStatus(files):
470 """Returns the svn 1.5 svn status emulated output.
[email protected]d5800f12009-11-12 20:03:43471
[email protected]5aeb7dd2009-11-17 18:09:01472 @files can be a string (one file) or a list of files.
[email protected]d5800f12009-11-12 20:03:43473
[email protected]5aeb7dd2009-11-17 18:09:01474 Returns an array of (status, file) tuples."""
475 command = ["status", "--xml"]
476 if not files:
477 pass
478 elif isinstance(files, basestring):
479 command.append(files)
480 else:
481 command.extend(files)
[email protected]d5800f12009-11-12 20:03:43482
[email protected]5aeb7dd2009-11-17 18:09:01483 status_letter = {
484 None: ' ',
485 '': ' ',
486 'added': 'A',
487 'conflicted': 'C',
488 'deleted': 'D',
489 'external': 'X',
490 'ignored': 'I',
491 'incomplete': '!',
492 'merged': 'G',
493 'missing': '!',
494 'modified': 'M',
495 'none': ' ',
496 'normal': ' ',
497 'obstructed': '~',
498 'replaced': 'R',
499 'unversioned': '?',
500 }
501 dom = gclient_utils.ParseXML(SVN.Capture(command))
502 results = []
503 if dom:
504 # /status/target/entry/(wc-status|commit|author|date)
505 for target in dom.getElementsByTagName('target'):
506 #base_path = target.getAttribute('path')
507 for entry in target.getElementsByTagName('entry'):
508 file_path = entry.getAttribute('path')
509 wc_status = entry.getElementsByTagName('wc-status')
510 assert len(wc_status) == 1
511 # Emulate svn 1.5 status ouput...
512 statuses = [' '] * 7
513 # Col 0
514 xml_item_status = wc_status[0].getAttribute('item')
515 if xml_item_status in status_letter:
516 statuses[0] = status_letter[xml_item_status]
517 else:
[email protected]54019f32010-09-09 13:50:11518 raise gclient_utils.Error(
519 'Unknown item status "%s"; please implement me!' %
520 xml_item_status)
[email protected]5aeb7dd2009-11-17 18:09:01521 # Col 1
522 xml_props_status = wc_status[0].getAttribute('props')
523 if xml_props_status == 'modified':
524 statuses[1] = 'M'
525 elif xml_props_status == 'conflicted':
526 statuses[1] = 'C'
527 elif (not xml_props_status or xml_props_status == 'none' or
528 xml_props_status == 'normal'):
529 pass
530 else:
[email protected]54019f32010-09-09 13:50:11531 raise gclient_utils.Error(
532 'Unknown props status "%s"; please implement me!' %
533 xml_props_status)
[email protected]5aeb7dd2009-11-17 18:09:01534 # Col 2
535 if wc_status[0].getAttribute('wc-locked') == 'true':
536 statuses[2] = 'L'
537 # Col 3
538 if wc_status[0].getAttribute('copied') == 'true':
539 statuses[3] = '+'
540 # Col 4
541 if wc_status[0].getAttribute('switched') == 'true':
542 statuses[4] = 'S'
543 # TODO(maruel): Col 5 and 6
544 item = (''.join(statuses), file_path)
545 results.append(item)
546 return results
[email protected]d5800f12009-11-12 20:03:43547
[email protected]5aeb7dd2009-11-17 18:09:01548 @staticmethod
549 def IsMoved(filename):
550 """Determine if a file has been added through svn mv"""
[email protected]3c55d982010-05-06 14:25:44551 return SVN.IsMovedInfo(SVN.CaptureInfo(filename))
552
553 @staticmethod
554 def IsMovedInfo(info):
555 """Determine if a file has been added through svn mv"""
[email protected]5aeb7dd2009-11-17 18:09:01556 return (info.get('Copied From URL') and
557 info.get('Copied From Rev') and
558 info.get('Schedule') == 'add')
[email protected]d5800f12009-11-12 20:03:43559
[email protected]5aeb7dd2009-11-17 18:09:01560 @staticmethod
[email protected]6e29d572010-06-04 17:32:20561 def GetFileProperty(filename, property_name):
[email protected]5aeb7dd2009-11-17 18:09:01562 """Returns the value of an SVN property for the given file.
[email protected]d5800f12009-11-12 20:03:43563
[email protected]5aeb7dd2009-11-17 18:09:01564 Args:
[email protected]6e29d572010-06-04 17:32:20565 filename: The file to check
[email protected]5aeb7dd2009-11-17 18:09:01566 property_name: The name of the SVN property, e.g. "svn:mime-type"
[email protected]d5800f12009-11-12 20:03:43567
[email protected]5aeb7dd2009-11-17 18:09:01568 Returns:
569 The value of the property, which will be the empty string if the property
570 is not set on the file. If the file is not under version control, the
571 empty string is also returned.
572 """
[email protected]54019f32010-09-09 13:50:11573 try:
574 return SVN.Capture(['propget', property_name, filename])
575 except gclient_utils.Error:
576 return ''
[email protected]d5800f12009-11-12 20:03:43577
[email protected]5aeb7dd2009-11-17 18:09:01578 @staticmethod
[email protected]1c7db8e2010-01-07 02:00:19579 def DiffItem(filename, full_move=False, revision=None):
[email protected]f2f9d552009-12-22 00:12:57580 """Diffs a single file.
581
[email protected]3c55d982010-05-06 14:25:44582 Should be simple, eh? No it isn't.
[email protected]f2f9d552009-12-22 00:12:57583 Be sure to be in the appropriate directory before calling to have the
[email protected]a9371762009-12-22 18:27:38584 expected relative path.
585 full_move means that move or copy operations should completely recreate the
586 files, usually in the prospect to apply the patch for a try job."""
[email protected]5aeb7dd2009-11-17 18:09:01587 # If the user specified a custom diff command in their svn config file,
588 # then it'll be used when we do svn diff, which we don't want to happen
589 # since we want the unified diff. Using --diff-cmd=diff doesn't always
590 # work, since they can have another diff executable in their path that
591 # gives different line endings. So we use a bogus temp directory as the
592 # config directory, which gets around these problems.
[email protected]f2f9d552009-12-22 00:12:57593 bogus_dir = tempfile.mkdtemp()
594 try:
[email protected]3c55d982010-05-06 14:25:44595 # Use "svn info" output instead of os.path.isdir because the latter fails
596 # when the file is deleted.
[email protected]6e29d572010-06-04 17:32:20597 return SVN._DiffItemInternal(filename, SVN.CaptureInfo(filename),
598 bogus_dir,
[email protected]3c55d982010-05-06 14:25:44599 full_move=full_move, revision=revision)
600 finally:
601 shutil.rmtree(bogus_dir)
602
603 @staticmethod
604 def _DiffItemInternal(filename, info, bogus_dir, full_move=False,
605 revision=None):
606 """Grabs the diff data."""
607 command = ["diff", "--config-dir", bogus_dir, filename]
608 if revision:
609 command.extend(['--revision', revision])
610 data = None
611 if SVN.IsMovedInfo(info):
612 if full_move:
613 if info.get("Node Kind") == "directory":
614 # Things become tricky here. It's a directory copy/move. We need to
615 # diff all the files inside it.
616 # This will put a lot of pressure on the heap. This is why StringIO
617 # is used and converted back into a string at the end. The reason to
618 # return a string instead of a StringIO is that StringIO.write()
619 # doesn't accept a StringIO object. *sigh*.
620 for (dirpath, dirnames, filenames) in os.walk(filename):
621 # Cleanup all files starting with a '.'.
622 for d in dirnames:
623 if d.startswith('.'):
624 dirnames.remove(d)
625 for f in filenames:
626 if f.startswith('.'):
627 filenames.remove(f)
628 for f in filenames:
629 if data is None:
630 data = cStringIO.StringIO()
631 data.write(GenFakeDiff(os.path.join(dirpath, f)))
632 if data:
633 tmp = data.getvalue()
634 data.close()
635 data = tmp
[email protected]f2f9d552009-12-22 00:12:57636 else:
[email protected]3c55d982010-05-06 14:25:44637 data = GenFakeDiff(filename)
638 else:
639 if info.get("Node Kind") != "directory":
[email protected]0836c562010-01-22 01:10:06640 # svn diff on a mv/cp'd file outputs nothing if there was no change.
[email protected]54019f32010-09-09 13:50:11641 data = SVN.Capture(command)
[email protected]0836c562010-01-22 01:10:06642 if not data:
643 # We put in an empty Index entry so upload.py knows about them.
[email protected]c6d170e2010-06-03 00:06:00644 data = "Index: %s\n" % filename.replace(os.sep, '/')
[email protected]3c55d982010-05-06 14:25:44645 # Otherwise silently ignore directories.
646 else:
647 if info.get("Node Kind") != "directory":
648 # Normal simple case.
[email protected]54019f32010-09-09 13:50:11649 data = SVN.Capture(command)
[email protected]3c55d982010-05-06 14:25:44650 # Otherwise silently ignore directories.
[email protected]5aeb7dd2009-11-17 18:09:01651 return data
[email protected]c78f2462009-11-21 01:20:57652
653 @staticmethod
[email protected]1c7db8e2010-01-07 02:00:19654 def GenerateDiff(filenames, root=None, full_move=False, revision=None):
[email protected]f2f9d552009-12-22 00:12:57655 """Returns a string containing the diff for the given file list.
656
657 The files in the list should either be absolute paths or relative to the
658 given root. If no root directory is provided, the repository root will be
659 used.
660 The diff will always use relative paths.
661 """
[email protected]00fdcb32011-02-24 01:41:02662 assert isinstance(filenames, (list, tuple))
[email protected]f2f9d552009-12-22 00:12:57663 previous_cwd = os.getcwd()
[email protected]fd9cbbb2010-01-08 23:04:03664 root = root or SVN.GetCheckoutRoot(previous_cwd)
665 root = os.path.normcase(os.path.join(root, ''))
[email protected]f2f9d552009-12-22 00:12:57666 def RelativePath(path, root):
667 """We must use relative paths."""
[email protected]fd9cbbb2010-01-08 23:04:03668 if os.path.normcase(path).startswith(root):
[email protected]f2f9d552009-12-22 00:12:57669 return path[len(root):]
670 return path
[email protected]3c55d982010-05-06 14:25:44671 # If the user specified a custom diff command in their svn config file,
672 # then it'll be used when we do svn diff, which we don't want to happen
673 # since we want the unified diff. Using --diff-cmd=diff doesn't always
674 # work, since they can have another diff executable in their path that
675 # gives different line endings. So we use a bogus temp directory as the
676 # config directory, which gets around these problems.
677 bogus_dir = tempfile.mkdtemp()
[email protected]f2f9d552009-12-22 00:12:57678 try:
679 os.chdir(root)
[email protected]3c55d982010-05-06 14:25:44680 # Cleanup filenames
681 filenames = [RelativePath(f, root) for f in filenames]
682 # Get information about the modified items (files and directories)
683 data = dict([(f, SVN.CaptureInfo(f)) for f in filenames])
[email protected]3fda4cc2010-06-29 13:29:27684 diffs = []
[email protected]3c55d982010-05-06 14:25:44685 if full_move:
686 # Eliminate modified files inside moved/copied directory.
687 for (filename, info) in data.iteritems():
688 if SVN.IsMovedInfo(info) and info.get("Node Kind") == "directory":
689 # Remove files inside the directory.
690 filenames = [f for f in filenames
691 if not f.startswith(filename + os.path.sep)]
692 for filename in data.keys():
693 if not filename in filenames:
694 # Remove filtered out items.
695 del data[filename]
[email protected]3fda4cc2010-06-29 13:29:27696 else:
697 metaheaders = []
698 for (filename, info) in data.iteritems():
699 if SVN.IsMovedInfo(info):
700 # for now, the most common case is a head copy,
701 # so let's just encode that as a straight up cp.
702 srcurl = info.get('Copied From URL')
703 root = info.get('Repository Root')
704 rev = int(info.get('Copied From Rev'))
705 assert srcurl.startswith(root)
706 src = srcurl[len(root)+1:]
[email protected]00fdcb32011-02-24 01:41:02707 try:
708 srcinfo = SVN.CaptureInfo(srcurl)
709 except gclient_utils.CheckCallError, e:
710 if not 'Not a valid URL' in e.stderr:
711 raise
712 # Assume the file was deleted. No idea how to figure out at which
713 # revision the file was deleted.
714 srcinfo = {'Revision': rev}
[email protected]3fda4cc2010-06-29 13:29:27715 if (srcinfo.get('Revision') != rev and
716 SVN.Capture(['diff', '-r', '%d:head' % rev, srcurl])):
717 metaheaders.append("#$ svn cp -r %d %s %s "
718 "### WARNING: note non-trunk copy\n" %
719 (rev, src, filename))
720 else:
721 metaheaders.append("#$ cp %s %s\n" % (src,
722 filename))
723
724 if metaheaders:
725 diffs.append("### BEGIN SVN COPY METADATA\n")
726 diffs.extend(metaheaders)
727 diffs.append("### END SVN COPY METADATA\n")
[email protected]3c55d982010-05-06 14:25:44728 # Now ready to do the actual diff.
[email protected]3c55d982010-05-06 14:25:44729 for filename in sorted(data.iterkeys()):
730 diffs.append(SVN._DiffItemInternal(filename, data[filename], bogus_dir,
731 full_move=full_move,
732 revision=revision))
733 # Use StringIO since it can be messy when diffing a directory move with
734 # full_move=True.
735 buf = cStringIO.StringIO()
736 for d in filter(None, diffs):
737 buf.write(d)
738 result = buf.getvalue()
739 buf.close()
740 return result
[email protected]f2f9d552009-12-22 00:12:57741 finally:
742 os.chdir(previous_cwd)
[email protected]3c55d982010-05-06 14:25:44743 shutil.rmtree(bogus_dir)
[email protected]f2f9d552009-12-22 00:12:57744
745 @staticmethod
[email protected]c78f2462009-11-21 01:20:57746 def GetEmail(repo_root):
747 """Retrieves the svn account which we assume is an email address."""
[email protected]54019f32010-09-09 13:50:11748 try:
749 infos = SVN.CaptureInfo(repo_root)
750 except gclient_utils.Error:
[email protected]c78f2462009-11-21 01:20:57751 return None
752
753 # Should check for uuid but it is incorrectly saved for https creds.
[email protected]54019f32010-09-09 13:50:11754 root = infos['Repository Root']
[email protected]c78f2462009-11-21 01:20:57755 realm = root.rsplit('/', 1)[0]
[email protected]54019f32010-09-09 13:50:11756 uuid = infos['UUID']
[email protected]c78f2462009-11-21 01:20:57757 if root.startswith('https') or not uuid:
758 regexp = re.compile(r'<%s:\d+>.*' % realm)
759 else:
760 regexp = re.compile(r'<%s:\d+> %s' % (realm, uuid))
761 if regexp is None:
762 return None
763 if sys.platform.startswith('win'):
764 if not 'APPDATA' in os.environ:
765 return None
[email protected]720d9f32009-11-21 17:38:57766 auth_dir = os.path.join(os.environ['APPDATA'], 'Subversion', 'auth',
767 'svn.simple')
[email protected]c78f2462009-11-21 01:20:57768 else:
769 if not 'HOME' in os.environ:
770 return None
771 auth_dir = os.path.join(os.environ['HOME'], '.subversion', 'auth',
772 'svn.simple')
773 for credfile in os.listdir(auth_dir):
774 cred_info = SVN.ReadSimpleAuth(os.path.join(auth_dir, credfile))
775 if regexp.match(cred_info.get('svn:realmstring')):
776 return cred_info.get('username')
777
778 @staticmethod
779 def ReadSimpleAuth(filename):
780 f = open(filename, 'r')
781 values = {}
[email protected]6e29d572010-06-04 17:32:20782 def ReadOneItem(item_type):
783 m = re.match(r'%s (\d+)' % item_type, f.readline())
[email protected]c78f2462009-11-21 01:20:57784 if not m:
785 return None
786 data = f.read(int(m.group(1)))
787 if f.read(1) != '\n':
788 return None
789 return data
790
791 while True:
792 key = ReadOneItem('K')
793 if not key:
794 break
795 value = ReadOneItem('V')
796 if not value:
797 break
798 values[key] = value
799 return values
[email protected]94b1ee92009-12-19 20:27:20800
801 @staticmethod
802 def GetCheckoutRoot(directory):
803 """Returns the top level directory of the current repository.
804
805 The directory is returned as an absolute path.
806 """
[email protected]f7ae6d52009-12-22 20:49:04807 directory = os.path.abspath(directory)
[email protected]54019f32010-09-09 13:50:11808 try:
[email protected]885d6e82011-02-24 20:21:46809 info = SVN.CaptureInfo(directory)
810 cur_dir_repo_root = info['Repository Root']
811 url = info['URL']
[email protected]54019f32010-09-09 13:50:11812 except gclient_utils.Error:
[email protected]94b1ee92009-12-19 20:27:20813 return None
[email protected]94b1ee92009-12-19 20:27:20814 while True:
815 parent = os.path.dirname(directory)
[email protected]54019f32010-09-09 13:50:11816 try:
[email protected]885d6e82011-02-24 20:21:46817 info = SVN.CaptureInfo(parent)
818 if (info['Repository Root'] != cur_dir_repo_root or
819 info['URL'] != os.path.dirname(url)):
[email protected]54019f32010-09-09 13:50:11820 break
[email protected]885d6e82011-02-24 20:21:46821 url = info['URL']
[email protected]54019f32010-09-09 13:50:11822 except gclient_utils.Error:
[email protected]94b1ee92009-12-19 20:27:20823 break
824 directory = parent
[email protected]fd9cbbb2010-01-08 23:04:03825 return GetCasedPath(directory)
[email protected]57564662010-04-14 02:35:12826
827 @staticmethod
828 def AssertVersion(min_version):
829 """Asserts svn's version is at least min_version."""
830 def only_int(val):
831 if val.isdigit():
832 return int(val)
833 else:
834 return 0
835 if not SVN.current_version:
836 SVN.current_version = SVN.Capture(['--version']).split()[2]
837 current_version_list = map(only_int, SVN.current_version.split('.'))
838 for min_ver in map(int, min_version.split('.')):
839 ver = current_version_list.pop(0)
840 if ver < min_ver:
841 return (False, SVN.current_version)
842 elif ver > min_ver:
843 return (True, SVN.current_version)
844 return (True, SVN.current_version)
[email protected]07ab60e2011-02-08 21:54:00845
846 @staticmethod
847 def Revert(repo_root, callback=None, ignore_externals=False):
848 """Reverts all svn modifications in repo_root, including properties.
849
850 Deletes any modified files or directory.
851
852 A "svn update --revision BASE" call is required after to revive deleted
853 files.
854 """
855 for file_status in SVN.CaptureStatus(repo_root):
856 file_path = os.path.join(repo_root, file_status[1])
857 if ignore_externals and file_status[0][0] == 'X':
858 # Ignore externals.
859 logging.info('Ignoring external %s' % file_status[1])
860 continue
861
862 if callback:
863 callback(file_status)
864
865 if file_status[0].isspace():
866 # Try reverting the file since it's probably a property change.
867 gclient_utils.CheckCall(
868 ['svn', 'revert', file_status[1]], cwd=repo_root)
869
870 # svn revert is really stupid. It fails on inconsistent line-endings,
871 # on switched directories, etc. So take no chance and delete everything!
872 if file_status[0][0] == 'D':
873 # Deleted file requires manual intervention and require calling
874 # revert, like for properties.
875 gclient_utils.CheckCall(
876 ['svn', 'revert', file_status[1]], cwd=repo_root)
877 else:
878 if not os.path.exists(file_path):
879 pass
880 elif os.path.isfile(file_path) or os.path.islink(file_path):
881 logging.info('os.remove(%s)' % file_path)
882 os.remove(file_path)
883 elif os.path.isdir(file_path):
884 logging.info('gclient_utils.RemoveDirectory(%s)' % file_path)
885 gclient_utils.RemoveDirectory(file_path)
886 else:
887 logging.critical(
888 ('No idea what is %s.\nYou just found a bug in gclient'
889 ', please ping [email protected] ASAP!') % file_path)