blob: afc66f4429cfdd48e20b99764facc0b0fee15fb8 [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:
maruel@chromium.org91def9b2011-09-14 16:28:07 +000079 subprocess2.check_call(
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,
maruel@chromium.org87e6d332011-09-09 19:01:28 +000082 stderr=subprocess2.VOID,
maruel@chromium.orgc98c0c52011-04-06 13:39:43 +000083 cwd=root)
maruel@chromium.org5c8c6de2011-03-18 16:20:18 +000084 return 'git'
maruel@chromium.orgc98c0c52011-04-06 13:39:43 +000085 except (OSError, subprocess2.CalledProcessError):
maruel@chromium.org5c8c6de2011-03-18 16:20:18 +000086 return None
87
88
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +000089class GIT(object):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +000090 @staticmethod
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +000091 def Capture(args, **kwargs):
maruel@chromium.orgda64d632011-09-08 17:41:15 +000092 return subprocess2.check_output(
maruel@chromium.org73c87e92011-09-09 12:03:54 +000093 ['git'] + args, stderr=subprocess2.PIPE, **kwargs)
maruel@chromium.orgd5800f12009-11-12 20:03:43 +000094
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +000095 @staticmethod
msb@chromium.org786fb682010-06-02 15:16:23 +000096 def CaptureStatus(files, upstream_branch=None):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +000097 """Returns git status.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +000098
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +000099 @files can be a string (one file) or a list of files.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000100
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000101 Returns an array of (status, file) tuples."""
msb@chromium.org786fb682010-06-02 15:16:23 +0000102 if upstream_branch is None:
103 upstream_branch = GIT.GetUpstreamBranch(os.getcwd())
104 if upstream_branch is None:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000105 raise gclient_utils.Error('Cannot determine upstream branch')
106 command = ['diff', '--name-status', '-r', '%s...' % upstream_branch]
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000107 if not files:
108 pass
109 elif isinstance(files, basestring):
110 command.append(files)
111 else:
112 command.extend(files)
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000113 status = GIT.Capture(command).rstrip()
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000114 results = []
115 if status:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000116 for statusline in status.splitlines():
maruel@chromium.orgcc1614b2010-09-20 17:13:17 +0000117 # 3-way merges can cause the status can be 'MMM' instead of 'M'. This
118 # can happen when the user has 2 local branches and he diffs between
119 # these 2 branches instead diffing to upstream.
120 m = re.match('^(\w)+\t(.+)$', statusline)
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000121 if not m:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000122 raise gclient_utils.Error(
123 'status currently unsupported: %s' % statusline)
maruel@chromium.orgcc1614b2010-09-20 17:13:17 +0000124 # Only grab the first letter.
125 results.append(('%s ' % m.group(1)[0], m.group(2)))
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000126 return results
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000127
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000128 @staticmethod
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000129 def GetEmail(cwd):
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000130 """Retrieves the user email address if known."""
131 # We could want to look at the svn cred when it has a svn remote but it
132 # should be fine for now, users should simply configure their git settings.
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000133 try:
134 return GIT.Capture(['config', 'user.email'], cwd=cwd).strip()
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000135 except subprocess2.CalledProcessError:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000136 return ''
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000137
138 @staticmethod
139 def ShortBranchName(branch):
140 """Converts a name like 'refs/heads/foo' to just 'foo'."""
141 return branch.replace('refs/heads/', '')
142
143 @staticmethod
144 def GetBranchRef(cwd):
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000145 """Returns the full branch reference, e.g. 'refs/heads/master'."""
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000146 return GIT.Capture(['symbolic-ref', 'HEAD'], cwd=cwd).strip()
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000147
148 @staticmethod
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000149 def GetBranch(cwd):
150 """Returns the short branch name, e.g. 'master'."""
maruel@chromium.orgc308a742009-12-22 18:29:33 +0000151 return GIT.ShortBranchName(GIT.GetBranchRef(cwd))
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000152
153 @staticmethod
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000154 def IsGitSvn(cwd):
155 """Returns true if this repo looks like it's using git-svn."""
156 # If you have any "svn-remote.*" config keys, we think you're using svn.
157 try:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000158 GIT.Capture(['config', '--get-regexp', r'^svn-remote\.'], cwd=cwd)
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000159 return True
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000160 except subprocess2.CalledProcessError:
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000161 return False
162
163 @staticmethod
bauerb@chromium.org866276c2011-03-18 20:09:31 +0000164 def MatchSvnGlob(url, base_url, glob_spec, allow_wildcards):
165 """Return the corresponding git ref if |base_url| together with |glob_spec|
166 matches the full |url|.
167
168 If |allow_wildcards| is true, |glob_spec| can contain wildcards (see below).
169 """
170 fetch_suburl, as_ref = glob_spec.split(':')
171 if allow_wildcards:
172 glob_match = re.match('(.+/)?(\*|{[^/]*})(/.+)?', fetch_suburl)
173 if glob_match:
174 # Parse specs like "branches/*/src:refs/remotes/svn/*" or
175 # "branches/{472,597,648}/src:refs/remotes/svn/*".
176 branch_re = re.escape(base_url)
177 if glob_match.group(1):
178 branch_re += '/' + re.escape(glob_match.group(1))
179 wildcard = glob_match.group(2)
180 if wildcard == '*':
181 branch_re += '([^/]*)'
182 else:
183 # Escape and replace surrounding braces with parentheses and commas
184 # with pipe symbols.
185 wildcard = re.escape(wildcard)
186 wildcard = re.sub('^\\\\{', '(', wildcard)
187 wildcard = re.sub('\\\\,', '|', wildcard)
188 wildcard = re.sub('\\\\}$', ')', wildcard)
189 branch_re += wildcard
190 if glob_match.group(3):
191 branch_re += re.escape(glob_match.group(3))
192 match = re.match(branch_re, url)
193 if match:
194 return re.sub('\*$', match.group(1), as_ref)
195
196 # Parse specs like "trunk/src:refs/remotes/origin/trunk".
197 if fetch_suburl:
198 full_url = base_url + '/' + fetch_suburl
199 else:
200 full_url = base_url
201 if full_url == url:
202 return as_ref
203 return None
204
205 @staticmethod
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000206 def GetSVNBranch(cwd):
207 """Returns the svn branch name if found."""
208 # Try to figure out which remote branch we're based on.
209 # Strategy:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000210 # 1) iterate through our branch history and find the svn URL.
211 # 2) find the svn-remote that fetches from the URL.
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000212
213 # regexp matching the git-svn line that contains the URL.
214 git_svn_re = re.compile(r'^\s*git-svn-id: (\S+)@', re.MULTILINE)
215
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000216 # We don't want to go through all of history, so read a line from the
217 # pipe at a time.
218 # The -100 is an arbitrary limit so we don't search forever.
219 cmd = ['git', 'log', '-100', '--pretty=medium']
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000220 proc = subprocess2.Popen(cmd, stdout=subprocess2.PIPE)
maruel@chromium.orge8c28622011-04-05 14:41:44 +0000221 url = None
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000222 for line in proc.stdout:
223 match = git_svn_re.match(line)
224 if match:
225 url = match.group(1)
226 proc.stdout.close() # Cut pipe.
227 break
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000228
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000229 if url:
230 svn_remote_re = re.compile(r'^svn-remote\.([^.]+)\.url (.*)$')
231 remotes = GIT.Capture(['config', '--get-regexp',
232 r'^svn-remote\..*\.url'], cwd=cwd).splitlines()
233 for remote in remotes:
234 match = svn_remote_re.match(remote)
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000235 if match:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000236 remote = match.group(1)
237 base_url = match.group(2)
bauerb@chromium.org866276c2011-03-18 20:09:31 +0000238 try:
239 fetch_spec = GIT.Capture(
240 ['config', 'svn-remote.%s.fetch' % remote],
241 cwd=cwd).strip()
242 branch = GIT.MatchSvnGlob(url, base_url, fetch_spec, False)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000243 except subprocess2.CalledProcessError:
bauerb@chromium.org866276c2011-03-18 20:09:31 +0000244 branch = None
245 if branch:
246 return branch
247 try:
248 branch_spec = GIT.Capture(
249 ['config', 'svn-remote.%s.branches' % remote],
250 cwd=cwd).strip()
251 branch = GIT.MatchSvnGlob(url, base_url, branch_spec, True)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000252 except subprocess2.CalledProcessError:
bauerb@chromium.org866276c2011-03-18 20:09:31 +0000253 branch = None
254 if branch:
255 return branch
256 try:
257 tag_spec = GIT.Capture(
258 ['config', 'svn-remote.%s.tags' % remote],
259 cwd=cwd).strip()
260 branch = GIT.MatchSvnGlob(url, base_url, tag_spec, True)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000261 except subprocess2.CalledProcessError:
bauerb@chromium.org866276c2011-03-18 20:09:31 +0000262 branch = None
263 if branch:
264 return branch
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000265
266 @staticmethod
267 def FetchUpstreamTuple(cwd):
268 """Returns a tuple containg remote and remote ref,
269 e.g. 'origin', 'refs/heads/master'
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000270 Tries to be intelligent and understand git-svn.
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000271 """
272 remote = '.'
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000273 branch = GIT.GetBranch(cwd)
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000274 try:
275 upstream_branch = GIT.Capture(
276 ['config', 'branch.%s.merge' % branch], cwd=cwd).strip()
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000277 except subprocess2.CalledProcessError:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000278 upstream_branch = None
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000279 if upstream_branch:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000280 try:
281 remote = GIT.Capture(
282 ['config', 'branch.%s.remote' % branch], cwd=cwd).strip()
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000283 except subprocess2.CalledProcessError:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000284 pass
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000285 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000286 try:
287 upstream_branch = GIT.Capture(
288 ['config', 'rietveld.upstream-branch'], cwd=cwd).strip()
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000289 except subprocess2.CalledProcessError:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000290 upstream_branch = None
291 if upstream_branch:
292 try:
293 remote = GIT.Capture(
294 ['config', 'rietveld.upstream-remote'], cwd=cwd).strip()
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000295 except subprocess2.CalledProcessError:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000296 pass
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000297 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000298 # Fall back on trying a git-svn upstream branch.
299 if GIT.IsGitSvn(cwd):
300 upstream_branch = GIT.GetSVNBranch(cwd)
maruel@chromium.orga630bd72010-04-29 23:32:34 +0000301 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000302 # Else, try to guess the origin remote.
303 remote_branches = GIT.Capture(['branch', '-r'], cwd=cwd).split()
304 if 'origin/master' in remote_branches:
305 # Fall back on origin/master if it exits.
306 remote = 'origin'
307 upstream_branch = 'refs/heads/master'
308 elif 'origin/trunk' in remote_branches:
309 # Fall back on origin/trunk if it exists. Generally a shared
310 # git-svn clone
311 remote = 'origin'
312 upstream_branch = 'refs/heads/trunk'
313 else:
314 # Give up.
315 remote = None
316 upstream_branch = None
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000317 return remote, upstream_branch
318
319 @staticmethod
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000320 def GetUpstreamBranch(cwd):
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000321 """Gets the current branch's upstream branch."""
322 remote, upstream_branch = GIT.FetchUpstreamTuple(cwd)
maruel@chromium.orga630bd72010-04-29 23:32:34 +0000323 if remote != '.' and upstream_branch:
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000324 upstream_branch = upstream_branch.replace('heads', 'remotes/' + remote)
325 return upstream_branch
326
327 @staticmethod
maruel@chromium.org8ede00e2010-01-12 14:35:28 +0000328 def GenerateDiff(cwd, branch=None, branch_head='HEAD', full_move=False,
329 files=None):
maruel@chromium.orga9371762009-12-22 18:27:38 +0000330 """Diffs against the upstream branch or optionally another branch.
331
332 full_move means that move or copy operations should completely recreate the
333 files, usually in the prospect to apply the patch for a try job."""
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000334 if not branch:
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000335 branch = GIT.GetUpstreamBranch(cwd)
evan@chromium.org400f3e72010-05-19 14:23:36 +0000336 command = ['diff', '-p', '--no-prefix', '--no-ext-diff',
337 branch + "..." + branch_head]
maruel@chromium.orga9371762009-12-22 18:27:38 +0000338 if not full_move:
339 command.append('-C')
maruel@chromium.org8ede00e2010-01-12 14:35:28 +0000340 # TODO(maruel): --binary support.
341 if files:
342 command.append('--')
343 command.extend(files)
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000344 diff = GIT.Capture(command, cwd=cwd).splitlines(True)
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000345 for i in range(len(diff)):
346 # In the case of added files, replace /dev/null with the path to the
347 # file being added.
348 if diff[i].startswith('--- /dev/null'):
349 diff[i] = '--- %s' % diff[i+1][4:]
350 return ''.join(diff)
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000351
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000352 @staticmethod
maruel@chromium.org8ede00e2010-01-12 14:35:28 +0000353 def GetDifferentFiles(cwd, branch=None, branch_head='HEAD'):
354 """Returns the list of modified files between two branches."""
355 if not branch:
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000356 branch = GIT.GetUpstreamBranch(cwd)
bauerb@chromium.org838f0f22010-04-09 17:02:50 +0000357 command = ['diff', '--name-only', branch + "..." + branch_head]
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000358 return GIT.Capture(command, cwd=cwd).splitlines(False)
maruel@chromium.org8ede00e2010-01-12 14:35:28 +0000359
360 @staticmethod
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000361 def GetPatchName(cwd):
362 """Constructs a name for this patch."""
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000363 short_sha = GIT.Capture(['rev-parse', '--short=4', 'HEAD'], cwd=cwd).strip()
maruel@chromium.org862ff8e2010-08-06 15:29:16 +0000364 return "%s#%s" % (GIT.GetBranch(cwd), short_sha)
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000365
366 @staticmethod
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000367 def GetCheckoutRoot(cwd):
maruel@chromium.org01d8c1d2010-01-07 01:56:59 +0000368 """Returns the top level directory of a git checkout as an absolute path.
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000369 """
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000370 root = GIT.Capture(['rev-parse', '--show-cdup'], cwd=cwd).strip()
371 return os.path.abspath(os.path.join(cwd, root))
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000372
maruel@chromium.orgedb6ea62011-10-11 20:25:13 +0000373 @staticmethod
374 def AssertVersion(min_version):
maruel@chromium.orgd0f854a2010-03-11 19:35:53 +0000375 """Asserts git's version is at least min_version."""
maruel@chromium.orgedb6ea62011-10-11 20:25:13 +0000376 def only_int(val):
377 if val.isdigit():
378 return int(val)
379 else:
380 return 0
381 current_version = GIT.Capture(['--version']).split()[-1]
382 current_version_list = map(only_int, current_version.split('.'))
maruel@chromium.orgd0f854a2010-03-11 19:35:53 +0000383 for min_ver in map(int, min_version.split('.')):
384 ver = current_version_list.pop(0)
385 if ver < min_ver:
maruel@chromium.orgedb6ea62011-10-11 20:25:13 +0000386 return (False, current_version)
maruel@chromium.orgd0f854a2010-03-11 19:35:53 +0000387 elif ver > min_ver:
maruel@chromium.orgedb6ea62011-10-11 20:25:13 +0000388 return (True, current_version)
389 return (True, current_version)
maruel@chromium.orgd0f854a2010-03-11 19:35:53 +0000390
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000391
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000392class SVN(object):
tony@chromium.org57564662010-04-14 02:35:12 +0000393 current_version = None
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000394
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000395 @staticmethod
maruel@chromium.org54019f32010-09-09 13:50:11 +0000396 def Capture(args, **kwargs):
397 """Always redirect stderr.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000398
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000399 Throws an exception if non-0 is returned.
400 """
maruel@chromium.org904af082011-09-08 22:06:09 +0000401 return subprocess2.check_output(
402 ['svn'] + args, stderr=subprocess2.PIPE, **kwargs)
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000403
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000404 @staticmethod
maruel@chromium.org2b9aa8e2010-08-25 20:01:42 +0000405 def RunAndGetFileList(verbose, args, cwd, file_list, stdout=None):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000406 """Runs svn checkout, update, or status, output to stdout.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000407
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000408 The first item in args must be either "checkout", "update", or "status".
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000409
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000410 svn's stdout is parsed to collect a list of files checked out or updated.
411 These files are appended to file_list. svn's stdout is also printed to
412 sys.stdout as in Run.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000413
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000414 Args:
maruel@chromium.org03807072010-08-16 17:18:44 +0000415 verbose: If True, uses verbose output
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000416 args: A sequence of command line parameters to be passed to svn.
maruel@chromium.org2b9aa8e2010-08-25 20:01:42 +0000417 cwd: The directory where svn is to be run.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000418
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000419 Raises:
420 Error: An error occurred while running the svn command.
421 """
maruel@chromium.org2b9aa8e2010-08-25 20:01:42 +0000422 stdout = stdout or sys.stdout
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000423
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000424 # svn update and svn checkout use the same pattern: the first three columns
425 # are for file status, property status, and lock status. This is followed
426 # by two spaces, and then the path to the file.
427 update_pattern = '^... (.*)$'
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000428
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000429 # The first three columns of svn status are the same as for svn update and
430 # svn checkout. The next three columns indicate addition-with-history,
431 # switch, and remote lock status. This is followed by one space, and then
432 # the path to the file.
433 status_pattern = '^...... (.*)$'
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000434
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000435 # args[0] must be a supported command. This will blow up if it's something
436 # else, which is good. Note that the patterns are only effective when
437 # these commands are used in their ordinary forms, the patterns are invalid
438 # for "svn status --show-updates", for example.
439 pattern = {
440 'checkout': update_pattern,
441 'status': status_pattern,
442 'update': update_pattern,
443 }[args[0]]
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000444 compiled_pattern = re.compile(pattern)
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000445 # Place an upper limit.
cbentzel@chromium.org2aee2292010-09-03 14:15:25 +0000446 backoff_time = 5
maruel@chromium.orgbec588d2010-10-26 13:50:25 +0000447 retries = 0
maruel@chromium.org03507062010-10-26 00:58:27 +0000448 while True:
maruel@chromium.orgbec588d2010-10-26 13:50:25 +0000449 retries += 1
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000450 previous_list_len = len(file_list)
451 failure = []
maruel@chromium.org54d1f1a2010-01-08 19:53:47 +0000452
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000453 def CaptureMatchingLines(line):
454 match = compiled_pattern.search(line)
455 if match:
456 file_list.append(match.group(1))
457 if line.startswith('svn: '):
maruel@chromium.org8599aa72010-02-08 20:27:14 +0000458 failure.append(line)
maruel@chromium.org54d1f1a2010-01-08 19:53:47 +0000459
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000460 try:
maruel@chromium.org17d01792010-09-01 18:07:10 +0000461 gclient_utils.CheckCallAndFilterAndHeader(
462 ['svn'] + args,
463 cwd=cwd,
464 always=verbose,
465 filter_fn=CaptureMatchingLines,
466 stdout=stdout)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000467 except subprocess2.CalledProcessError:
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000468 def IsKnownFailure():
469 for x in failure:
470 if (x.startswith('svn: OPTIONS of') or
471 x.startswith('svn: PROPFIND of') or
472 x.startswith('svn: REPORT of') or
maruel@chromium.orgf61fc932010-08-19 13:05:24 +0000473 x.startswith('svn: Unknown hostname') or
maruel@chromium.org7d8b97d2011-10-11 23:32:30 +0000474 x.startswith('svn: Server sent unexpected return value') or
475 x.startswith('svn: Can\'t connect to host')):
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000476 return True
477 return False
478
maruel@chromium.org953586a2010-06-15 14:22:24 +0000479 # Subversion client is really misbehaving with Google Code.
480 if args[0] == 'checkout':
481 # Ensure at least one file was checked out, otherwise *delete* the
482 # directory.
483 if len(file_list) == previous_list_len:
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000484 if not IsKnownFailure():
maruel@chromium.org953586a2010-06-15 14:22:24 +0000485 # No known svn error was found, bail out.
486 raise
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000487 # No file were checked out, so make sure the directory is
488 # deleted in case it's messed up and try again.
489 # Warning: It's bad, it assumes args[2] is the directory
490 # argument.
491 if os.path.isdir(args[2]):
492 gclient_utils.RemoveDirectory(args[2])
maruel@chromium.org953586a2010-06-15 14:22:24 +0000493 else:
494 # Progress was made, convert to update since an aborted checkout
495 # is now an update.
maruel@chromium.org2de10252010-02-08 01:10:39 +0000496 args = ['update'] + args[1:]
maruel@chromium.org953586a2010-06-15 14:22:24 +0000497 else:
498 # It was an update or export.
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000499 # We enforce that some progress has been made or a known failure.
500 if len(file_list) == previous_list_len and not IsKnownFailure():
501 # No known svn error was found and no progress, bail out.
502 raise
maruel@chromium.orgbec588d2010-10-26 13:50:25 +0000503 if retries == 10:
maruel@chromium.org03507062010-10-26 00:58:27 +0000504 raise
cbentzel@chromium.org2aee2292010-09-03 14:15:25 +0000505 print "Sleeping %.1f seconds and retrying...." % backoff_time
506 time.sleep(backoff_time)
507 backoff_time *= 1.3
maruel@chromium.org953586a2010-06-15 14:22:24 +0000508 continue
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000509 break
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000510
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000511 @staticmethod
maruel@chromium.org54019f32010-09-09 13:50:11 +0000512 def CaptureInfo(cwd):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000513 """Returns a dictionary from the svn info output for the given file.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000514
maruel@chromium.org54019f32010-09-09 13:50:11 +0000515 Throws an exception if svn info fails."""
maruel@chromium.orgd25fb8f2011-04-07 13:40:15 +0000516 result = {}
maruel@chromium.orgade9c592011-04-07 15:59:11 +0000517 output = SVN.Capture(['info', '--xml', cwd])
518 info = ElementTree.XML(output)
519 if info is None:
520 return result
521 entry = info.find('entry')
maruel@chromium.org6f323bb2011-04-26 15:42:53 +0000522 if entry is None:
523 return result
maruel@chromium.orgade9c592011-04-07 15:59:11 +0000524
525 # Use .text when the item is not optional.
526 result['Path'] = entry.attrib['path']
527 result['Revision'] = int(entry.attrib['revision'])
528 result['Node Kind'] = entry.attrib['kind']
529 # Differs across versions.
530 if result['Node Kind'] == 'dir':
531 result['Node Kind'] = 'directory'
532 result['URL'] = entry.find('url').text
533 repository = entry.find('repository')
534 result['Repository Root'] = repository.find('root').text
535 result['UUID'] = repository.find('uuid')
536 wc_info = entry.find('wc-info')
537 if wc_info is not None:
538 result['Schedule'] = wc_info.find('schedule').text
539 result['Copied From URL'] = wc_info.find('copy-from-url')
540 result['Copied From Rev'] = wc_info.find('copy-from-rev')
541 else:
542 result['Schedule'] = None
543 result['Copied From URL'] = None
544 result['Copied From Rev'] = None
545 for key in result.keys():
546 if isinstance(result[key], unicode):
547 # Unicode results interferes with the higher layers matching up things
548 # in the deps dictionary.
549 result[key] = result[key].encode()
550 # Automatic conversion of optional parameters.
551 result[key] = getattr(result[key], 'text', result[key])
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000552 return result
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000553
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000554 @staticmethod
maruel@chromium.org54019f32010-09-09 13:50:11 +0000555 def CaptureRevision(cwd):
nasser@codeaurora.org5d63eb82010-03-24 23:22:09 +0000556 """Get the base revision of a SVN repository.
557
558 Returns:
559 Int base revision
560 """
maruel@chromium.orgade9c592011-04-07 15:59:11 +0000561 return SVN.CaptureInfo(cwd).get('Revision')
nasser@codeaurora.org5d63eb82010-03-24 23:22:09 +0000562
563 @staticmethod
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000564 def CaptureStatus(files):
565 """Returns the svn 1.5 svn status emulated output.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000566
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000567 @files can be a string (one file) or a list of files.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000568
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000569 Returns an array of (status, file) tuples."""
570 command = ["status", "--xml"]
571 if not files:
572 pass
573 elif isinstance(files, basestring):
574 command.append(files)
575 else:
576 command.extend(files)
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000577
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000578 status_letter = {
579 None: ' ',
580 '': ' ',
581 'added': 'A',
582 'conflicted': 'C',
583 'deleted': 'D',
584 'external': 'X',
585 'ignored': 'I',
586 'incomplete': '!',
587 'merged': 'G',
588 'missing': '!',
589 'modified': 'M',
590 'none': ' ',
591 'normal': ' ',
592 'obstructed': '~',
593 'replaced': 'R',
594 'unversioned': '?',
595 }
maruel@chromium.orgade9c592011-04-07 15:59:11 +0000596 dom = ElementTree.XML(SVN.Capture(command))
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000597 results = []
maruel@chromium.orgade9c592011-04-07 15:59:11 +0000598 if dom is None:
599 return results
600 # /status/target/entry/(wc-status|commit|author|date)
601 for target in dom.findall('target'):
602 for entry in target.findall('entry'):
603 file_path = entry.attrib['path']
604 wc_status = entry.find('wc-status')
605 # Emulate svn 1.5 status ouput...
606 statuses = [' '] * 7
607 # Col 0
608 xml_item_status = wc_status.attrib['item']
609 if xml_item_status in status_letter:
610 statuses[0] = status_letter[xml_item_status]
611 else:
612 raise gclient_utils.Error(
613 'Unknown item status "%s"; please implement me!' %
614 xml_item_status)
615 # Col 1
616 xml_props_status = wc_status.attrib['props']
617 if xml_props_status == 'modified':
618 statuses[1] = 'M'
619 elif xml_props_status == 'conflicted':
620 statuses[1] = 'C'
621 elif (not xml_props_status or xml_props_status == 'none' or
622 xml_props_status == 'normal'):
623 pass
624 else:
625 raise gclient_utils.Error(
626 'Unknown props status "%s"; please implement me!' %
627 xml_props_status)
628 # Col 2
629 if wc_status.attrib.get('wc-locked') == 'true':
630 statuses[2] = 'L'
631 # Col 3
632 if wc_status.attrib.get('copied') == 'true':
633 statuses[3] = '+'
634 # Col 4
635 if wc_status.attrib.get('switched') == 'true':
636 statuses[4] = 'S'
637 # TODO(maruel): Col 5 and 6
638 item = (''.join(statuses), file_path)
639 results.append(item)
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000640 return results
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000641
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000642 @staticmethod
643 def IsMoved(filename):
644 """Determine if a file has been added through svn mv"""
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000645 return SVN.IsMovedInfo(SVN.CaptureInfo(filename))
646
647 @staticmethod
648 def IsMovedInfo(info):
649 """Determine if a file has been added through svn mv"""
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000650 return (info.get('Copied From URL') and
651 info.get('Copied From Rev') and
652 info.get('Schedule') == 'add')
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000653
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000654 @staticmethod
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000655 def GetFileProperty(filename, property_name):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000656 """Returns the value of an SVN property for the given file.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000657
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000658 Args:
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000659 filename: The file to check
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000660 property_name: The name of the SVN property, e.g. "svn:mime-type"
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000661
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000662 Returns:
663 The value of the property, which will be the empty string if the property
664 is not set on the file. If the file is not under version control, the
665 empty string is also returned.
666 """
maruel@chromium.org54019f32010-09-09 13:50:11 +0000667 try:
668 return SVN.Capture(['propget', property_name, filename])
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000669 except subprocess2.CalledProcessError:
maruel@chromium.org54019f32010-09-09 13:50:11 +0000670 return ''
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000671
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000672 @staticmethod
maruel@chromium.org1c7db8e2010-01-07 02:00:19 +0000673 def DiffItem(filename, full_move=False, revision=None):
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000674 """Diffs a single file.
675
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000676 Should be simple, eh? No it isn't.
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000677 Be sure to be in the appropriate directory before calling to have the
maruel@chromium.orga9371762009-12-22 18:27:38 +0000678 expected relative path.
679 full_move means that move or copy operations should completely recreate the
680 files, usually in the prospect to apply the patch for a try job."""
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000681 # If the user specified a custom diff command in their svn config file,
682 # then it'll be used when we do svn diff, which we don't want to happen
683 # since we want the unified diff. Using --diff-cmd=diff doesn't always
684 # work, since they can have another diff executable in their path that
685 # gives different line endings. So we use a bogus temp directory as the
686 # config directory, which gets around these problems.
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000687 bogus_dir = tempfile.mkdtemp()
688 try:
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000689 # Use "svn info" output instead of os.path.isdir because the latter fails
690 # when the file is deleted.
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000691 return SVN._DiffItemInternal(filename, SVN.CaptureInfo(filename),
692 bogus_dir,
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000693 full_move=full_move, revision=revision)
694 finally:
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000695 gclient_utils.RemoveDirectory(bogus_dir)
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000696
697 @staticmethod
698 def _DiffItemInternal(filename, info, bogus_dir, full_move=False,
699 revision=None):
700 """Grabs the diff data."""
701 command = ["diff", "--config-dir", bogus_dir, filename]
702 if revision:
703 command.extend(['--revision', revision])
704 data = None
705 if SVN.IsMovedInfo(info):
706 if full_move:
707 if info.get("Node Kind") == "directory":
708 # Things become tricky here. It's a directory copy/move. We need to
709 # diff all the files inside it.
710 # This will put a lot of pressure on the heap. This is why StringIO
711 # is used and converted back into a string at the end. The reason to
712 # return a string instead of a StringIO is that StringIO.write()
713 # doesn't accept a StringIO object. *sigh*.
714 for (dirpath, dirnames, filenames) in os.walk(filename):
715 # Cleanup all files starting with a '.'.
716 for d in dirnames:
717 if d.startswith('.'):
718 dirnames.remove(d)
719 for f in filenames:
720 if f.startswith('.'):
721 filenames.remove(f)
722 for f in filenames:
723 if data is None:
724 data = cStringIO.StringIO()
725 data.write(GenFakeDiff(os.path.join(dirpath, f)))
726 if data:
727 tmp = data.getvalue()
728 data.close()
729 data = tmp
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000730 else:
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000731 data = GenFakeDiff(filename)
732 else:
733 if info.get("Node Kind") != "directory":
maruel@chromium.org0836c562010-01-22 01:10:06 +0000734 # svn diff on a mv/cp'd file outputs nothing if there was no change.
maruel@chromium.org54019f32010-09-09 13:50:11 +0000735 data = SVN.Capture(command)
maruel@chromium.org0836c562010-01-22 01:10:06 +0000736 if not data:
737 # We put in an empty Index entry so upload.py knows about them.
maruel@chromium.orgc6d170e2010-06-03 00:06:00 +0000738 data = "Index: %s\n" % filename.replace(os.sep, '/')
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000739 # Otherwise silently ignore directories.
740 else:
741 if info.get("Node Kind") != "directory":
742 # Normal simple case.
maruel@chromium.orgf8b3f942011-03-24 17:33:50 +0000743 try:
744 data = SVN.Capture(command)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000745 except subprocess2.CalledProcessError:
maruel@chromium.orgf8b3f942011-03-24 17:33:50 +0000746 if revision:
747 data = GenFakeDiff(filename)
748 else:
749 raise
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000750 # Otherwise silently ignore directories.
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000751 return data
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000752
753 @staticmethod
maruel@chromium.org1c7db8e2010-01-07 02:00:19 +0000754 def GenerateDiff(filenames, root=None, full_move=False, revision=None):
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000755 """Returns a string containing the diff for the given file list.
756
757 The files in the list should either be absolute paths or relative to the
758 given root. If no root directory is provided, the repository root will be
759 used.
760 The diff will always use relative paths.
761 """
maruel@chromium.org00fdcb32011-02-24 01:41:02 +0000762 assert isinstance(filenames, (list, tuple))
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000763 previous_cwd = os.getcwd()
maruel@chromium.orgfd9cbbb2010-01-08 23:04:03 +0000764 root = root or SVN.GetCheckoutRoot(previous_cwd)
765 root = os.path.normcase(os.path.join(root, ''))
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000766 def RelativePath(path, root):
767 """We must use relative paths."""
maruel@chromium.orgfd9cbbb2010-01-08 23:04:03 +0000768 if os.path.normcase(path).startswith(root):
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000769 return path[len(root):]
770 return path
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000771 # If the user specified a custom diff command in their svn config file,
772 # then it'll be used when we do svn diff, which we don't want to happen
773 # since we want the unified diff. Using --diff-cmd=diff doesn't always
774 # work, since they can have another diff executable in their path that
775 # gives different line endings. So we use a bogus temp directory as the
776 # config directory, which gets around these problems.
777 bogus_dir = tempfile.mkdtemp()
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000778 try:
779 os.chdir(root)
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000780 # Cleanup filenames
781 filenames = [RelativePath(f, root) for f in filenames]
782 # Get information about the modified items (files and directories)
783 data = dict([(f, SVN.CaptureInfo(f)) for f in filenames])
gavinp@google.com3fda4cc2010-06-29 13:29:27 +0000784 diffs = []
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000785 if full_move:
786 # Eliminate modified files inside moved/copied directory.
787 for (filename, info) in data.iteritems():
788 if SVN.IsMovedInfo(info) and info.get("Node Kind") == "directory":
789 # Remove files inside the directory.
790 filenames = [f for f in filenames
791 if not f.startswith(filename + os.path.sep)]
792 for filename in data.keys():
793 if not filename in filenames:
794 # Remove filtered out items.
795 del data[filename]
gavinp@google.com3fda4cc2010-06-29 13:29:27 +0000796 else:
797 metaheaders = []
798 for (filename, info) in data.iteritems():
799 if SVN.IsMovedInfo(info):
800 # for now, the most common case is a head copy,
801 # so let's just encode that as a straight up cp.
802 srcurl = info.get('Copied From URL')
803 root = info.get('Repository Root')
804 rev = int(info.get('Copied From Rev'))
805 assert srcurl.startswith(root)
806 src = srcurl[len(root)+1:]
maruel@chromium.org00fdcb32011-02-24 01:41:02 +0000807 try:
808 srcinfo = SVN.CaptureInfo(srcurl)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000809 except subprocess2.CalledProcessError, e:
maruel@chromium.org00fdcb32011-02-24 01:41:02 +0000810 if not 'Not a valid URL' in e.stderr:
811 raise
812 # Assume the file was deleted. No idea how to figure out at which
813 # revision the file was deleted.
814 srcinfo = {'Revision': rev}
gavinp@google.com3fda4cc2010-06-29 13:29:27 +0000815 if (srcinfo.get('Revision') != rev and
816 SVN.Capture(['diff', '-r', '%d:head' % rev, srcurl])):
817 metaheaders.append("#$ svn cp -r %d %s %s "
818 "### WARNING: note non-trunk copy\n" %
819 (rev, src, filename))
820 else:
821 metaheaders.append("#$ cp %s %s\n" % (src,
822 filename))
823
824 if metaheaders:
825 diffs.append("### BEGIN SVN COPY METADATA\n")
826 diffs.extend(metaheaders)
827 diffs.append("### END SVN COPY METADATA\n")
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000828 # Now ready to do the actual diff.
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000829 for filename in sorted(data.iterkeys()):
830 diffs.append(SVN._DiffItemInternal(filename, data[filename], bogus_dir,
831 full_move=full_move,
832 revision=revision))
833 # Use StringIO since it can be messy when diffing a directory move with
834 # full_move=True.
835 buf = cStringIO.StringIO()
836 for d in filter(None, diffs):
837 buf.write(d)
838 result = buf.getvalue()
839 buf.close()
840 return result
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000841 finally:
842 os.chdir(previous_cwd)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000843 gclient_utils.RemoveDirectory(bogus_dir)
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000844
845 @staticmethod
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000846 def GetEmail(repo_root):
847 """Retrieves the svn account which we assume is an email address."""
maruel@chromium.org54019f32010-09-09 13:50:11 +0000848 try:
849 infos = SVN.CaptureInfo(repo_root)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000850 except subprocess2.CalledProcessError:
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000851 return None
852
853 # Should check for uuid but it is incorrectly saved for https creds.
maruel@chromium.org54019f32010-09-09 13:50:11 +0000854 root = infos['Repository Root']
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000855 realm = root.rsplit('/', 1)[0]
maruel@chromium.org54019f32010-09-09 13:50:11 +0000856 uuid = infos['UUID']
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000857 if root.startswith('https') or not uuid:
858 regexp = re.compile(r'<%s:\d+>.*' % realm)
859 else:
860 regexp = re.compile(r'<%s:\d+> %s' % (realm, uuid))
861 if regexp is None:
862 return None
863 if sys.platform.startswith('win'):
864 if not 'APPDATA' in os.environ:
865 return None
maruel@chromium.org720d9f32009-11-21 17:38:57 +0000866 auth_dir = os.path.join(os.environ['APPDATA'], 'Subversion', 'auth',
867 'svn.simple')
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000868 else:
869 if not 'HOME' in os.environ:
870 return None
871 auth_dir = os.path.join(os.environ['HOME'], '.subversion', 'auth',
872 'svn.simple')
873 for credfile in os.listdir(auth_dir):
874 cred_info = SVN.ReadSimpleAuth(os.path.join(auth_dir, credfile))
875 if regexp.match(cred_info.get('svn:realmstring')):
876 return cred_info.get('username')
877
878 @staticmethod
879 def ReadSimpleAuth(filename):
880 f = open(filename, 'r')
881 values = {}
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000882 def ReadOneItem(item_type):
883 m = re.match(r'%s (\d+)' % item_type, f.readline())
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000884 if not m:
885 return None
886 data = f.read(int(m.group(1)))
887 if f.read(1) != '\n':
888 return None
889 return data
890
891 while True:
892 key = ReadOneItem('K')
893 if not key:
894 break
895 value = ReadOneItem('V')
896 if not value:
897 break
898 values[key] = value
899 return values
maruel@chromium.org94b1ee92009-12-19 20:27:20 +0000900
901 @staticmethod
902 def GetCheckoutRoot(directory):
903 """Returns the top level directory of the current repository.
904
905 The directory is returned as an absolute path.
906 """
maruel@chromium.orgf7ae6d52009-12-22 20:49:04 +0000907 directory = os.path.abspath(directory)
maruel@chromium.org54019f32010-09-09 13:50:11 +0000908 try:
maruel@chromium.org885d6e82011-02-24 20:21:46 +0000909 info = SVN.CaptureInfo(directory)
910 cur_dir_repo_root = info['Repository Root']
911 url = info['URL']
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000912 except subprocess2.CalledProcessError:
maruel@chromium.org94b1ee92009-12-19 20:27:20 +0000913 return None
maruel@chromium.org94b1ee92009-12-19 20:27:20 +0000914 while True:
915 parent = os.path.dirname(directory)
maruel@chromium.org54019f32010-09-09 13:50:11 +0000916 try:
maruel@chromium.org885d6e82011-02-24 20:21:46 +0000917 info = SVN.CaptureInfo(parent)
918 if (info['Repository Root'] != cur_dir_repo_root or
919 info['URL'] != os.path.dirname(url)):
maruel@chromium.org54019f32010-09-09 13:50:11 +0000920 break
maruel@chromium.org885d6e82011-02-24 20:21:46 +0000921 url = info['URL']
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000922 except subprocess2.CalledProcessError:
maruel@chromium.org94b1ee92009-12-19 20:27:20 +0000923 break
924 directory = parent
maruel@chromium.orgfd9cbbb2010-01-08 23:04:03 +0000925 return GetCasedPath(directory)
tony@chromium.org57564662010-04-14 02:35:12 +0000926
maruel@chromium.orgedb6ea62011-10-11 20:25:13 +0000927 @staticmethod
928 def AssertVersion(min_version):
tony@chromium.org57564662010-04-14 02:35:12 +0000929 """Asserts svn's version is at least min_version."""
maruel@chromium.orgedb6ea62011-10-11 20:25:13 +0000930 def only_int(val):
931 if val.isdigit():
932 return int(val)
933 else:
934 return 0
935 if not SVN.current_version:
936 SVN.current_version = SVN.Capture(['--version']).split()[2]
937 current_version_list = map(only_int, SVN.current_version.split('.'))
tony@chromium.org57564662010-04-14 02:35:12 +0000938 for min_ver in map(int, min_version.split('.')):
939 ver = current_version_list.pop(0)
940 if ver < min_ver:
maruel@chromium.orgedb6ea62011-10-11 20:25:13 +0000941 return (False, SVN.current_version)
tony@chromium.org57564662010-04-14 02:35:12 +0000942 elif ver > min_ver:
maruel@chromium.orgedb6ea62011-10-11 20:25:13 +0000943 return (True, SVN.current_version)
944 return (True, SVN.current_version)
maruel@chromium.org07ab60e2011-02-08 21:54:00 +0000945
946 @staticmethod
947 def Revert(repo_root, callback=None, ignore_externals=False):
948 """Reverts all svn modifications in repo_root, including properties.
949
950 Deletes any modified files or directory.
951
952 A "svn update --revision BASE" call is required after to revive deleted
953 files.
954 """
955 for file_status in SVN.CaptureStatus(repo_root):
956 file_path = os.path.join(repo_root, file_status[1])
maruel@chromium.org8c415122011-03-15 17:14:27 +0000957 if (ignore_externals and
958 file_status[0][0] == 'X' and
959 file_status[0][1:].isspace()):
maruel@chromium.org07ab60e2011-02-08 21:54:00 +0000960 # Ignore externals.
961 logging.info('Ignoring external %s' % file_status[1])
962 continue
963
964 if callback:
965 callback(file_status)
966
maruel@chromium.org8c415122011-03-15 17:14:27 +0000967 if os.path.exists(file_path):
968 # svn revert is really stupid. It fails on inconsistent line-endings,
969 # on switched directories, etc. So take no chance and delete everything!
970 # In theory, it wouldn't be necessary for property-only change but then
971 # it'd have to look for switched directories, etc so it's not worth
972 # optimizing this use case.
973 if os.path.isfile(file_path) or os.path.islink(file_path):
974 logging.info('os.remove(%s)' % file_path)
975 os.remove(file_path)
976 elif os.path.isdir(file_path):
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000977 logging.info('RemoveDirectory(%s)' % file_path)
maruel@chromium.org8c415122011-03-15 17:14:27 +0000978 gclient_utils.RemoveDirectory(file_path)
979 else:
980 logging.critical(
981 ('No idea what is %s.\nYou just found a bug in gclient'
982 ', please ping maruel@chromium.org ASAP!') % file_path)
maruel@chromium.org07ab60e2011-02-08 21:54:00 +0000983
maruel@chromium.org8c415122011-03-15 17:14:27 +0000984 if (file_status[0][0] in ('D', 'A', '!') or
985 not file_status[0][1:].isspace()):
maruel@chromium.orgaf453492011-03-03 21:04:09 +0000986 # Added, deleted file requires manual intervention and require calling
maruel@chromium.org07ab60e2011-02-08 21:54:00 +0000987 # revert, like for properties.
maruel@chromium.orgaf453492011-03-03 21:04:09 +0000988 try:
989 SVN.Capture(['revert', file_status[1]], cwd=repo_root)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000990 except subprocess2.CalledProcessError:
maruel@chromium.orgaf453492011-03-03 21:04:09 +0000991 if not os.path.exists(file_path):
992 continue
993 raise