blob: 5a1506aedd128d57ef8320e929b836c57bb4ce6e [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):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +000068 @staticmethod
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +000069 def Capture(args, in_directory=None, print_error=True, error_ok=False):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +000070 """Runs git, capturing output sent to stdout as a string.
71
72 Args:
73 args: A sequence of command line parameters to be passed to git.
74 in_directory: The directory where git is to be run.
75
76 Returns:
77 The output sent to stdout as a string.
78 """
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +000079 try:
maruel@chromium.org17d01792010-09-01 18:07:10 +000080 return gclient_utils.CheckCall(['git'] + args, in_directory, print_error)
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +000081 except gclient_utils.CheckCallError:
82 if error_ok:
nasser@codeaurora.orgcd968c12010-02-01 06:05:00 +000083 return ('', '')
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +000084 raise
maruel@chromium.orgd5800f12009-11-12 20:03:43 +000085
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +000086 @staticmethod
msb@chromium.org786fb682010-06-02 15:16:23 +000087 def CaptureStatus(files, upstream_branch=None):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +000088 """Returns git status.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +000089
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +000090 @files can be a string (one file) or a list of files.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +000091
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +000092 Returns an array of (status, file) tuples."""
msb@chromium.org786fb682010-06-02 15:16:23 +000093 if upstream_branch is None:
94 upstream_branch = GIT.GetUpstreamBranch(os.getcwd())
95 if upstream_branch is None:
96 raise Exception("Cannot determine upstream branch")
bauerb@chromium.org14ec5042010-03-30 18:19:09 +000097 command = ["diff", "--name-status", "-r", "%s..." % upstream_branch]
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +000098 if not files:
99 pass
100 elif isinstance(files, basestring):
101 command.append(files)
102 else:
103 command.extend(files)
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000104
maruel@chromium.org7be5ef22010-01-30 22:31:50 +0000105 status = GIT.Capture(command)[0].rstrip()
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000106 results = []
107 if status:
108 for statusline in status.split('\n'):
109 m = re.match('^(\w)\t(.+)$', statusline)
110 if not m:
111 raise Exception("status currently unsupported: %s" % statusline)
112 results.append(('%s ' % m.group(1), m.group(2)))
113 return results
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000114
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000115 @staticmethod
116 def GetEmail(repo_root):
117 """Retrieves the user email address if known."""
118 # We could want to look at the svn cred when it has a svn remote but it
119 # should be fine for now, users should simply configure their git settings.
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000120 return GIT.Capture(['config', 'user.email'],
maruel@chromium.org7be5ef22010-01-30 22:31:50 +0000121 repo_root, error_ok=True)[0].strip()
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000122
123 @staticmethod
124 def ShortBranchName(branch):
125 """Converts a name like 'refs/heads/foo' to just 'foo'."""
126 return branch.replace('refs/heads/', '')
127
128 @staticmethod
129 def GetBranchRef(cwd):
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000130 """Returns the full branch reference, e.g. 'refs/heads/master'."""
maruel@chromium.org7be5ef22010-01-30 22:31:50 +0000131 return GIT.Capture(['symbolic-ref', 'HEAD'], cwd)[0].strip()
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000132
133 @staticmethod
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000134 def GetBranch(cwd):
135 """Returns the short branch name, e.g. 'master'."""
maruel@chromium.orgc308a742009-12-22 18:29:33 +0000136 return GIT.ShortBranchName(GIT.GetBranchRef(cwd))
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000137
138 @staticmethod
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000139 def IsGitSvn(cwd):
140 """Returns true if this repo looks like it's using git-svn."""
141 # If you have any "svn-remote.*" config keys, we think you're using svn.
142 try:
143 GIT.Capture(['config', '--get-regexp', r'^svn-remote\.'], cwd)
144 return True
145 except gclient_utils.CheckCallError:
146 return False
147
148 @staticmethod
149 def GetSVNBranch(cwd):
150 """Returns the svn branch name if found."""
151 # Try to figure out which remote branch we're based on.
152 # Strategy:
153 # 1) find all git-svn branches and note their svn URLs.
154 # 2) iterate through our branch history and match up the URLs.
155
156 # regexp matching the git-svn line that contains the URL.
157 git_svn_re = re.compile(r'^\s*git-svn-id: (\S+)@', re.MULTILINE)
158
159 # Get the refname and svn url for all refs/remotes/*.
160 remotes = GIT.Capture(
161 ['for-each-ref', '--format=%(refname)', 'refs/remotes'],
maruel@chromium.org7be5ef22010-01-30 22:31:50 +0000162 cwd)[0].splitlines()
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000163 svn_refs = {}
164 for ref in remotes:
165 match = git_svn_re.search(
maruel@chromium.org7be5ef22010-01-30 22:31:50 +0000166 GIT.Capture(['cat-file', '-p', ref], cwd)[0])
sky@chromium.org42d8da52010-04-23 18:25:07 +0000167 # Prefer origin/HEAD over all others.
168 if match and (match.group(1) not in svn_refs or
169 ref == "refs/remotes/origin/HEAD"):
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000170 svn_refs[match.group(1)] = ref
171
172 svn_branch = ''
173 if len(svn_refs) == 1:
174 # Only one svn branch exists -- seems like a good candidate.
175 svn_branch = svn_refs.values()[0]
176 elif len(svn_refs) > 1:
177 # We have more than one remote branch available. We don't
178 # want to go through all of history, so read a line from the
179 # pipe at a time.
180 # The -100 is an arbitrary limit so we don't search forever.
181 cmd = ['git', 'log', '-100', '--pretty=medium']
maruel@chromium.org3a292682010-08-23 18:54:55 +0000182 proc = gclient_utils.Popen(cmd, stdout=subprocess.PIPE, cwd=cwd)
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000183 for line in proc.stdout:
184 match = git_svn_re.match(line)
185 if match:
186 url = match.group(1)
187 if url in svn_refs:
188 svn_branch = svn_refs[url]
189 proc.stdout.close() # Cut pipe.
190 break
191 return svn_branch
192
193 @staticmethod
194 def FetchUpstreamTuple(cwd):
195 """Returns a tuple containg remote and remote ref,
196 e.g. 'origin', 'refs/heads/master'
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000197 Tries to be intelligent and understand git-svn.
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000198 """
199 remote = '.'
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000200 branch = GIT.GetBranch(cwd)
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000201 upstream_branch = None
202 upstream_branch = GIT.Capture(
nasser@codeaurora.orgb65040a2010-02-01 16:29:14 +0000203 ['config', 'branch.%s.merge' % branch], in_directory=cwd,
204 error_ok=True)[0].strip()
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000205 if upstream_branch:
206 remote = GIT.Capture(
207 ['config', 'branch.%s.remote' % branch],
nasser@codeaurora.orgb65040a2010-02-01 16:29:14 +0000208 in_directory=cwd, error_ok=True)[0].strip()
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000209 else:
210 # Fall back on trying a git-svn upstream branch.
211 if GIT.IsGitSvn(cwd):
212 upstream_branch = GIT.GetSVNBranch(cwd)
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000213 else:
maruel@chromium.orga630bd72010-04-29 23:32:34 +0000214 # Else, try to guess the origin remote.
215 remote_branches = GIT.Capture(
216 ['branch', '-r'], in_directory=cwd)[0].split()
217 if 'origin/master' in remote_branches:
218 # Fall back on origin/master if it exits.
219 remote = 'origin'
220 upstream_branch = 'refs/heads/master'
221 elif 'origin/trunk' in remote_branches:
222 # Fall back on origin/trunk if it exists. Generally a shared
223 # git-svn clone
224 remote = 'origin'
225 upstream_branch = 'refs/heads/trunk'
226 else:
227 # Give up.
228 remote = None
229 upstream_branch = None
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000230 return remote, upstream_branch
231
232 @staticmethod
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000233 def GetUpstreamBranch(cwd):
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000234 """Gets the current branch's upstream branch."""
235 remote, upstream_branch = GIT.FetchUpstreamTuple(cwd)
maruel@chromium.orga630bd72010-04-29 23:32:34 +0000236 if remote != '.' and upstream_branch:
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000237 upstream_branch = upstream_branch.replace('heads', 'remotes/' + remote)
238 return upstream_branch
239
240 @staticmethod
maruel@chromium.org8ede00e2010-01-12 14:35:28 +0000241 def GenerateDiff(cwd, branch=None, branch_head='HEAD', full_move=False,
242 files=None):
maruel@chromium.orga9371762009-12-22 18:27:38 +0000243 """Diffs against the upstream branch or optionally another branch.
244
245 full_move means that move or copy operations should completely recreate the
246 files, usually in the prospect to apply the patch for a try job."""
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000247 if not branch:
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000248 branch = GIT.GetUpstreamBranch(cwd)
evan@chromium.org400f3e72010-05-19 14:23:36 +0000249 command = ['diff', '-p', '--no-prefix', '--no-ext-diff',
250 branch + "..." + branch_head]
maruel@chromium.orga9371762009-12-22 18:27:38 +0000251 if not full_move:
252 command.append('-C')
maruel@chromium.org8ede00e2010-01-12 14:35:28 +0000253 # TODO(maruel): --binary support.
254 if files:
255 command.append('--')
256 command.extend(files)
maruel@chromium.org7be5ef22010-01-30 22:31:50 +0000257 diff = GIT.Capture(command, cwd)[0].splitlines(True)
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000258 for i in range(len(diff)):
259 # In the case of added files, replace /dev/null with the path to the
260 # file being added.
261 if diff[i].startswith('--- /dev/null'):
262 diff[i] = '--- %s' % diff[i+1][4:]
263 return ''.join(diff)
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000264
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000265 @staticmethod
maruel@chromium.org8ede00e2010-01-12 14:35:28 +0000266 def GetDifferentFiles(cwd, branch=None, branch_head='HEAD'):
267 """Returns the list of modified files between two branches."""
268 if not branch:
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000269 branch = GIT.GetUpstreamBranch(cwd)
bauerb@chromium.org838f0f22010-04-09 17:02:50 +0000270 command = ['diff', '--name-only', branch + "..." + branch_head]
maruel@chromium.org7be5ef22010-01-30 22:31:50 +0000271 return GIT.Capture(command, cwd)[0].splitlines(False)
maruel@chromium.org8ede00e2010-01-12 14:35:28 +0000272
273 @staticmethod
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000274 def GetPatchName(cwd):
275 """Constructs a name for this patch."""
maruel@chromium.org7be5ef22010-01-30 22:31:50 +0000276 short_sha = GIT.Capture(['rev-parse', '--short=4', 'HEAD'], cwd)[0].strip()
maruel@chromium.org862ff8e2010-08-06 15:29:16 +0000277 return "%s#%s" % (GIT.GetBranch(cwd), short_sha)
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000278
279 @staticmethod
maruel@chromium.org01d8c1d2010-01-07 01:56:59 +0000280 def GetCheckoutRoot(path):
281 """Returns the top level directory of a git checkout as an absolute path.
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000282 """
maruel@chromium.org7be5ef22010-01-30 22:31:50 +0000283 root = GIT.Capture(['rev-parse', '--show-cdup'], path)[0].strip()
maruel@chromium.org01d8c1d2010-01-07 01:56:59 +0000284 return os.path.abspath(os.path.join(path, root))
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000285
maruel@chromium.orgd0f854a2010-03-11 19:35:53 +0000286 @staticmethod
287 def AssertVersion(min_version):
288 """Asserts git's version is at least min_version."""
289 def only_int(val):
290 if val.isdigit():
291 return int(val)
292 else:
293 return 0
294 current_version = GIT.Capture(['--version'])[0].split()[-1]
295 current_version_list = map(only_int, current_version.split('.'))
296 for min_ver in map(int, min_version.split('.')):
297 ver = current_version_list.pop(0)
298 if ver < min_ver:
299 return (False, current_version)
300 elif ver > min_ver:
301 return (True, current_version)
302 return (True, current_version)
303
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000304
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000305class SVN(object):
tony@chromium.org57564662010-04-14 02:35:12 +0000306 current_version = None
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000307
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000308 @staticmethod
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000309 def Capture(args, in_directory=None, print_error=True):
310 """Runs svn, capturing output sent to stdout as a string.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000311
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000312 Args:
313 args: A sequence of command line parameters to be passed to svn.
314 in_directory: The directory where svn is to be run.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000315
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000316 Returns:
317 The output sent to stdout as a string.
318 """
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000319 stderr = None
320 if not print_error:
321 stderr = subprocess.PIPE
maruel@chromium.org17d01792010-09-01 18:07:10 +0000322 return gclient_utils.Popen(['svn'] + args, cwd=in_directory,
323 stdout=subprocess.PIPE, stderr=stderr).communicate()[0]
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000324
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000325 @staticmethod
maruel@chromium.org2b9aa8e2010-08-25 20:01:42 +0000326 def RunAndGetFileList(verbose, args, cwd, file_list, stdout=None):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000327 """Runs svn checkout, update, or status, output to stdout.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000328
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000329 The first item in args must be either "checkout", "update", or "status".
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000330
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000331 svn's stdout is parsed to collect a list of files checked out or updated.
332 These files are appended to file_list. svn's stdout is also printed to
333 sys.stdout as in Run.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000334
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000335 Args:
maruel@chromium.org03807072010-08-16 17:18:44 +0000336 verbose: If True, uses verbose output
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000337 args: A sequence of command line parameters to be passed to svn.
maruel@chromium.org2b9aa8e2010-08-25 20:01:42 +0000338 cwd: The directory where svn is to be run.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000339
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000340 Raises:
341 Error: An error occurred while running the svn command.
342 """
maruel@chromium.org2b9aa8e2010-08-25 20:01:42 +0000343 stdout = stdout or sys.stdout
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000344
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000345 # svn update and svn checkout use the same pattern: the first three columns
346 # are for file status, property status, and lock status. This is followed
347 # by two spaces, and then the path to the file.
348 update_pattern = '^... (.*)$'
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000349
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000350 # The first three columns of svn status are the same as for svn update and
351 # svn checkout. The next three columns indicate addition-with-history,
352 # switch, and remote lock status. This is followed by one space, and then
353 # the path to the file.
354 status_pattern = '^...... (.*)$'
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000355
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000356 # args[0] must be a supported command. This will blow up if it's something
357 # else, which is good. Note that the patterns are only effective when
358 # these commands are used in their ordinary forms, the patterns are invalid
359 # for "svn status --show-updates", for example.
360 pattern = {
361 'checkout': update_pattern,
362 'status': status_pattern,
363 'update': update_pattern,
364 }[args[0]]
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000365 compiled_pattern = re.compile(pattern)
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000366 # Place an upper limit.
maruel@chromium.orgfd876172010-04-30 14:01:05 +0000367 for _ in range(10):
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000368 previous_list_len = len(file_list)
369 failure = []
maruel@chromium.org54d1f1a2010-01-08 19:53:47 +0000370
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000371 def CaptureMatchingLines(line):
372 match = compiled_pattern.search(line)
373 if match:
374 file_list.append(match.group(1))
375 if line.startswith('svn: '):
maruel@chromium.org8599aa72010-02-08 20:27:14 +0000376 failure.append(line)
maruel@chromium.org54d1f1a2010-01-08 19:53:47 +0000377
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000378 try:
maruel@chromium.org17d01792010-09-01 18:07:10 +0000379 gclient_utils.CheckCallAndFilterAndHeader(
380 ['svn'] + args,
381 cwd=cwd,
382 always=verbose,
383 filter_fn=CaptureMatchingLines,
384 stdout=stdout)
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000385 except gclient_utils.Error:
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000386 def IsKnownFailure():
387 for x in failure:
388 if (x.startswith('svn: OPTIONS of') or
389 x.startswith('svn: PROPFIND of') or
390 x.startswith('svn: REPORT of') or
maruel@chromium.orgf61fc932010-08-19 13:05:24 +0000391 x.startswith('svn: Unknown hostname') or
392 x.startswith('svn: Server sent unexpected return value')):
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000393 return True
394 return False
395
maruel@chromium.org953586a2010-06-15 14:22:24 +0000396 # Subversion client is really misbehaving with Google Code.
397 if args[0] == 'checkout':
398 # Ensure at least one file was checked out, otherwise *delete* the
399 # directory.
400 if len(file_list) == previous_list_len:
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000401 if not IsKnownFailure():
maruel@chromium.org953586a2010-06-15 14:22:24 +0000402 # No known svn error was found, bail out.
403 raise
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000404 # No file were checked out, so make sure the directory is
405 # deleted in case it's messed up and try again.
406 # Warning: It's bad, it assumes args[2] is the directory
407 # argument.
408 if os.path.isdir(args[2]):
409 gclient_utils.RemoveDirectory(args[2])
maruel@chromium.org953586a2010-06-15 14:22:24 +0000410 else:
411 # Progress was made, convert to update since an aborted checkout
412 # is now an update.
maruel@chromium.org2de10252010-02-08 01:10:39 +0000413 args = ['update'] + args[1:]
maruel@chromium.org953586a2010-06-15 14:22:24 +0000414 else:
415 # It was an update or export.
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000416 # We enforce that some progress has been made or a known failure.
417 if len(file_list) == previous_list_len and not IsKnownFailure():
418 # No known svn error was found and no progress, bail out.
419 raise
maruel@chromium.org953586a2010-06-15 14:22:24 +0000420 print "Sleeping 15 seconds and retrying...."
421 time.sleep(15)
422 continue
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000423 break
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000424
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000425 @staticmethod
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000426 def CaptureInfo(relpath, in_directory=None, print_error=True):
427 """Returns a dictionary from the svn info output for the given file.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000428
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000429 Args:
430 relpath: The directory where the working copy resides relative to
431 the directory given by in_directory.
432 in_directory: The directory where svn is to be run.
433 """
434 output = SVN.Capture(["info", "--xml", relpath], in_directory, print_error)
435 dom = gclient_utils.ParseXML(output)
436 result = {}
437 if dom:
438 GetNamedNodeText = gclient_utils.GetNamedNodeText
439 GetNodeNamedAttributeText = gclient_utils.GetNodeNamedAttributeText
440 def C(item, f):
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000441 if item is not None:
442 return f(item)
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000443 # /info/entry/
444 # url
445 # reposityory/(root|uuid)
446 # wc-info/(schedule|depth)
447 # commit/(author|date)
448 # str() the results because they may be returned as Unicode, which
449 # interferes with the higher layers matching up things in the deps
450 # dictionary.
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000451 result['Repository Root'] = C(GetNamedNodeText(dom, 'root'), str)
452 result['URL'] = C(GetNamedNodeText(dom, 'url'), str)
453 result['UUID'] = C(GetNamedNodeText(dom, 'uuid'), str)
454 result['Revision'] = C(GetNodeNamedAttributeText(dom, 'entry',
455 'revision'),
456 int)
457 result['Node Kind'] = C(GetNodeNamedAttributeText(dom, 'entry', 'kind'),
458 str)
459 # Differs across versions.
460 if result['Node Kind'] == 'dir':
461 result['Node Kind'] = 'directory'
462 result['Schedule'] = C(GetNamedNodeText(dom, 'schedule'), str)
463 result['Path'] = C(GetNodeNamedAttributeText(dom, 'entry', 'path'), str)
464 result['Copied From URL'] = C(GetNamedNodeText(dom, 'copy-from-url'), str)
465 result['Copied From Rev'] = C(GetNamedNodeText(dom, 'copy-from-rev'), str)
466 return result
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000467
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000468 @staticmethod
469 def CaptureHeadRevision(url):
470 """Get the head revision of a SVN repository.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000471
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000472 Returns:
473 Int head revision
474 """
475 info = SVN.Capture(["info", "--xml", url], os.getcwd())
476 dom = xml.dom.minidom.parseString(info)
477 return dom.getElementsByTagName('entry')[0].getAttribute('revision')
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000478
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000479 @staticmethod
nasser@codeaurora.org5d63eb82010-03-24 23:22:09 +0000480 def CaptureBaseRevision(cwd):
481 """Get the base revision of a SVN repository.
482
483 Returns:
484 Int base revision
485 """
486 info = SVN.Capture(["info", "--xml"], cwd)
487 dom = xml.dom.minidom.parseString(info)
488 return dom.getElementsByTagName('entry')[0].getAttribute('revision')
489
490 @staticmethod
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000491 def CaptureStatus(files):
492 """Returns the svn 1.5 svn status emulated output.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000493
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000494 @files can be a string (one file) or a list of files.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000495
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000496 Returns an array of (status, file) tuples."""
497 command = ["status", "--xml"]
498 if not files:
499 pass
500 elif isinstance(files, basestring):
501 command.append(files)
502 else:
503 command.extend(files)
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000504
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000505 status_letter = {
506 None: ' ',
507 '': ' ',
508 'added': 'A',
509 'conflicted': 'C',
510 'deleted': 'D',
511 'external': 'X',
512 'ignored': 'I',
513 'incomplete': '!',
514 'merged': 'G',
515 'missing': '!',
516 'modified': 'M',
517 'none': ' ',
518 'normal': ' ',
519 'obstructed': '~',
520 'replaced': 'R',
521 'unversioned': '?',
522 }
523 dom = gclient_utils.ParseXML(SVN.Capture(command))
524 results = []
525 if dom:
526 # /status/target/entry/(wc-status|commit|author|date)
527 for target in dom.getElementsByTagName('target'):
528 #base_path = target.getAttribute('path')
529 for entry in target.getElementsByTagName('entry'):
530 file_path = entry.getAttribute('path')
531 wc_status = entry.getElementsByTagName('wc-status')
532 assert len(wc_status) == 1
533 # Emulate svn 1.5 status ouput...
534 statuses = [' '] * 7
535 # Col 0
536 xml_item_status = wc_status[0].getAttribute('item')
537 if xml_item_status in status_letter:
538 statuses[0] = status_letter[xml_item_status]
539 else:
540 raise Exception('Unknown item status "%s"; please implement me!' %
541 xml_item_status)
542 # Col 1
543 xml_props_status = wc_status[0].getAttribute('props')
544 if xml_props_status == 'modified':
545 statuses[1] = 'M'
546 elif xml_props_status == 'conflicted':
547 statuses[1] = 'C'
548 elif (not xml_props_status or xml_props_status == 'none' or
549 xml_props_status == 'normal'):
550 pass
551 else:
552 raise Exception('Unknown props status "%s"; please implement me!' %
553 xml_props_status)
554 # Col 2
555 if wc_status[0].getAttribute('wc-locked') == 'true':
556 statuses[2] = 'L'
557 # Col 3
558 if wc_status[0].getAttribute('copied') == 'true':
559 statuses[3] = '+'
560 # Col 4
561 if wc_status[0].getAttribute('switched') == 'true':
562 statuses[4] = 'S'
563 # TODO(maruel): Col 5 and 6
564 item = (''.join(statuses), file_path)
565 results.append(item)
566 return results
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000567
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000568 @staticmethod
569 def IsMoved(filename):
570 """Determine if a file has been added through svn mv"""
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000571 return SVN.IsMovedInfo(SVN.CaptureInfo(filename))
572
573 @staticmethod
574 def IsMovedInfo(info):
575 """Determine if a file has been added through svn mv"""
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000576 return (info.get('Copied From URL') and
577 info.get('Copied From Rev') and
578 info.get('Schedule') == 'add')
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000579
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000580 @staticmethod
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000581 def GetFileProperty(filename, property_name):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000582 """Returns the value of an SVN property for the given file.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000583
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000584 Args:
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000585 filename: The file to check
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000586 property_name: The name of the SVN property, e.g. "svn:mime-type"
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000587
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000588 Returns:
589 The value of the property, which will be the empty string if the property
590 is not set on the file. If the file is not under version control, the
591 empty string is also returned.
592 """
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000593 output = SVN.Capture(["propget", property_name, filename])
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000594 if (output.startswith("svn: ") and
595 output.endswith("is not under version control")):
596 return ""
597 else:
598 return output
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000599
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000600 @staticmethod
maruel@chromium.org1c7db8e2010-01-07 02:00:19 +0000601 def DiffItem(filename, full_move=False, revision=None):
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000602 """Diffs a single file.
603
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000604 Should be simple, eh? No it isn't.
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000605 Be sure to be in the appropriate directory before calling to have the
maruel@chromium.orga9371762009-12-22 18:27:38 +0000606 expected relative path.
607 full_move means that move or copy operations should completely recreate the
608 files, usually in the prospect to apply the patch for a try job."""
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000609 # If the user specified a custom diff command in their svn config file,
610 # then it'll be used when we do svn diff, which we don't want to happen
611 # since we want the unified diff. Using --diff-cmd=diff doesn't always
612 # work, since they can have another diff executable in their path that
613 # gives different line endings. So we use a bogus temp directory as the
614 # config directory, which gets around these problems.
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000615 bogus_dir = tempfile.mkdtemp()
616 try:
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000617 # Use "svn info" output instead of os.path.isdir because the latter fails
618 # when the file is deleted.
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000619 return SVN._DiffItemInternal(filename, SVN.CaptureInfo(filename),
620 bogus_dir,
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000621 full_move=full_move, revision=revision)
622 finally:
623 shutil.rmtree(bogus_dir)
624
625 @staticmethod
626 def _DiffItemInternal(filename, info, bogus_dir, full_move=False,
627 revision=None):
628 """Grabs the diff data."""
629 command = ["diff", "--config-dir", bogus_dir, filename]
630 if revision:
631 command.extend(['--revision', revision])
632 data = None
633 if SVN.IsMovedInfo(info):
634 if full_move:
635 if info.get("Node Kind") == "directory":
636 # Things become tricky here. It's a directory copy/move. We need to
637 # diff all the files inside it.
638 # This will put a lot of pressure on the heap. This is why StringIO
639 # is used and converted back into a string at the end. The reason to
640 # return a string instead of a StringIO is that StringIO.write()
641 # doesn't accept a StringIO object. *sigh*.
642 for (dirpath, dirnames, filenames) in os.walk(filename):
643 # Cleanup all files starting with a '.'.
644 for d in dirnames:
645 if d.startswith('.'):
646 dirnames.remove(d)
647 for f in filenames:
648 if f.startswith('.'):
649 filenames.remove(f)
650 for f in filenames:
651 if data is None:
652 data = cStringIO.StringIO()
653 data.write(GenFakeDiff(os.path.join(dirpath, f)))
654 if data:
655 tmp = data.getvalue()
656 data.close()
657 data = tmp
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000658 else:
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000659 data = GenFakeDiff(filename)
660 else:
661 if info.get("Node Kind") != "directory":
maruel@chromium.org0836c562010-01-22 01:10:06 +0000662 # svn diff on a mv/cp'd file outputs nothing if there was no change.
663 data = SVN.Capture(command, None)
664 if not data:
665 # We put in an empty Index entry so upload.py knows about them.
maruel@chromium.orgc6d170e2010-06-03 00:06:00 +0000666 data = "Index: %s\n" % filename.replace(os.sep, '/')
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000667 # Otherwise silently ignore directories.
668 else:
669 if info.get("Node Kind") != "directory":
670 # Normal simple case.
maruel@chromium.org0836c562010-01-22 01:10:06 +0000671 data = SVN.Capture(command, None)
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000672 # Otherwise silently ignore directories.
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000673 return data
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000674
675 @staticmethod
maruel@chromium.org1c7db8e2010-01-07 02:00:19 +0000676 def GenerateDiff(filenames, root=None, full_move=False, revision=None):
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000677 """Returns a string containing the diff for the given file list.
678
679 The files in the list should either be absolute paths or relative to the
680 given root. If no root directory is provided, the repository root will be
681 used.
682 The diff will always use relative paths.
683 """
684 previous_cwd = os.getcwd()
maruel@chromium.orgfd9cbbb2010-01-08 23:04:03 +0000685 root = root or SVN.GetCheckoutRoot(previous_cwd)
686 root = os.path.normcase(os.path.join(root, ''))
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000687 def RelativePath(path, root):
688 """We must use relative paths."""
maruel@chromium.orgfd9cbbb2010-01-08 23:04:03 +0000689 if os.path.normcase(path).startswith(root):
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000690 return path[len(root):]
691 return path
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000692 # If the user specified a custom diff command in their svn config file,
693 # then it'll be used when we do svn diff, which we don't want to happen
694 # since we want the unified diff. Using --diff-cmd=diff doesn't always
695 # work, since they can have another diff executable in their path that
696 # gives different line endings. So we use a bogus temp directory as the
697 # config directory, which gets around these problems.
698 bogus_dir = tempfile.mkdtemp()
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000699 try:
700 os.chdir(root)
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000701 # Cleanup filenames
702 filenames = [RelativePath(f, root) for f in filenames]
703 # Get information about the modified items (files and directories)
704 data = dict([(f, SVN.CaptureInfo(f)) for f in filenames])
gavinp@google.com3fda4cc2010-06-29 13:29:27 +0000705 diffs = []
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000706 if full_move:
707 # Eliminate modified files inside moved/copied directory.
708 for (filename, info) in data.iteritems():
709 if SVN.IsMovedInfo(info) and info.get("Node Kind") == "directory":
710 # Remove files inside the directory.
711 filenames = [f for f in filenames
712 if not f.startswith(filename + os.path.sep)]
713 for filename in data.keys():
714 if not filename in filenames:
715 # Remove filtered out items.
716 del data[filename]
gavinp@google.com3fda4cc2010-06-29 13:29:27 +0000717 else:
718 metaheaders = []
719 for (filename, info) in data.iteritems():
720 if SVN.IsMovedInfo(info):
721 # for now, the most common case is a head copy,
722 # so let's just encode that as a straight up cp.
723 srcurl = info.get('Copied From URL')
724 root = info.get('Repository Root')
725 rev = int(info.get('Copied From Rev'))
726 assert srcurl.startswith(root)
727 src = srcurl[len(root)+1:]
728 srcinfo = SVN.CaptureInfo(srcurl)
729 if (srcinfo.get('Revision') != rev and
730 SVN.Capture(['diff', '-r', '%d:head' % rev, srcurl])):
731 metaheaders.append("#$ svn cp -r %d %s %s "
732 "### WARNING: note non-trunk copy\n" %
733 (rev, src, filename))
734 else:
735 metaheaders.append("#$ cp %s %s\n" % (src,
736 filename))
737
738 if metaheaders:
739 diffs.append("### BEGIN SVN COPY METADATA\n")
740 diffs.extend(metaheaders)
741 diffs.append("### END SVN COPY METADATA\n")
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000742 # Now ready to do the actual diff.
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000743 for filename in sorted(data.iterkeys()):
744 diffs.append(SVN._DiffItemInternal(filename, data[filename], bogus_dir,
745 full_move=full_move,
746 revision=revision))
747 # Use StringIO since it can be messy when diffing a directory move with
748 # full_move=True.
749 buf = cStringIO.StringIO()
750 for d in filter(None, diffs):
751 buf.write(d)
752 result = buf.getvalue()
753 buf.close()
754 return result
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000755 finally:
756 os.chdir(previous_cwd)
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000757 shutil.rmtree(bogus_dir)
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000758
759 @staticmethod
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000760 def GetEmail(repo_root):
761 """Retrieves the svn account which we assume is an email address."""
762 infos = SVN.CaptureInfo(repo_root)
763 uuid = infos.get('UUID')
764 root = infos.get('Repository Root')
765 if not root:
766 return None
767
768 # Should check for uuid but it is incorrectly saved for https creds.
769 realm = root.rsplit('/', 1)[0]
770 if root.startswith('https') or not uuid:
771 regexp = re.compile(r'<%s:\d+>.*' % realm)
772 else:
773 regexp = re.compile(r'<%s:\d+> %s' % (realm, uuid))
774 if regexp is None:
775 return None
776 if sys.platform.startswith('win'):
777 if not 'APPDATA' in os.environ:
778 return None
maruel@chromium.org720d9f32009-11-21 17:38:57 +0000779 auth_dir = os.path.join(os.environ['APPDATA'], 'Subversion', 'auth',
780 'svn.simple')
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000781 else:
782 if not 'HOME' in os.environ:
783 return None
784 auth_dir = os.path.join(os.environ['HOME'], '.subversion', 'auth',
785 'svn.simple')
786 for credfile in os.listdir(auth_dir):
787 cred_info = SVN.ReadSimpleAuth(os.path.join(auth_dir, credfile))
788 if regexp.match(cred_info.get('svn:realmstring')):
789 return cred_info.get('username')
790
791 @staticmethod
792 def ReadSimpleAuth(filename):
793 f = open(filename, 'r')
794 values = {}
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000795 def ReadOneItem(item_type):
796 m = re.match(r'%s (\d+)' % item_type, f.readline())
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000797 if not m:
798 return None
799 data = f.read(int(m.group(1)))
800 if f.read(1) != '\n':
801 return None
802 return data
803
804 while True:
805 key = ReadOneItem('K')
806 if not key:
807 break
808 value = ReadOneItem('V')
809 if not value:
810 break
811 values[key] = value
812 return values
maruel@chromium.org94b1ee92009-12-19 20:27:20 +0000813
814 @staticmethod
815 def GetCheckoutRoot(directory):
816 """Returns the top level directory of the current repository.
817
818 The directory is returned as an absolute path.
819 """
maruel@chromium.orgf7ae6d52009-12-22 20:49:04 +0000820 directory = os.path.abspath(directory)
maruel@chromium.org94b1ee92009-12-19 20:27:20 +0000821 infos = SVN.CaptureInfo(directory, print_error=False)
822 cur_dir_repo_root = infos.get("Repository Root")
823 if not cur_dir_repo_root:
824 return None
825
826 while True:
827 parent = os.path.dirname(directory)
828 if (SVN.CaptureInfo(parent, print_error=False).get(
829 "Repository Root") != cur_dir_repo_root):
830 break
831 directory = parent
maruel@chromium.orgfd9cbbb2010-01-08 23:04:03 +0000832 return GetCasedPath(directory)
tony@chromium.org57564662010-04-14 02:35:12 +0000833
834 @staticmethod
835 def AssertVersion(min_version):
836 """Asserts svn's version is at least min_version."""
837 def only_int(val):
838 if val.isdigit():
839 return int(val)
840 else:
841 return 0
842 if not SVN.current_version:
843 SVN.current_version = SVN.Capture(['--version']).split()[2]
844 current_version_list = map(only_int, SVN.current_version.split('.'))
845 for min_ver in map(int, min_version.split('.')):
846 ver = current_version_list.pop(0)
847 if ver < min_ver:
848 return (False, SVN.current_version)
849 elif ver > min_ver:
850 return (True, SVN.current_version)
851 return (True, SVN.current_version)