blob: 8bd0ba3a61ca3aa667aa224360546ca44e7f4904 [file] [log] [blame]
maruel@chromium.orgda64d632011-09-08 17:41:15 +00001# Copyright (c) 2011 The Chromium Authors. All rights reserved.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +00002# 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.org07ab60e2011-02-08 21:54:00 +00009import logging
maruel@chromium.orgd5800f12009-11-12 20:03:43 +000010import os
11import re
maruel@chromium.orgd5800f12009-11-12 20:03:43 +000012import sys
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +000013import tempfile
maruel@chromium.orgfd876172010-04-30 14:01:05 +000014import time
maruel@chromium.orgade9c592011-04-07 15:59:11 +000015from xml.etree import ElementTree
maruel@chromium.orgd5800f12009-11-12 20:03:43 +000016
17import gclient_utils
maruel@chromium.org31cb48a2011-04-04 18:01:36 +000018import subprocess2
19
maruel@chromium.orgd5800f12009-11-12 20:03:43 +000020
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +000021def ValidateEmail(email):
maruel@chromium.org6e29d572010-06-04 17:32:20 +000022 return (re.match(r"^[a-zA-Z0-9._%-+]+@[a-zA-Z0-9._%-]+.[a-zA-Z]{2,6}$", email)
23 is not None)
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +000024
maruel@chromium.orgd5800f12009-11-12 20:03:43 +000025
maruel@chromium.orgfd9cbbb2010-01-08 23:04:03 +000026def 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
maruel@chromium.org3c55d982010-05-06 14:25:44 +000046def GenFakeDiff(filename):
47 """Generates a fake diff from a file."""
48 file_content = gclient_utils.FileRead(filename, 'rb').splitlines(True)
maruel@chromium.orgc6d170e2010-06-03 00:06:00 +000049 filename = filename.replace(os.sep, '/')
maruel@chromium.org3c55d982010-05-06 14:25:44 +000050 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
maruel@chromium.org5c8c6de2011-03-18 16:20:18 +000068def determine_scm(root):
69 """Similar to upload.py's version but much simpler.
70
71 Returns 'svn', 'git' or None.
72 """
73 if os.path.isdir(os.path.join(root, '.svn')):
74 return 'svn'
maruel@chromium.orgc98c0c52011-04-06 13:39:43 +000075 elif os.path.isdir(os.path.join(root, '.git')):
maruel@chromium.org5c8c6de2011-03-18 16:20:18 +000076 return 'git'
77 else:
maruel@chromium.orgc98c0c52011-04-06 13:39:43 +000078 try:
79 subprocess2.check_output(
maruel@chromium.org5c8c6de2011-03-18 16:20:18 +000080 ['git', 'rev-parse', '--show-cdup'],
maruel@chromium.orgc98c0c52011-04-06 13:39:43 +000081 stdout=subprocess2.VOID,
82 cwd=root)
maruel@chromium.org5c8c6de2011-03-18 16:20:18 +000083 return 'git'
maruel@chromium.orgc98c0c52011-04-06 13:39:43 +000084 except (OSError, subprocess2.CalledProcessError):
maruel@chromium.org5c8c6de2011-03-18 16:20:18 +000085 return None
86
87
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +000088class GIT(object):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +000089 @staticmethod
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +000090 def Capture(args, **kwargs):
maruel@chromium.orgda64d632011-09-08 17:41:15 +000091 return subprocess2.check_output(
92 ['git'] + args, stderr=subprocess2.VOID, **kwargs)
maruel@chromium.orgd5800f12009-11-12 20:03:43 +000093
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +000094 @staticmethod
msb@chromium.org786fb682010-06-02 15:16:23 +000095 def CaptureStatus(files, upstream_branch=None):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +000096 """Returns git status.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +000097
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +000098 @files can be a string (one file) or a list of files.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +000099
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000100 Returns an array of (status, file) tuples."""
msb@chromium.org786fb682010-06-02 15:16:23 +0000101 if upstream_branch is None:
102 upstream_branch = GIT.GetUpstreamBranch(os.getcwd())
103 if upstream_branch is None:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000104 raise gclient_utils.Error('Cannot determine upstream branch')
105 command = ['diff', '--name-status', '-r', '%s...' % upstream_branch]
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000106 if not files:
107 pass
108 elif isinstance(files, basestring):
109 command.append(files)
110 else:
111 command.extend(files)
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000112 status = GIT.Capture(command).rstrip()
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000113 results = []
114 if status:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000115 for statusline in status.splitlines():
maruel@chromium.orgcc1614b2010-09-20 17:13:17 +0000116 # 3-way merges can cause the status can be 'MMM' instead of 'M'. This
117 # can happen when the user has 2 local branches and he diffs between
118 # these 2 branches instead diffing to upstream.
119 m = re.match('^(\w)+\t(.+)$', statusline)
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000120 if not m:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000121 raise gclient_utils.Error(
122 'status currently unsupported: %s' % statusline)
maruel@chromium.orgcc1614b2010-09-20 17:13:17 +0000123 # Only grab the first letter.
124 results.append(('%s ' % m.group(1)[0], m.group(2)))
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000125 return results
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000126
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000127 @staticmethod
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000128 def GetEmail(cwd):
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000129 """Retrieves the user email address if known."""
130 # We could want to look at the svn cred when it has a svn remote but it
131 # should be fine for now, users should simply configure their git settings.
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000132 try:
133 return GIT.Capture(['config', 'user.email'], cwd=cwd).strip()
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000134 except subprocess2.CalledProcessError:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000135 return ''
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000136
137 @staticmethod
138 def ShortBranchName(branch):
139 """Converts a name like 'refs/heads/foo' to just 'foo'."""
140 return branch.replace('refs/heads/', '')
141
142 @staticmethod
143 def GetBranchRef(cwd):
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000144 """Returns the full branch reference, e.g. 'refs/heads/master'."""
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000145 return GIT.Capture(['symbolic-ref', 'HEAD'], cwd=cwd).strip()
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000146
147 @staticmethod
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000148 def GetBranch(cwd):
149 """Returns the short branch name, e.g. 'master'."""
maruel@chromium.orgc308a742009-12-22 18:29:33 +0000150 return GIT.ShortBranchName(GIT.GetBranchRef(cwd))
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000151
152 @staticmethod
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000153 def IsGitSvn(cwd):
154 """Returns true if this repo looks like it's using git-svn."""
155 # If you have any "svn-remote.*" config keys, we think you're using svn.
156 try:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000157 GIT.Capture(['config', '--get-regexp', r'^svn-remote\.'], cwd=cwd)
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000158 return True
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000159 except subprocess2.CalledProcessError:
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000160 return False
161
162 @staticmethod
bauerb@chromium.org866276c2011-03-18 20:09:31 +0000163 def MatchSvnGlob(url, base_url, glob_spec, allow_wildcards):
164 """Return the corresponding git ref if |base_url| together with |glob_spec|
165 matches the full |url|.
166
167 If |allow_wildcards| is true, |glob_spec| can contain wildcards (see below).
168 """
169 fetch_suburl, as_ref = glob_spec.split(':')
170 if allow_wildcards:
171 glob_match = re.match('(.+/)?(\*|{[^/]*})(/.+)?', fetch_suburl)
172 if glob_match:
173 # Parse specs like "branches/*/src:refs/remotes/svn/*" or
174 # "branches/{472,597,648}/src:refs/remotes/svn/*".
175 branch_re = re.escape(base_url)
176 if glob_match.group(1):
177 branch_re += '/' + re.escape(glob_match.group(1))
178 wildcard = glob_match.group(2)
179 if wildcard == '*':
180 branch_re += '([^/]*)'
181 else:
182 # Escape and replace surrounding braces with parentheses and commas
183 # with pipe symbols.
184 wildcard = re.escape(wildcard)
185 wildcard = re.sub('^\\\\{', '(', wildcard)
186 wildcard = re.sub('\\\\,', '|', wildcard)
187 wildcard = re.sub('\\\\}$', ')', wildcard)
188 branch_re += wildcard
189 if glob_match.group(3):
190 branch_re += re.escape(glob_match.group(3))
191 match = re.match(branch_re, url)
192 if match:
193 return re.sub('\*$', match.group(1), as_ref)
194
195 # Parse specs like "trunk/src:refs/remotes/origin/trunk".
196 if fetch_suburl:
197 full_url = base_url + '/' + fetch_suburl
198 else:
199 full_url = base_url
200 if full_url == url:
201 return as_ref
202 return None
203
204 @staticmethod
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000205 def GetSVNBranch(cwd):
206 """Returns the svn branch name if found."""
207 # Try to figure out which remote branch we're based on.
208 # Strategy:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000209 # 1) iterate through our branch history and find the svn URL.
210 # 2) find the svn-remote that fetches from the URL.
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000211
212 # regexp matching the git-svn line that contains the URL.
213 git_svn_re = re.compile(r'^\s*git-svn-id: (\S+)@', re.MULTILINE)
214
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000215 # We don't want to go through all of history, so read a line from the
216 # pipe at a time.
217 # The -100 is an arbitrary limit so we don't search forever.
218 cmd = ['git', 'log', '-100', '--pretty=medium']
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000219 proc = subprocess2.Popen(cmd, stdout=subprocess2.PIPE)
maruel@chromium.orge8c28622011-04-05 14:41:44 +0000220 url = None
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000221 for line in proc.stdout:
222 match = git_svn_re.match(line)
223 if match:
224 url = match.group(1)
225 proc.stdout.close() # Cut pipe.
226 break
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000227
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000228 if url:
229 svn_remote_re = re.compile(r'^svn-remote\.([^.]+)\.url (.*)$')
230 remotes = GIT.Capture(['config', '--get-regexp',
231 r'^svn-remote\..*\.url'], cwd=cwd).splitlines()
232 for remote in remotes:
233 match = svn_remote_re.match(remote)
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000234 if match:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000235 remote = match.group(1)
236 base_url = match.group(2)
bauerb@chromium.org866276c2011-03-18 20:09:31 +0000237 try:
238 fetch_spec = GIT.Capture(
239 ['config', 'svn-remote.%s.fetch' % remote],
240 cwd=cwd).strip()
241 branch = GIT.MatchSvnGlob(url, base_url, fetch_spec, False)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000242 except subprocess2.CalledProcessError:
bauerb@chromium.org866276c2011-03-18 20:09:31 +0000243 branch = None
244 if branch:
245 return branch
246 try:
247 branch_spec = GIT.Capture(
248 ['config', 'svn-remote.%s.branches' % remote],
249 cwd=cwd).strip()
250 branch = GIT.MatchSvnGlob(url, base_url, branch_spec, True)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000251 except subprocess2.CalledProcessError:
bauerb@chromium.org866276c2011-03-18 20:09:31 +0000252 branch = None
253 if branch:
254 return branch
255 try:
256 tag_spec = GIT.Capture(
257 ['config', 'svn-remote.%s.tags' % remote],
258 cwd=cwd).strip()
259 branch = GIT.MatchSvnGlob(url, base_url, tag_spec, True)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000260 except subprocess2.CalledProcessError:
bauerb@chromium.org866276c2011-03-18 20:09:31 +0000261 branch = None
262 if branch:
263 return branch
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000264
265 @staticmethod
266 def FetchUpstreamTuple(cwd):
267 """Returns a tuple containg remote and remote ref,
268 e.g. 'origin', 'refs/heads/master'
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000269 Tries to be intelligent and understand git-svn.
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000270 """
271 remote = '.'
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000272 branch = GIT.GetBranch(cwd)
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000273 try:
274 upstream_branch = GIT.Capture(
275 ['config', 'branch.%s.merge' % branch], cwd=cwd).strip()
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000276 except subprocess2.CalledProcessError:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000277 upstream_branch = None
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000278 if upstream_branch:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000279 try:
280 remote = GIT.Capture(
281 ['config', 'branch.%s.remote' % branch], cwd=cwd).strip()
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000282 except subprocess2.CalledProcessError:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000283 pass
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000284 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000285 try:
286 upstream_branch = GIT.Capture(
287 ['config', 'rietveld.upstream-branch'], cwd=cwd).strip()
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000288 except subprocess2.CalledProcessError:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000289 upstream_branch = None
290 if upstream_branch:
291 try:
292 remote = GIT.Capture(
293 ['config', 'rietveld.upstream-remote'], cwd=cwd).strip()
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000294 except subprocess2.CalledProcessError:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000295 pass
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000296 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000297 # Fall back on trying a git-svn upstream branch.
298 if GIT.IsGitSvn(cwd):
299 upstream_branch = GIT.GetSVNBranch(cwd)
maruel@chromium.orga630bd72010-04-29 23:32:34 +0000300 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000301 # Else, try to guess the origin remote.
302 remote_branches = GIT.Capture(['branch', '-r'], cwd=cwd).split()
303 if 'origin/master' in remote_branches:
304 # Fall back on origin/master if it exits.
305 remote = 'origin'
306 upstream_branch = 'refs/heads/master'
307 elif 'origin/trunk' in remote_branches:
308 # Fall back on origin/trunk if it exists. Generally a shared
309 # git-svn clone
310 remote = 'origin'
311 upstream_branch = 'refs/heads/trunk'
312 else:
313 # Give up.
314 remote = None
315 upstream_branch = None
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000316 return remote, upstream_branch
317
318 @staticmethod
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000319 def GetUpstreamBranch(cwd):
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000320 """Gets the current branch's upstream branch."""
321 remote, upstream_branch = GIT.FetchUpstreamTuple(cwd)
maruel@chromium.orga630bd72010-04-29 23:32:34 +0000322 if remote != '.' and upstream_branch:
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000323 upstream_branch = upstream_branch.replace('heads', 'remotes/' + remote)
324 return upstream_branch
325
326 @staticmethod
maruel@chromium.org8ede00e2010-01-12 14:35:28 +0000327 def GenerateDiff(cwd, branch=None, branch_head='HEAD', full_move=False,
328 files=None):
maruel@chromium.orga9371762009-12-22 18:27:38 +0000329 """Diffs against the upstream branch or optionally another branch.
330
331 full_move means that move or copy operations should completely recreate the
332 files, usually in the prospect to apply the patch for a try job."""
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000333 if not branch:
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000334 branch = GIT.GetUpstreamBranch(cwd)
evan@chromium.org400f3e72010-05-19 14:23:36 +0000335 command = ['diff', '-p', '--no-prefix', '--no-ext-diff',
336 branch + "..." + branch_head]
maruel@chromium.orga9371762009-12-22 18:27:38 +0000337 if not full_move:
338 command.append('-C')
maruel@chromium.org8ede00e2010-01-12 14:35:28 +0000339 # TODO(maruel): --binary support.
340 if files:
341 command.append('--')
342 command.extend(files)
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000343 diff = GIT.Capture(command, cwd=cwd).splitlines(True)
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000344 for i in range(len(diff)):
345 # In the case of added files, replace /dev/null with the path to the
346 # file being added.
347 if diff[i].startswith('--- /dev/null'):
348 diff[i] = '--- %s' % diff[i+1][4:]
349 return ''.join(diff)
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000350
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000351 @staticmethod
maruel@chromium.org8ede00e2010-01-12 14:35:28 +0000352 def GetDifferentFiles(cwd, branch=None, branch_head='HEAD'):
353 """Returns the list of modified files between two branches."""
354 if not branch:
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000355 branch = GIT.GetUpstreamBranch(cwd)
bauerb@chromium.org838f0f22010-04-09 17:02:50 +0000356 command = ['diff', '--name-only', branch + "..." + branch_head]
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000357 return GIT.Capture(command, cwd=cwd).splitlines(False)
maruel@chromium.org8ede00e2010-01-12 14:35:28 +0000358
359 @staticmethod
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000360 def GetPatchName(cwd):
361 """Constructs a name for this patch."""
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000362 short_sha = GIT.Capture(['rev-parse', '--short=4', 'HEAD'], cwd=cwd).strip()
maruel@chromium.org862ff8e2010-08-06 15:29:16 +0000363 return "%s#%s" % (GIT.GetBranch(cwd), short_sha)
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000364
365 @staticmethod
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000366 def GetCheckoutRoot(cwd):
maruel@chromium.org01d8c1d2010-01-07 01:56:59 +0000367 """Returns the top level directory of a git checkout as an absolute path.
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000368 """
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000369 root = GIT.Capture(['rev-parse', '--show-cdup'], cwd=cwd).strip()
370 return os.path.abspath(os.path.join(cwd, root))
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000371
maruel@chromium.orgd0f854a2010-03-11 19:35:53 +0000372 @staticmethod
373 def AssertVersion(min_version):
374 """Asserts git's version is at least min_version."""
375 def only_int(val):
376 if val.isdigit():
377 return int(val)
378 else:
379 return 0
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000380 current_version = GIT.Capture(['--version']).split()[-1]
maruel@chromium.orgd0f854a2010-03-11 19:35:53 +0000381 current_version_list = map(only_int, current_version.split('.'))
382 for min_ver in map(int, min_version.split('.')):
383 ver = current_version_list.pop(0)
384 if ver < min_ver:
385 return (False, current_version)
386 elif ver > min_ver:
387 return (True, current_version)
388 return (True, current_version)
389
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000390
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000391class SVN(object):
tony@chromium.org57564662010-04-14 02:35:12 +0000392 current_version = None
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000393
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000394 @staticmethod
maruel@chromium.org54019f32010-09-09 13:50:11 +0000395 def Capture(args, **kwargs):
396 """Always redirect stderr.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000397
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000398 Throws an exception if non-0 is returned.
399 """
400 return subprocess2.check_output(['svn'] + args, **kwargs)
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000401
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000402 @staticmethod
maruel@chromium.org2b9aa8e2010-08-25 20:01:42 +0000403 def RunAndGetFileList(verbose, args, cwd, file_list, stdout=None):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000404 """Runs svn checkout, update, or status, output to stdout.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000405
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000406 The first item in args must be either "checkout", "update", or "status".
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000407
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000408 svn's stdout is parsed to collect a list of files checked out or updated.
409 These files are appended to file_list. svn's stdout is also printed to
410 sys.stdout as in Run.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000411
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000412 Args:
maruel@chromium.org03807072010-08-16 17:18:44 +0000413 verbose: If True, uses verbose output
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000414 args: A sequence of command line parameters to be passed to svn.
maruel@chromium.org2b9aa8e2010-08-25 20:01:42 +0000415 cwd: The directory where svn is to be run.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000416
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000417 Raises:
418 Error: An error occurred while running the svn command.
419 """
maruel@chromium.org2b9aa8e2010-08-25 20:01:42 +0000420 stdout = stdout or sys.stdout
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000421
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000422 # svn update and svn checkout use the same pattern: the first three columns
423 # are for file status, property status, and lock status. This is followed
424 # by two spaces, and then the path to the file.
425 update_pattern = '^... (.*)$'
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000426
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000427 # The first three columns of svn status are the same as for svn update and
428 # svn checkout. The next three columns indicate addition-with-history,
429 # switch, and remote lock status. This is followed by one space, and then
430 # the path to the file.
431 status_pattern = '^...... (.*)$'
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000432
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000433 # args[0] must be a supported command. This will blow up if it's something
434 # else, which is good. Note that the patterns are only effective when
435 # these commands are used in their ordinary forms, the patterns are invalid
436 # for "svn status --show-updates", for example.
437 pattern = {
438 'checkout': update_pattern,
439 'status': status_pattern,
440 'update': update_pattern,
441 }[args[0]]
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000442 compiled_pattern = re.compile(pattern)
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000443 # Place an upper limit.
cbentzel@chromium.org2aee2292010-09-03 14:15:25 +0000444 backoff_time = 5
maruel@chromium.orgbec588d2010-10-26 13:50:25 +0000445 retries = 0
maruel@chromium.org03507062010-10-26 00:58:27 +0000446 while True:
maruel@chromium.orgbec588d2010-10-26 13:50:25 +0000447 retries += 1
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000448 previous_list_len = len(file_list)
449 failure = []
maruel@chromium.org54d1f1a2010-01-08 19:53:47 +0000450
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000451 def CaptureMatchingLines(line):
452 match = compiled_pattern.search(line)
453 if match:
454 file_list.append(match.group(1))
455 if line.startswith('svn: '):
maruel@chromium.org8599aa72010-02-08 20:27:14 +0000456 failure.append(line)
maruel@chromium.org54d1f1a2010-01-08 19:53:47 +0000457
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000458 try:
maruel@chromium.org17d01792010-09-01 18:07:10 +0000459 gclient_utils.CheckCallAndFilterAndHeader(
460 ['svn'] + args,
461 cwd=cwd,
462 always=verbose,
463 filter_fn=CaptureMatchingLines,
464 stdout=stdout)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000465 except subprocess2.CalledProcessError:
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000466 def IsKnownFailure():
467 for x in failure:
468 if (x.startswith('svn: OPTIONS of') or
469 x.startswith('svn: PROPFIND of') or
470 x.startswith('svn: REPORT of') or
maruel@chromium.orgf61fc932010-08-19 13:05:24 +0000471 x.startswith('svn: Unknown hostname') or
472 x.startswith('svn: Server sent unexpected return value')):
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000473 return True
474 return False
475
maruel@chromium.org953586a2010-06-15 14:22:24 +0000476 # Subversion client is really misbehaving with Google Code.
477 if args[0] == 'checkout':
478 # Ensure at least one file was checked out, otherwise *delete* the
479 # directory.
480 if len(file_list) == previous_list_len:
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000481 if not IsKnownFailure():
maruel@chromium.org953586a2010-06-15 14:22:24 +0000482 # No known svn error was found, bail out.
483 raise
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000484 # No file were checked out, so make sure the directory is
485 # deleted in case it's messed up and try again.
486 # Warning: It's bad, it assumes args[2] is the directory
487 # argument.
488 if os.path.isdir(args[2]):
489 gclient_utils.RemoveDirectory(args[2])
maruel@chromium.org953586a2010-06-15 14:22:24 +0000490 else:
491 # Progress was made, convert to update since an aborted checkout
492 # is now an update.
maruel@chromium.org2de10252010-02-08 01:10:39 +0000493 args = ['update'] + args[1:]
maruel@chromium.org953586a2010-06-15 14:22:24 +0000494 else:
495 # It was an update or export.
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000496 # We enforce that some progress has been made or a known failure.
497 if len(file_list) == previous_list_len and not IsKnownFailure():
498 # No known svn error was found and no progress, bail out.
499 raise
maruel@chromium.orgbec588d2010-10-26 13:50:25 +0000500 if retries == 10:
maruel@chromium.org03507062010-10-26 00:58:27 +0000501 raise
cbentzel@chromium.org2aee2292010-09-03 14:15:25 +0000502 print "Sleeping %.1f seconds and retrying...." % backoff_time
503 time.sleep(backoff_time)
504 backoff_time *= 1.3
maruel@chromium.org953586a2010-06-15 14:22:24 +0000505 continue
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000506 break
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000507
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000508 @staticmethod
maruel@chromium.org54019f32010-09-09 13:50:11 +0000509 def CaptureInfo(cwd):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000510 """Returns a dictionary from the svn info output for the given file.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000511
maruel@chromium.org54019f32010-09-09 13:50:11 +0000512 Throws an exception if svn info fails."""
maruel@chromium.orgd25fb8f2011-04-07 13:40:15 +0000513 result = {}
maruel@chromium.orgade9c592011-04-07 15:59:11 +0000514 output = SVN.Capture(['info', '--xml', cwd])
515 info = ElementTree.XML(output)
516 if info is None:
517 return result
518 entry = info.find('entry')
maruel@chromium.org6f323bb2011-04-26 15:42:53 +0000519 if entry is None:
520 return result
maruel@chromium.orgade9c592011-04-07 15:59:11 +0000521
522 # Use .text when the item is not optional.
523 result['Path'] = entry.attrib['path']
524 result['Revision'] = int(entry.attrib['revision'])
525 result['Node Kind'] = entry.attrib['kind']
526 # Differs across versions.
527 if result['Node Kind'] == 'dir':
528 result['Node Kind'] = 'directory'
529 result['URL'] = entry.find('url').text
530 repository = entry.find('repository')
531 result['Repository Root'] = repository.find('root').text
532 result['UUID'] = repository.find('uuid')
533 wc_info = entry.find('wc-info')
534 if wc_info is not None:
535 result['Schedule'] = wc_info.find('schedule').text
536 result['Copied From URL'] = wc_info.find('copy-from-url')
537 result['Copied From Rev'] = wc_info.find('copy-from-rev')
538 else:
539 result['Schedule'] = None
540 result['Copied From URL'] = None
541 result['Copied From Rev'] = None
542 for key in result.keys():
543 if isinstance(result[key], unicode):
544 # Unicode results interferes with the higher layers matching up things
545 # in the deps dictionary.
546 result[key] = result[key].encode()
547 # Automatic conversion of optional parameters.
548 result[key] = getattr(result[key], 'text', result[key])
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000549 return result
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000550
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000551 @staticmethod
maruel@chromium.org54019f32010-09-09 13:50:11 +0000552 def CaptureRevision(cwd):
nasser@codeaurora.org5d63eb82010-03-24 23:22:09 +0000553 """Get the base revision of a SVN repository.
554
555 Returns:
556 Int base revision
557 """
maruel@chromium.orgade9c592011-04-07 15:59:11 +0000558 return SVN.CaptureInfo(cwd).get('Revision')
nasser@codeaurora.org5d63eb82010-03-24 23:22:09 +0000559
560 @staticmethod
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000561 def CaptureStatus(files):
562 """Returns the svn 1.5 svn status emulated output.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000563
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000564 @files can be a string (one file) or a list of files.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000565
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000566 Returns an array of (status, file) tuples."""
567 command = ["status", "--xml"]
568 if not files:
569 pass
570 elif isinstance(files, basestring):
571 command.append(files)
572 else:
573 command.extend(files)
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000574
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000575 status_letter = {
576 None: ' ',
577 '': ' ',
578 'added': 'A',
579 'conflicted': 'C',
580 'deleted': 'D',
581 'external': 'X',
582 'ignored': 'I',
583 'incomplete': '!',
584 'merged': 'G',
585 'missing': '!',
586 'modified': 'M',
587 'none': ' ',
588 'normal': ' ',
589 'obstructed': '~',
590 'replaced': 'R',
591 'unversioned': '?',
592 }
maruel@chromium.orgade9c592011-04-07 15:59:11 +0000593 dom = ElementTree.XML(SVN.Capture(command))
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000594 results = []
maruel@chromium.orgade9c592011-04-07 15:59:11 +0000595 if dom is None:
596 return results
597 # /status/target/entry/(wc-status|commit|author|date)
598 for target in dom.findall('target'):
599 for entry in target.findall('entry'):
600 file_path = entry.attrib['path']
601 wc_status = entry.find('wc-status')
602 # Emulate svn 1.5 status ouput...
603 statuses = [' '] * 7
604 # Col 0
605 xml_item_status = wc_status.attrib['item']
606 if xml_item_status in status_letter:
607 statuses[0] = status_letter[xml_item_status]
608 else:
609 raise gclient_utils.Error(
610 'Unknown item status "%s"; please implement me!' %
611 xml_item_status)
612 # Col 1
613 xml_props_status = wc_status.attrib['props']
614 if xml_props_status == 'modified':
615 statuses[1] = 'M'
616 elif xml_props_status == 'conflicted':
617 statuses[1] = 'C'
618 elif (not xml_props_status or xml_props_status == 'none' or
619 xml_props_status == 'normal'):
620 pass
621 else:
622 raise gclient_utils.Error(
623 'Unknown props status "%s"; please implement me!' %
624 xml_props_status)
625 # Col 2
626 if wc_status.attrib.get('wc-locked') == 'true':
627 statuses[2] = 'L'
628 # Col 3
629 if wc_status.attrib.get('copied') == 'true':
630 statuses[3] = '+'
631 # Col 4
632 if wc_status.attrib.get('switched') == 'true':
633 statuses[4] = 'S'
634 # TODO(maruel): Col 5 and 6
635 item = (''.join(statuses), file_path)
636 results.append(item)
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000637 return results
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000638
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000639 @staticmethod
640 def IsMoved(filename):
641 """Determine if a file has been added through svn mv"""
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000642 return SVN.IsMovedInfo(SVN.CaptureInfo(filename))
643
644 @staticmethod
645 def IsMovedInfo(info):
646 """Determine if a file has been added through svn mv"""
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000647 return (info.get('Copied From URL') and
648 info.get('Copied From Rev') and
649 info.get('Schedule') == 'add')
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000650
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000651 @staticmethod
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000652 def GetFileProperty(filename, property_name):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000653 """Returns the value of an SVN property for the given file.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000654
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000655 Args:
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000656 filename: The file to check
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000657 property_name: The name of the SVN property, e.g. "svn:mime-type"
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000658
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000659 Returns:
660 The value of the property, which will be the empty string if the property
661 is not set on the file. If the file is not under version control, the
662 empty string is also returned.
663 """
maruel@chromium.org54019f32010-09-09 13:50:11 +0000664 try:
665 return SVN.Capture(['propget', property_name, filename])
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000666 except subprocess2.CalledProcessError:
maruel@chromium.org54019f32010-09-09 13:50:11 +0000667 return ''
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000668
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000669 @staticmethod
maruel@chromium.org1c7db8e2010-01-07 02:00:19 +0000670 def DiffItem(filename, full_move=False, revision=None):
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000671 """Diffs a single file.
672
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000673 Should be simple, eh? No it isn't.
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000674 Be sure to be in the appropriate directory before calling to have the
maruel@chromium.orga9371762009-12-22 18:27:38 +0000675 expected relative path.
676 full_move means that move or copy operations should completely recreate the
677 files, usually in the prospect to apply the patch for a try job."""
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000678 # If the user specified a custom diff command in their svn config file,
679 # then it'll be used when we do svn diff, which we don't want to happen
680 # since we want the unified diff. Using --diff-cmd=diff doesn't always
681 # work, since they can have another diff executable in their path that
682 # gives different line endings. So we use a bogus temp directory as the
683 # config directory, which gets around these problems.
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000684 bogus_dir = tempfile.mkdtemp()
685 try:
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000686 # Use "svn info" output instead of os.path.isdir because the latter fails
687 # when the file is deleted.
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000688 return SVN._DiffItemInternal(filename, SVN.CaptureInfo(filename),
689 bogus_dir,
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000690 full_move=full_move, revision=revision)
691 finally:
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000692 gclient_utils.RemoveDirectory(bogus_dir)
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000693
694 @staticmethod
695 def _DiffItemInternal(filename, info, bogus_dir, full_move=False,
696 revision=None):
697 """Grabs the diff data."""
698 command = ["diff", "--config-dir", bogus_dir, filename]
699 if revision:
700 command.extend(['--revision', revision])
701 data = None
702 if SVN.IsMovedInfo(info):
703 if full_move:
704 if info.get("Node Kind") == "directory":
705 # Things become tricky here. It's a directory copy/move. We need to
706 # diff all the files inside it.
707 # This will put a lot of pressure on the heap. This is why StringIO
708 # is used and converted back into a string at the end. The reason to
709 # return a string instead of a StringIO is that StringIO.write()
710 # doesn't accept a StringIO object. *sigh*.
711 for (dirpath, dirnames, filenames) in os.walk(filename):
712 # Cleanup all files starting with a '.'.
713 for d in dirnames:
714 if d.startswith('.'):
715 dirnames.remove(d)
716 for f in filenames:
717 if f.startswith('.'):
718 filenames.remove(f)
719 for f in filenames:
720 if data is None:
721 data = cStringIO.StringIO()
722 data.write(GenFakeDiff(os.path.join(dirpath, f)))
723 if data:
724 tmp = data.getvalue()
725 data.close()
726 data = tmp
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000727 else:
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000728 data = GenFakeDiff(filename)
729 else:
730 if info.get("Node Kind") != "directory":
maruel@chromium.org0836c562010-01-22 01:10:06 +0000731 # svn diff on a mv/cp'd file outputs nothing if there was no change.
maruel@chromium.org54019f32010-09-09 13:50:11 +0000732 data = SVN.Capture(command)
maruel@chromium.org0836c562010-01-22 01:10:06 +0000733 if not data:
734 # We put in an empty Index entry so upload.py knows about them.
maruel@chromium.orgc6d170e2010-06-03 00:06:00 +0000735 data = "Index: %s\n" % filename.replace(os.sep, '/')
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000736 # Otherwise silently ignore directories.
737 else:
738 if info.get("Node Kind") != "directory":
739 # Normal simple case.
maruel@chromium.orgf8b3f942011-03-24 17:33:50 +0000740 try:
741 data = SVN.Capture(command)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000742 except subprocess2.CalledProcessError:
maruel@chromium.orgf8b3f942011-03-24 17:33:50 +0000743 if revision:
744 data = GenFakeDiff(filename)
745 else:
746 raise
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000747 # Otherwise silently ignore directories.
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000748 return data
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000749
750 @staticmethod
maruel@chromium.org1c7db8e2010-01-07 02:00:19 +0000751 def GenerateDiff(filenames, root=None, full_move=False, revision=None):
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000752 """Returns a string containing the diff for the given file list.
753
754 The files in the list should either be absolute paths or relative to the
755 given root. If no root directory is provided, the repository root will be
756 used.
757 The diff will always use relative paths.
758 """
maruel@chromium.org00fdcb32011-02-24 01:41:02 +0000759 assert isinstance(filenames, (list, tuple))
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000760 previous_cwd = os.getcwd()
maruel@chromium.orgfd9cbbb2010-01-08 23:04:03 +0000761 root = root or SVN.GetCheckoutRoot(previous_cwd)
762 root = os.path.normcase(os.path.join(root, ''))
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000763 def RelativePath(path, root):
764 """We must use relative paths."""
maruel@chromium.orgfd9cbbb2010-01-08 23:04:03 +0000765 if os.path.normcase(path).startswith(root):
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000766 return path[len(root):]
767 return path
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000768 # If the user specified a custom diff command in their svn config file,
769 # then it'll be used when we do svn diff, which we don't want to happen
770 # since we want the unified diff. Using --diff-cmd=diff doesn't always
771 # work, since they can have another diff executable in their path that
772 # gives different line endings. So we use a bogus temp directory as the
773 # config directory, which gets around these problems.
774 bogus_dir = tempfile.mkdtemp()
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000775 try:
776 os.chdir(root)
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000777 # Cleanup filenames
778 filenames = [RelativePath(f, root) for f in filenames]
779 # Get information about the modified items (files and directories)
780 data = dict([(f, SVN.CaptureInfo(f)) for f in filenames])
gavinp@google.com3fda4cc2010-06-29 13:29:27 +0000781 diffs = []
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000782 if full_move:
783 # Eliminate modified files inside moved/copied directory.
784 for (filename, info) in data.iteritems():
785 if SVN.IsMovedInfo(info) and info.get("Node Kind") == "directory":
786 # Remove files inside the directory.
787 filenames = [f for f in filenames
788 if not f.startswith(filename + os.path.sep)]
789 for filename in data.keys():
790 if not filename in filenames:
791 # Remove filtered out items.
792 del data[filename]
gavinp@google.com3fda4cc2010-06-29 13:29:27 +0000793 else:
794 metaheaders = []
795 for (filename, info) in data.iteritems():
796 if SVN.IsMovedInfo(info):
797 # for now, the most common case is a head copy,
798 # so let's just encode that as a straight up cp.
799 srcurl = info.get('Copied From URL')
800 root = info.get('Repository Root')
801 rev = int(info.get('Copied From Rev'))
802 assert srcurl.startswith(root)
803 src = srcurl[len(root)+1:]
maruel@chromium.org00fdcb32011-02-24 01:41:02 +0000804 try:
805 srcinfo = SVN.CaptureInfo(srcurl)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000806 except subprocess2.CalledProcessError, e:
maruel@chromium.org00fdcb32011-02-24 01:41:02 +0000807 if not 'Not a valid URL' in e.stderr:
808 raise
809 # Assume the file was deleted. No idea how to figure out at which
810 # revision the file was deleted.
811 srcinfo = {'Revision': rev}
gavinp@google.com3fda4cc2010-06-29 13:29:27 +0000812 if (srcinfo.get('Revision') != rev and
813 SVN.Capture(['diff', '-r', '%d:head' % rev, srcurl])):
814 metaheaders.append("#$ svn cp -r %d %s %s "
815 "### WARNING: note non-trunk copy\n" %
816 (rev, src, filename))
817 else:
818 metaheaders.append("#$ cp %s %s\n" % (src,
819 filename))
820
821 if metaheaders:
822 diffs.append("### BEGIN SVN COPY METADATA\n")
823 diffs.extend(metaheaders)
824 diffs.append("### END SVN COPY METADATA\n")
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000825 # Now ready to do the actual diff.
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000826 for filename in sorted(data.iterkeys()):
827 diffs.append(SVN._DiffItemInternal(filename, data[filename], bogus_dir,
828 full_move=full_move,
829 revision=revision))
830 # Use StringIO since it can be messy when diffing a directory move with
831 # full_move=True.
832 buf = cStringIO.StringIO()
833 for d in filter(None, diffs):
834 buf.write(d)
835 result = buf.getvalue()
836 buf.close()
837 return result
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000838 finally:
839 os.chdir(previous_cwd)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000840 gclient_utils.RemoveDirectory(bogus_dir)
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000841
842 @staticmethod
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000843 def GetEmail(repo_root):
844 """Retrieves the svn account which we assume is an email address."""
maruel@chromium.org54019f32010-09-09 13:50:11 +0000845 try:
846 infos = SVN.CaptureInfo(repo_root)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000847 except subprocess2.CalledProcessError:
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000848 return None
849
850 # Should check for uuid but it is incorrectly saved for https creds.
maruel@chromium.org54019f32010-09-09 13:50:11 +0000851 root = infos['Repository Root']
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000852 realm = root.rsplit('/', 1)[0]
maruel@chromium.org54019f32010-09-09 13:50:11 +0000853 uuid = infos['UUID']
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000854 if root.startswith('https') or not uuid:
855 regexp = re.compile(r'<%s:\d+>.*' % realm)
856 else:
857 regexp = re.compile(r'<%s:\d+> %s' % (realm, uuid))
858 if regexp is None:
859 return None
860 if sys.platform.startswith('win'):
861 if not 'APPDATA' in os.environ:
862 return None
maruel@chromium.org720d9f32009-11-21 17:38:57 +0000863 auth_dir = os.path.join(os.environ['APPDATA'], 'Subversion', 'auth',
864 'svn.simple')
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000865 else:
866 if not 'HOME' in os.environ:
867 return None
868 auth_dir = os.path.join(os.environ['HOME'], '.subversion', 'auth',
869 'svn.simple')
870 for credfile in os.listdir(auth_dir):
871 cred_info = SVN.ReadSimpleAuth(os.path.join(auth_dir, credfile))
872 if regexp.match(cred_info.get('svn:realmstring')):
873 return cred_info.get('username')
874
875 @staticmethod
876 def ReadSimpleAuth(filename):
877 f = open(filename, 'r')
878 values = {}
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000879 def ReadOneItem(item_type):
880 m = re.match(r'%s (\d+)' % item_type, f.readline())
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000881 if not m:
882 return None
883 data = f.read(int(m.group(1)))
884 if f.read(1) != '\n':
885 return None
886 return data
887
888 while True:
889 key = ReadOneItem('K')
890 if not key:
891 break
892 value = ReadOneItem('V')
893 if not value:
894 break
895 values[key] = value
896 return values
maruel@chromium.org94b1ee92009-12-19 20:27:20 +0000897
898 @staticmethod
899 def GetCheckoutRoot(directory):
900 """Returns the top level directory of the current repository.
901
902 The directory is returned as an absolute path.
903 """
maruel@chromium.orgf7ae6d52009-12-22 20:49:04 +0000904 directory = os.path.abspath(directory)
maruel@chromium.org54019f32010-09-09 13:50:11 +0000905 try:
maruel@chromium.org885d6e82011-02-24 20:21:46 +0000906 info = SVN.CaptureInfo(directory)
907 cur_dir_repo_root = info['Repository Root']
908 url = info['URL']
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000909 except subprocess2.CalledProcessError:
maruel@chromium.org94b1ee92009-12-19 20:27:20 +0000910 return None
maruel@chromium.org94b1ee92009-12-19 20:27:20 +0000911 while True:
912 parent = os.path.dirname(directory)
maruel@chromium.org54019f32010-09-09 13:50:11 +0000913 try:
maruel@chromium.org885d6e82011-02-24 20:21:46 +0000914 info = SVN.CaptureInfo(parent)
915 if (info['Repository Root'] != cur_dir_repo_root or
916 info['URL'] != os.path.dirname(url)):
maruel@chromium.org54019f32010-09-09 13:50:11 +0000917 break
maruel@chromium.org885d6e82011-02-24 20:21:46 +0000918 url = info['URL']
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000919 except subprocess2.CalledProcessError:
maruel@chromium.org94b1ee92009-12-19 20:27:20 +0000920 break
921 directory = parent
maruel@chromium.orgfd9cbbb2010-01-08 23:04:03 +0000922 return GetCasedPath(directory)
tony@chromium.org57564662010-04-14 02:35:12 +0000923
924 @staticmethod
925 def AssertVersion(min_version):
926 """Asserts svn's version is at least min_version."""
927 def only_int(val):
928 if val.isdigit():
929 return int(val)
930 else:
931 return 0
932 if not SVN.current_version:
933 SVN.current_version = SVN.Capture(['--version']).split()[2]
934 current_version_list = map(only_int, SVN.current_version.split('.'))
935 for min_ver in map(int, min_version.split('.')):
936 ver = current_version_list.pop(0)
937 if ver < min_ver:
938 return (False, SVN.current_version)
939 elif ver > min_ver:
940 return (True, SVN.current_version)
941 return (True, SVN.current_version)
maruel@chromium.org07ab60e2011-02-08 21:54:00 +0000942
943 @staticmethod
944 def Revert(repo_root, callback=None, ignore_externals=False):
945 """Reverts all svn modifications in repo_root, including properties.
946
947 Deletes any modified files or directory.
948
949 A "svn update --revision BASE" call is required after to revive deleted
950 files.
951 """
952 for file_status in SVN.CaptureStatus(repo_root):
953 file_path = os.path.join(repo_root, file_status[1])
maruel@chromium.org8c415122011-03-15 17:14:27 +0000954 if (ignore_externals and
955 file_status[0][0] == 'X' and
956 file_status[0][1:].isspace()):
maruel@chromium.org07ab60e2011-02-08 21:54:00 +0000957 # Ignore externals.
958 logging.info('Ignoring external %s' % file_status[1])
959 continue
960
961 if callback:
962 callback(file_status)
963
maruel@chromium.org8c415122011-03-15 17:14:27 +0000964 if os.path.exists(file_path):
965 # svn revert is really stupid. It fails on inconsistent line-endings,
966 # on switched directories, etc. So take no chance and delete everything!
967 # In theory, it wouldn't be necessary for property-only change but then
968 # it'd have to look for switched directories, etc so it's not worth
969 # optimizing this use case.
970 if os.path.isfile(file_path) or os.path.islink(file_path):
971 logging.info('os.remove(%s)' % file_path)
972 os.remove(file_path)
973 elif os.path.isdir(file_path):
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000974 logging.info('RemoveDirectory(%s)' % file_path)
maruel@chromium.org8c415122011-03-15 17:14:27 +0000975 gclient_utils.RemoveDirectory(file_path)
976 else:
977 logging.critical(
978 ('No idea what is %s.\nYou just found a bug in gclient'
979 ', please ping maruel@chromium.org ASAP!') % file_path)
maruel@chromium.org07ab60e2011-02-08 21:54:00 +0000980
maruel@chromium.org8c415122011-03-15 17:14:27 +0000981 if (file_status[0][0] in ('D', 'A', '!') or
982 not file_status[0][1:].isspace()):
maruel@chromium.orgaf453492011-03-03 21:04:09 +0000983 # Added, deleted file requires manual intervention and require calling
maruel@chromium.org07ab60e2011-02-08 21:54:00 +0000984 # revert, like for properties.
maruel@chromium.orgaf453492011-03-03 21:04:09 +0000985 try:
986 SVN.Capture(['revert', file_status[1]], cwd=repo_root)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000987 except subprocess2.CalledProcessError:
maruel@chromium.orgaf453492011-03-03 21:04:09 +0000988 if not os.path.exists(file_path):
989 continue
990 raise