blob: fadf7f3bedc46c623490ca974cc57538453945dc [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.org54019f32010-09-09 13:50:11 +0000309 def Capture(args, **kwargs):
310 """Always redirect stderr.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000311
maruel@chromium.org54019f32010-09-09 13:50:11 +0000312 Throws an exception if non-0 is returned."""
313 return gclient_utils.CheckCall(['svn'] + args, print_error=False,
314 **kwargs)[0]
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000315
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000316 @staticmethod
maruel@chromium.org2b9aa8e2010-08-25 20:01:42 +0000317 def RunAndGetFileList(verbose, args, cwd, file_list, stdout=None):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000318 """Runs svn checkout, update, or status, output to stdout.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000319
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000320 The first item in args must be either "checkout", "update", or "status".
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000321
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000322 svn's stdout is parsed to collect a list of files checked out or updated.
323 These files are appended to file_list. svn's stdout is also printed to
324 sys.stdout as in Run.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000325
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000326 Args:
maruel@chromium.org03807072010-08-16 17:18:44 +0000327 verbose: If True, uses verbose output
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000328 args: A sequence of command line parameters to be passed to svn.
maruel@chromium.org2b9aa8e2010-08-25 20:01:42 +0000329 cwd: The directory where svn is to be run.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000330
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000331 Raises:
332 Error: An error occurred while running the svn command.
333 """
maruel@chromium.org2b9aa8e2010-08-25 20:01:42 +0000334 stdout = stdout or sys.stdout
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000335
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000336 # svn update and svn checkout use the same pattern: the first three columns
337 # are for file status, property status, and lock status. This is followed
338 # by two spaces, and then the path to the file.
339 update_pattern = '^... (.*)$'
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000340
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000341 # The first three columns of svn status are the same as for svn update and
342 # svn checkout. The next three columns indicate addition-with-history,
343 # switch, and remote lock status. This is followed by one space, and then
344 # the path to the file.
345 status_pattern = '^...... (.*)$'
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000346
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000347 # args[0] must be a supported command. This will blow up if it's something
348 # else, which is good. Note that the patterns are only effective when
349 # these commands are used in their ordinary forms, the patterns are invalid
350 # for "svn status --show-updates", for example.
351 pattern = {
352 'checkout': update_pattern,
353 'status': status_pattern,
354 'update': update_pattern,
355 }[args[0]]
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000356 compiled_pattern = re.compile(pattern)
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000357 # Place an upper limit.
cbentzel@chromium.org2aee2292010-09-03 14:15:25 +0000358 backoff_time = 5
maruel@chromium.orgfd876172010-04-30 14:01:05 +0000359 for _ in range(10):
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000360 previous_list_len = len(file_list)
361 failure = []
maruel@chromium.org54d1f1a2010-01-08 19:53:47 +0000362
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000363 def CaptureMatchingLines(line):
364 match = compiled_pattern.search(line)
365 if match:
366 file_list.append(match.group(1))
367 if line.startswith('svn: '):
maruel@chromium.org8599aa72010-02-08 20:27:14 +0000368 failure.append(line)
maruel@chromium.org54d1f1a2010-01-08 19:53:47 +0000369
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000370 try:
maruel@chromium.org17d01792010-09-01 18:07:10 +0000371 gclient_utils.CheckCallAndFilterAndHeader(
372 ['svn'] + args,
373 cwd=cwd,
374 always=verbose,
375 filter_fn=CaptureMatchingLines,
376 stdout=stdout)
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000377 except gclient_utils.Error:
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000378 def IsKnownFailure():
379 for x in failure:
380 if (x.startswith('svn: OPTIONS of') or
381 x.startswith('svn: PROPFIND of') or
382 x.startswith('svn: REPORT of') or
maruel@chromium.orgf61fc932010-08-19 13:05:24 +0000383 x.startswith('svn: Unknown hostname') or
384 x.startswith('svn: Server sent unexpected return value')):
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000385 return True
386 return False
387
maruel@chromium.org953586a2010-06-15 14:22:24 +0000388 # Subversion client is really misbehaving with Google Code.
389 if args[0] == 'checkout':
390 # Ensure at least one file was checked out, otherwise *delete* the
391 # directory.
392 if len(file_list) == previous_list_len:
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000393 if not IsKnownFailure():
maruel@chromium.org953586a2010-06-15 14:22:24 +0000394 # No known svn error was found, bail out.
395 raise
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000396 # No file were checked out, so make sure the directory is
397 # deleted in case it's messed up and try again.
398 # Warning: It's bad, it assumes args[2] is the directory
399 # argument.
400 if os.path.isdir(args[2]):
401 gclient_utils.RemoveDirectory(args[2])
maruel@chromium.org953586a2010-06-15 14:22:24 +0000402 else:
403 # Progress was made, convert to update since an aborted checkout
404 # is now an update.
maruel@chromium.org2de10252010-02-08 01:10:39 +0000405 args = ['update'] + args[1:]
maruel@chromium.org953586a2010-06-15 14:22:24 +0000406 else:
407 # It was an update or export.
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000408 # We enforce that some progress has been made or a known failure.
409 if len(file_list) == previous_list_len and not IsKnownFailure():
410 # No known svn error was found and no progress, bail out.
411 raise
cbentzel@chromium.org2aee2292010-09-03 14:15:25 +0000412 print "Sleeping %.1f seconds and retrying...." % backoff_time
413 time.sleep(backoff_time)
414 backoff_time *= 1.3
maruel@chromium.org953586a2010-06-15 14:22:24 +0000415 continue
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000416 break
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000417
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000418 @staticmethod
maruel@chromium.org54019f32010-09-09 13:50:11 +0000419 def CaptureInfo(cwd):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000420 """Returns a dictionary from the svn info output for the given file.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000421
maruel@chromium.org54019f32010-09-09 13:50:11 +0000422 Throws an exception if svn info fails."""
423 output = SVN.Capture(['info', '--xml', cwd])
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000424 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):
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000430 if item is not None:
431 return f(item)
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000432 # /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.
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000440 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
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000456
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000457 @staticmethod
maruel@chromium.org54019f32010-09-09 13:50:11 +0000458 def CaptureRevision(cwd):
nasser@codeaurora.org5d63eb82010-03-24 23:22:09 +0000459 """Get the base revision of a SVN repository.
460
461 Returns:
462 Int base revision
463 """
maruel@chromium.org54019f32010-09-09 13:50:11 +0000464 info = SVN.Capture(['info', '--xml'], cwd=cwd)
nasser@codeaurora.org5d63eb82010-03-24 23:22:09 +0000465 dom = xml.dom.minidom.parseString(info)
466 return dom.getElementsByTagName('entry')[0].getAttribute('revision')
467
468 @staticmethod
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000469 def CaptureStatus(files):
470 """Returns the svn 1.5 svn status emulated output.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000471
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000472 @files can be a string (one file) or a list of files.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000473
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000474 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)
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000482
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000483 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:
maruel@chromium.org54019f32010-09-09 13:50:11 +0000518 raise gclient_utils.Error(
519 'Unknown item status "%s"; please implement me!' %
520 xml_item_status)
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000521 # 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:
maruel@chromium.org54019f32010-09-09 13:50:11 +0000531 raise gclient_utils.Error(
532 'Unknown props status "%s"; please implement me!' %
533 xml_props_status)
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000534 # 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
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000547
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000548 @staticmethod
549 def IsMoved(filename):
550 """Determine if a file has been added through svn mv"""
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000551 return SVN.IsMovedInfo(SVN.CaptureInfo(filename))
552
553 @staticmethod
554 def IsMovedInfo(info):
555 """Determine if a file has been added through svn mv"""
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000556 return (info.get('Copied From URL') and
557 info.get('Copied From Rev') and
558 info.get('Schedule') == 'add')
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000559
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000560 @staticmethod
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000561 def GetFileProperty(filename, property_name):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000562 """Returns the value of an SVN property for the given file.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000563
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000564 Args:
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000565 filename: The file to check
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000566 property_name: The name of the SVN property, e.g. "svn:mime-type"
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000567
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000568 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 """
maruel@chromium.org54019f32010-09-09 13:50:11 +0000573 try:
574 return SVN.Capture(['propget', property_name, filename])
575 except gclient_utils.Error:
576 return ''
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000577
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000578 @staticmethod
maruel@chromium.org1c7db8e2010-01-07 02:00:19 +0000579 def DiffItem(filename, full_move=False, revision=None):
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000580 """Diffs a single file.
581
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000582 Should be simple, eh? No it isn't.
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000583 Be sure to be in the appropriate directory before calling to have the
maruel@chromium.orga9371762009-12-22 18:27:38 +0000584 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."""
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000587 # 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.
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000593 bogus_dir = tempfile.mkdtemp()
594 try:
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000595 # Use "svn info" output instead of os.path.isdir because the latter fails
596 # when the file is deleted.
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000597 return SVN._DiffItemInternal(filename, SVN.CaptureInfo(filename),
598 bogus_dir,
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000599 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
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000636 else:
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000637 data = GenFakeDiff(filename)
638 else:
639 if info.get("Node Kind") != "directory":
maruel@chromium.org0836c562010-01-22 01:10:06 +0000640 # svn diff on a mv/cp'd file outputs nothing if there was no change.
maruel@chromium.org54019f32010-09-09 13:50:11 +0000641 data = SVN.Capture(command)
maruel@chromium.org0836c562010-01-22 01:10:06 +0000642 if not data:
643 # We put in an empty Index entry so upload.py knows about them.
maruel@chromium.orgc6d170e2010-06-03 00:06:00 +0000644 data = "Index: %s\n" % filename.replace(os.sep, '/')
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000645 # Otherwise silently ignore directories.
646 else:
647 if info.get("Node Kind") != "directory":
648 # Normal simple case.
maruel@chromium.org54019f32010-09-09 13:50:11 +0000649 data = SVN.Capture(command)
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000650 # Otherwise silently ignore directories.
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000651 return data
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000652
653 @staticmethod
maruel@chromium.org1c7db8e2010-01-07 02:00:19 +0000654 def GenerateDiff(filenames, root=None, full_move=False, revision=None):
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000655 """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 """
662 previous_cwd = os.getcwd()
maruel@chromium.orgfd9cbbb2010-01-08 23:04:03 +0000663 root = root or SVN.GetCheckoutRoot(previous_cwd)
664 root = os.path.normcase(os.path.join(root, ''))
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000665 def RelativePath(path, root):
666 """We must use relative paths."""
maruel@chromium.orgfd9cbbb2010-01-08 23:04:03 +0000667 if os.path.normcase(path).startswith(root):
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000668 return path[len(root):]
669 return path
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000670 # If the user specified a custom diff command in their svn config file,
671 # then it'll be used when we do svn diff, which we don't want to happen
672 # since we want the unified diff. Using --diff-cmd=diff doesn't always
673 # work, since they can have another diff executable in their path that
674 # gives different line endings. So we use a bogus temp directory as the
675 # config directory, which gets around these problems.
676 bogus_dir = tempfile.mkdtemp()
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000677 try:
678 os.chdir(root)
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000679 # Cleanup filenames
680 filenames = [RelativePath(f, root) for f in filenames]
681 # Get information about the modified items (files and directories)
682 data = dict([(f, SVN.CaptureInfo(f)) for f in filenames])
gavinp@google.com3fda4cc2010-06-29 13:29:27 +0000683 diffs = []
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000684 if full_move:
685 # Eliminate modified files inside moved/copied directory.
686 for (filename, info) in data.iteritems():
687 if SVN.IsMovedInfo(info) and info.get("Node Kind") == "directory":
688 # Remove files inside the directory.
689 filenames = [f for f in filenames
690 if not f.startswith(filename + os.path.sep)]
691 for filename in data.keys():
692 if not filename in filenames:
693 # Remove filtered out items.
694 del data[filename]
gavinp@google.com3fda4cc2010-06-29 13:29:27 +0000695 else:
696 metaheaders = []
697 for (filename, info) in data.iteritems():
698 if SVN.IsMovedInfo(info):
699 # for now, the most common case is a head copy,
700 # so let's just encode that as a straight up cp.
701 srcurl = info.get('Copied From URL')
702 root = info.get('Repository Root')
703 rev = int(info.get('Copied From Rev'))
704 assert srcurl.startswith(root)
705 src = srcurl[len(root)+1:]
706 srcinfo = SVN.CaptureInfo(srcurl)
707 if (srcinfo.get('Revision') != rev and
708 SVN.Capture(['diff', '-r', '%d:head' % rev, srcurl])):
709 metaheaders.append("#$ svn cp -r %d %s %s "
710 "### WARNING: note non-trunk copy\n" %
711 (rev, src, filename))
712 else:
713 metaheaders.append("#$ cp %s %s\n" % (src,
714 filename))
715
716 if metaheaders:
717 diffs.append("### BEGIN SVN COPY METADATA\n")
718 diffs.extend(metaheaders)
719 diffs.append("### END SVN COPY METADATA\n")
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000720 # Now ready to do the actual diff.
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000721 for filename in sorted(data.iterkeys()):
722 diffs.append(SVN._DiffItemInternal(filename, data[filename], bogus_dir,
723 full_move=full_move,
724 revision=revision))
725 # Use StringIO since it can be messy when diffing a directory move with
726 # full_move=True.
727 buf = cStringIO.StringIO()
728 for d in filter(None, diffs):
729 buf.write(d)
730 result = buf.getvalue()
731 buf.close()
732 return result
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000733 finally:
734 os.chdir(previous_cwd)
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000735 shutil.rmtree(bogus_dir)
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000736
737 @staticmethod
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000738 def GetEmail(repo_root):
739 """Retrieves the svn account which we assume is an email address."""
maruel@chromium.org54019f32010-09-09 13:50:11 +0000740 try:
741 infos = SVN.CaptureInfo(repo_root)
742 except gclient_utils.Error:
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000743 return None
744
745 # Should check for uuid but it is incorrectly saved for https creds.
maruel@chromium.org54019f32010-09-09 13:50:11 +0000746 root = infos['Repository Root']
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000747 realm = root.rsplit('/', 1)[0]
maruel@chromium.org54019f32010-09-09 13:50:11 +0000748 uuid = infos['UUID']
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000749 if root.startswith('https') or not uuid:
750 regexp = re.compile(r'<%s:\d+>.*' % realm)
751 else:
752 regexp = re.compile(r'<%s:\d+> %s' % (realm, uuid))
753 if regexp is None:
754 return None
755 if sys.platform.startswith('win'):
756 if not 'APPDATA' in os.environ:
757 return None
maruel@chromium.org720d9f32009-11-21 17:38:57 +0000758 auth_dir = os.path.join(os.environ['APPDATA'], 'Subversion', 'auth',
759 'svn.simple')
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000760 else:
761 if not 'HOME' in os.environ:
762 return None
763 auth_dir = os.path.join(os.environ['HOME'], '.subversion', 'auth',
764 'svn.simple')
765 for credfile in os.listdir(auth_dir):
766 cred_info = SVN.ReadSimpleAuth(os.path.join(auth_dir, credfile))
767 if regexp.match(cred_info.get('svn:realmstring')):
768 return cred_info.get('username')
769
770 @staticmethod
771 def ReadSimpleAuth(filename):
772 f = open(filename, 'r')
773 values = {}
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000774 def ReadOneItem(item_type):
775 m = re.match(r'%s (\d+)' % item_type, f.readline())
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000776 if not m:
777 return None
778 data = f.read(int(m.group(1)))
779 if f.read(1) != '\n':
780 return None
781 return data
782
783 while True:
784 key = ReadOneItem('K')
785 if not key:
786 break
787 value = ReadOneItem('V')
788 if not value:
789 break
790 values[key] = value
791 return values
maruel@chromium.org94b1ee92009-12-19 20:27:20 +0000792
793 @staticmethod
794 def GetCheckoutRoot(directory):
795 """Returns the top level directory of the current repository.
796
797 The directory is returned as an absolute path.
798 """
maruel@chromium.orgf7ae6d52009-12-22 20:49:04 +0000799 directory = os.path.abspath(directory)
maruel@chromium.org54019f32010-09-09 13:50:11 +0000800 try:
801 cur_dir_repo_root = SVN.CaptureInfo(directory)['Repository Root']
802 except gclient_utils.Error:
maruel@chromium.org94b1ee92009-12-19 20:27:20 +0000803 return None
maruel@chromium.org94b1ee92009-12-19 20:27:20 +0000804 while True:
805 parent = os.path.dirname(directory)
maruel@chromium.org54019f32010-09-09 13:50:11 +0000806 try:
807 if SVN.CaptureInfo(parent)['Repository Root'] != cur_dir_repo_root:
808 break
809 except gclient_utils.Error:
maruel@chromium.org94b1ee92009-12-19 20:27:20 +0000810 break
811 directory = parent
maruel@chromium.orgfd9cbbb2010-01-08 23:04:03 +0000812 return GetCasedPath(directory)
tony@chromium.org57564662010-04-14 02:35:12 +0000813
814 @staticmethod
815 def AssertVersion(min_version):
816 """Asserts svn's version is at least min_version."""
817 def only_int(val):
818 if val.isdigit():
819 return int(val)
820 else:
821 return 0
822 if not SVN.current_version:
823 SVN.current_version = SVN.Capture(['--version']).split()[2]
824 current_version_list = map(only_int, SVN.current_version.split('.'))
825 for min_ver in map(int, min_version.split('.')):
826 ver = current_version_list.pop(0)
827 if ver < min_ver:
828 return (False, SVN.current_version)
829 elif ver > min_ver:
830 return (True, SVN.current_version)
831 return (True, SVN.current_version)