blob: 875541ff8f52efbb0f5ec2f95ce544fafdae7617 [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.org94aa50f2011-10-11 19:31:26 +000089def only_int(val):
90 if val.isdigit():
91 return int(val)
92 else:
93 return 0
94
95
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +000096class GIT(object):
maruel@chromium.org94aa50f2011-10-11 19:31:26 +000097 current_version = None
98
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +000099 @staticmethod
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000100 def Capture(args, **kwargs):
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000101 return subprocess2.check_output(
maruel@chromium.org73c87e92011-09-09 12:03:54 +0000102 ['git'] + args, stderr=subprocess2.PIPE, **kwargs)
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000103
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000104 @staticmethod
msb@chromium.org786fb682010-06-02 15:16:23 +0000105 def CaptureStatus(files, upstream_branch=None):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000106 """Returns git status.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000107
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000108 @files can be a string (one file) or a list of files.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000109
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000110 Returns an array of (status, file) tuples."""
msb@chromium.org786fb682010-06-02 15:16:23 +0000111 if upstream_branch is None:
112 upstream_branch = GIT.GetUpstreamBranch(os.getcwd())
113 if upstream_branch is None:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000114 raise gclient_utils.Error('Cannot determine upstream branch')
115 command = ['diff', '--name-status', '-r', '%s...' % upstream_branch]
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000116 if not files:
117 pass
118 elif isinstance(files, basestring):
119 command.append(files)
120 else:
121 command.extend(files)
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000122 status = GIT.Capture(command).rstrip()
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000123 results = []
124 if status:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000125 for statusline in status.splitlines():
maruel@chromium.orgcc1614b2010-09-20 17:13:17 +0000126 # 3-way merges can cause the status can be 'MMM' instead of 'M'. This
127 # can happen when the user has 2 local branches and he diffs between
128 # these 2 branches instead diffing to upstream.
129 m = re.match('^(\w)+\t(.+)$', statusline)
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000130 if not m:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000131 raise gclient_utils.Error(
132 'status currently unsupported: %s' % statusline)
maruel@chromium.orgcc1614b2010-09-20 17:13:17 +0000133 # Only grab the first letter.
134 results.append(('%s ' % m.group(1)[0], m.group(2)))
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000135 return results
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000136
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000137 @staticmethod
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000138 def GetEmail(cwd):
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000139 """Retrieves the user email address if known."""
140 # We could want to look at the svn cred when it has a svn remote but it
141 # should be fine for now, users should simply configure their git settings.
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000142 try:
143 return GIT.Capture(['config', 'user.email'], cwd=cwd).strip()
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000144 except subprocess2.CalledProcessError:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000145 return ''
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000146
147 @staticmethod
148 def ShortBranchName(branch):
149 """Converts a name like 'refs/heads/foo' to just 'foo'."""
150 return branch.replace('refs/heads/', '')
151
152 @staticmethod
153 def GetBranchRef(cwd):
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000154 """Returns the full branch reference, e.g. 'refs/heads/master'."""
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000155 return GIT.Capture(['symbolic-ref', 'HEAD'], cwd=cwd).strip()
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000156
157 @staticmethod
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000158 def GetBranch(cwd):
159 """Returns the short branch name, e.g. 'master'."""
maruel@chromium.orgc308a742009-12-22 18:29:33 +0000160 return GIT.ShortBranchName(GIT.GetBranchRef(cwd))
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000161
162 @staticmethod
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000163 def IsGitSvn(cwd):
164 """Returns true if this repo looks like it's using git-svn."""
165 # If you have any "svn-remote.*" config keys, we think you're using svn.
166 try:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000167 GIT.Capture(['config', '--get-regexp', r'^svn-remote\.'], cwd=cwd)
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000168 return True
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000169 except subprocess2.CalledProcessError:
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000170 return False
171
172 @staticmethod
bauerb@chromium.org866276c2011-03-18 20:09:31 +0000173 def MatchSvnGlob(url, base_url, glob_spec, allow_wildcards):
174 """Return the corresponding git ref if |base_url| together with |glob_spec|
175 matches the full |url|.
176
177 If |allow_wildcards| is true, |glob_spec| can contain wildcards (see below).
178 """
179 fetch_suburl, as_ref = glob_spec.split(':')
180 if allow_wildcards:
181 glob_match = re.match('(.+/)?(\*|{[^/]*})(/.+)?', fetch_suburl)
182 if glob_match:
183 # Parse specs like "branches/*/src:refs/remotes/svn/*" or
184 # "branches/{472,597,648}/src:refs/remotes/svn/*".
185 branch_re = re.escape(base_url)
186 if glob_match.group(1):
187 branch_re += '/' + re.escape(glob_match.group(1))
188 wildcard = glob_match.group(2)
189 if wildcard == '*':
190 branch_re += '([^/]*)'
191 else:
192 # Escape and replace surrounding braces with parentheses and commas
193 # with pipe symbols.
194 wildcard = re.escape(wildcard)
195 wildcard = re.sub('^\\\\{', '(', wildcard)
196 wildcard = re.sub('\\\\,', '|', wildcard)
197 wildcard = re.sub('\\\\}$', ')', wildcard)
198 branch_re += wildcard
199 if glob_match.group(3):
200 branch_re += re.escape(glob_match.group(3))
201 match = re.match(branch_re, url)
202 if match:
203 return re.sub('\*$', match.group(1), as_ref)
204
205 # Parse specs like "trunk/src:refs/remotes/origin/trunk".
206 if fetch_suburl:
207 full_url = base_url + '/' + fetch_suburl
208 else:
209 full_url = base_url
210 if full_url == url:
211 return as_ref
212 return None
213
214 @staticmethod
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000215 def GetSVNBranch(cwd):
216 """Returns the svn branch name if found."""
217 # Try to figure out which remote branch we're based on.
218 # Strategy:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000219 # 1) iterate through our branch history and find the svn URL.
220 # 2) find the svn-remote that fetches from the URL.
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000221
222 # regexp matching the git-svn line that contains the URL.
223 git_svn_re = re.compile(r'^\s*git-svn-id: (\S+)@', re.MULTILINE)
224
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000225 # We don't want to go through all of history, so read a line from the
226 # pipe at a time.
227 # The -100 is an arbitrary limit so we don't search forever.
228 cmd = ['git', 'log', '-100', '--pretty=medium']
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000229 proc = subprocess2.Popen(cmd, stdout=subprocess2.PIPE)
maruel@chromium.orge8c28622011-04-05 14:41:44 +0000230 url = None
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000231 for line in proc.stdout:
232 match = git_svn_re.match(line)
233 if match:
234 url = match.group(1)
235 proc.stdout.close() # Cut pipe.
236 break
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000237
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000238 if url:
239 svn_remote_re = re.compile(r'^svn-remote\.([^.]+)\.url (.*)$')
240 remotes = GIT.Capture(['config', '--get-regexp',
241 r'^svn-remote\..*\.url'], cwd=cwd).splitlines()
242 for remote in remotes:
243 match = svn_remote_re.match(remote)
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000244 if match:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000245 remote = match.group(1)
246 base_url = match.group(2)
bauerb@chromium.org866276c2011-03-18 20:09:31 +0000247 try:
248 fetch_spec = GIT.Capture(
249 ['config', 'svn-remote.%s.fetch' % remote],
250 cwd=cwd).strip()
251 branch = GIT.MatchSvnGlob(url, base_url, fetch_spec, False)
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 branch_spec = GIT.Capture(
258 ['config', 'svn-remote.%s.branches' % remote],
259 cwd=cwd).strip()
260 branch = GIT.MatchSvnGlob(url, base_url, branch_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
265 try:
266 tag_spec = GIT.Capture(
267 ['config', 'svn-remote.%s.tags' % remote],
268 cwd=cwd).strip()
269 branch = GIT.MatchSvnGlob(url, base_url, tag_spec, True)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000270 except subprocess2.CalledProcessError:
bauerb@chromium.org866276c2011-03-18 20:09:31 +0000271 branch = None
272 if branch:
273 return branch
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000274
275 @staticmethod
276 def FetchUpstreamTuple(cwd):
277 """Returns a tuple containg remote and remote ref,
278 e.g. 'origin', 'refs/heads/master'
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000279 Tries to be intelligent and understand git-svn.
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000280 """
281 remote = '.'
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000282 branch = GIT.GetBranch(cwd)
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000283 try:
284 upstream_branch = GIT.Capture(
285 ['config', 'branch.%s.merge' % branch], cwd=cwd).strip()
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000286 except subprocess2.CalledProcessError:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000287 upstream_branch = None
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000288 if upstream_branch:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000289 try:
290 remote = GIT.Capture(
291 ['config', 'branch.%s.remote' % branch], cwd=cwd).strip()
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000292 except subprocess2.CalledProcessError:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000293 pass
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000294 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000295 try:
296 upstream_branch = GIT.Capture(
297 ['config', 'rietveld.upstream-branch'], cwd=cwd).strip()
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000298 except subprocess2.CalledProcessError:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000299 upstream_branch = None
300 if upstream_branch:
301 try:
302 remote = GIT.Capture(
303 ['config', 'rietveld.upstream-remote'], cwd=cwd).strip()
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000304 except subprocess2.CalledProcessError:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000305 pass
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000306 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000307 # Fall back on trying a git-svn upstream branch.
308 if GIT.IsGitSvn(cwd):
309 upstream_branch = GIT.GetSVNBranch(cwd)
maruel@chromium.orga630bd72010-04-29 23:32:34 +0000310 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000311 # Else, try to guess the origin remote.
312 remote_branches = GIT.Capture(['branch', '-r'], cwd=cwd).split()
313 if 'origin/master' in remote_branches:
314 # Fall back on origin/master if it exits.
315 remote = 'origin'
316 upstream_branch = 'refs/heads/master'
317 elif 'origin/trunk' in remote_branches:
318 # Fall back on origin/trunk if it exists. Generally a shared
319 # git-svn clone
320 remote = 'origin'
321 upstream_branch = 'refs/heads/trunk'
322 else:
323 # Give up.
324 remote = None
325 upstream_branch = None
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000326 return remote, upstream_branch
327
328 @staticmethod
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000329 def GetUpstreamBranch(cwd):
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000330 """Gets the current branch's upstream branch."""
331 remote, upstream_branch = GIT.FetchUpstreamTuple(cwd)
maruel@chromium.orga630bd72010-04-29 23:32:34 +0000332 if remote != '.' and upstream_branch:
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000333 upstream_branch = upstream_branch.replace('heads', 'remotes/' + remote)
334 return upstream_branch
335
336 @staticmethod
maruel@chromium.org8ede00e2010-01-12 14:35:28 +0000337 def GenerateDiff(cwd, branch=None, branch_head='HEAD', full_move=False,
338 files=None):
maruel@chromium.orga9371762009-12-22 18:27:38 +0000339 """Diffs against the upstream branch or optionally another branch.
340
341 full_move means that move or copy operations should completely recreate the
342 files, usually in the prospect to apply the patch for a try job."""
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000343 if not branch:
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000344 branch = GIT.GetUpstreamBranch(cwd)
evan@chromium.org400f3e72010-05-19 14:23:36 +0000345 command = ['diff', '-p', '--no-prefix', '--no-ext-diff',
346 branch + "..." + branch_head]
maruel@chromium.orga9371762009-12-22 18:27:38 +0000347 if not full_move:
348 command.append('-C')
maruel@chromium.org8ede00e2010-01-12 14:35:28 +0000349 # TODO(maruel): --binary support.
350 if files:
351 command.append('--')
352 command.extend(files)
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000353 diff = GIT.Capture(command, cwd=cwd).splitlines(True)
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000354 for i in range(len(diff)):
355 # In the case of added files, replace /dev/null with the path to the
356 # file being added.
357 if diff[i].startswith('--- /dev/null'):
358 diff[i] = '--- %s' % diff[i+1][4:]
359 return ''.join(diff)
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000360
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000361 @staticmethod
maruel@chromium.org8ede00e2010-01-12 14:35:28 +0000362 def GetDifferentFiles(cwd, branch=None, branch_head='HEAD'):
363 """Returns the list of modified files between two branches."""
364 if not branch:
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000365 branch = GIT.GetUpstreamBranch(cwd)
bauerb@chromium.org838f0f22010-04-09 17:02:50 +0000366 command = ['diff', '--name-only', branch + "..." + branch_head]
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000367 return GIT.Capture(command, cwd=cwd).splitlines(False)
maruel@chromium.org8ede00e2010-01-12 14:35:28 +0000368
369 @staticmethod
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000370 def GetPatchName(cwd):
371 """Constructs a name for this patch."""
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000372 short_sha = GIT.Capture(['rev-parse', '--short=4', 'HEAD'], cwd=cwd).strip()
maruel@chromium.org862ff8e2010-08-06 15:29:16 +0000373 return "%s#%s" % (GIT.GetBranch(cwd), short_sha)
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000374
375 @staticmethod
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000376 def GetCheckoutRoot(cwd):
maruel@chromium.org01d8c1d2010-01-07 01:56:59 +0000377 """Returns the top level directory of a git checkout as an absolute path.
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000378 """
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000379 root = GIT.Capture(['rev-parse', '--show-cdup'], cwd=cwd).strip()
380 return os.path.abspath(os.path.join(cwd, root))
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000381
maruel@chromium.org94aa50f2011-10-11 19:31:26 +0000382 @classmethod
383 def AssertVersion(cls, min_version):
maruel@chromium.orgd0f854a2010-03-11 19:35:53 +0000384 """Asserts git's version is at least min_version."""
maruel@chromium.org94aa50f2011-10-11 19:31:26 +0000385 if cls.current_version is None:
386 cls.current_version = cls.Capture(['--version']).split()[-1]
387 current_version_list = map(only_int, cls.current_version.split('.'))
maruel@chromium.orgd0f854a2010-03-11 19:35:53 +0000388 for min_ver in map(int, min_version.split('.')):
389 ver = current_version_list.pop(0)
390 if ver < min_ver:
maruel@chromium.org94aa50f2011-10-11 19:31:26 +0000391 return (False, cls.current_version)
maruel@chromium.orgd0f854a2010-03-11 19:35:53 +0000392 elif ver > min_ver:
maruel@chromium.org94aa50f2011-10-11 19:31:26 +0000393 return (True, cls.current_version)
394 return (True, cls.current_version)
maruel@chromium.orgd0f854a2010-03-11 19:35:53 +0000395
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000396
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000397class SVN(object):
tony@chromium.org57564662010-04-14 02:35:12 +0000398 current_version = None
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000399
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000400 @staticmethod
maruel@chromium.org54019f32010-09-09 13:50:11 +0000401 def Capture(args, **kwargs):
402 """Always redirect stderr.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000403
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000404 Throws an exception if non-0 is returned.
405 """
maruel@chromium.org904af082011-09-08 22:06:09 +0000406 return subprocess2.check_output(
407 ['svn'] + args, stderr=subprocess2.PIPE, **kwargs)
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000408
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000409 @staticmethod
maruel@chromium.org2b9aa8e2010-08-25 20:01:42 +0000410 def RunAndGetFileList(verbose, args, cwd, file_list, stdout=None):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000411 """Runs svn checkout, update, or status, output to stdout.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000412
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000413 The first item in args must be either "checkout", "update", or "status".
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000414
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000415 svn's stdout is parsed to collect a list of files checked out or updated.
416 These files are appended to file_list. svn's stdout is also printed to
417 sys.stdout as in Run.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000418
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000419 Args:
maruel@chromium.org03807072010-08-16 17:18:44 +0000420 verbose: If True, uses verbose output
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000421 args: A sequence of command line parameters to be passed to svn.
maruel@chromium.org2b9aa8e2010-08-25 20:01:42 +0000422 cwd: The directory where svn is to be run.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000423
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000424 Raises:
425 Error: An error occurred while running the svn command.
426 """
maruel@chromium.org2b9aa8e2010-08-25 20:01:42 +0000427 stdout = stdout or sys.stdout
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000428
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000429 # svn update and svn checkout use the same pattern: the first three columns
430 # are for file status, property status, and lock status. This is followed
431 # by two spaces, and then the path to the file.
432 update_pattern = '^... (.*)$'
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000433
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000434 # The first three columns of svn status are the same as for svn update and
435 # svn checkout. The next three columns indicate addition-with-history,
436 # switch, and remote lock status. This is followed by one space, and then
437 # the path to the file.
438 status_pattern = '^...... (.*)$'
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000439
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000440 # args[0] must be a supported command. This will blow up if it's something
441 # else, which is good. Note that the patterns are only effective when
442 # these commands are used in their ordinary forms, the patterns are invalid
443 # for "svn status --show-updates", for example.
444 pattern = {
445 'checkout': update_pattern,
446 'status': status_pattern,
447 'update': update_pattern,
448 }[args[0]]
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000449 compiled_pattern = re.compile(pattern)
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000450 # Place an upper limit.
cbentzel@chromium.org2aee2292010-09-03 14:15:25 +0000451 backoff_time = 5
maruel@chromium.orgbec588d2010-10-26 13:50:25 +0000452 retries = 0
maruel@chromium.org03507062010-10-26 00:58:27 +0000453 while True:
maruel@chromium.orgbec588d2010-10-26 13:50:25 +0000454 retries += 1
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000455 previous_list_len = len(file_list)
456 failure = []
maruel@chromium.org54d1f1a2010-01-08 19:53:47 +0000457
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000458 def CaptureMatchingLines(line):
459 match = compiled_pattern.search(line)
460 if match:
461 file_list.append(match.group(1))
462 if line.startswith('svn: '):
maruel@chromium.org8599aa72010-02-08 20:27:14 +0000463 failure.append(line)
maruel@chromium.org54d1f1a2010-01-08 19:53:47 +0000464
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000465 try:
maruel@chromium.org17d01792010-09-01 18:07:10 +0000466 gclient_utils.CheckCallAndFilterAndHeader(
467 ['svn'] + args,
468 cwd=cwd,
469 always=verbose,
470 filter_fn=CaptureMatchingLines,
471 stdout=stdout)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000472 except subprocess2.CalledProcessError:
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000473 def IsKnownFailure():
474 for x in failure:
475 if (x.startswith('svn: OPTIONS of') or
476 x.startswith('svn: PROPFIND of') or
477 x.startswith('svn: REPORT of') or
maruel@chromium.orgf61fc932010-08-19 13:05:24 +0000478 x.startswith('svn: Unknown hostname') or
479 x.startswith('svn: Server sent unexpected return value')):
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000480 return True
481 return False
482
maruel@chromium.org953586a2010-06-15 14:22:24 +0000483 # Subversion client is really misbehaving with Google Code.
484 if args[0] == 'checkout':
485 # Ensure at least one file was checked out, otherwise *delete* the
486 # directory.
487 if len(file_list) == previous_list_len:
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000488 if not IsKnownFailure():
maruel@chromium.org953586a2010-06-15 14:22:24 +0000489 # No known svn error was found, bail out.
490 raise
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000491 # No file were checked out, so make sure the directory is
492 # deleted in case it's messed up and try again.
493 # Warning: It's bad, it assumes args[2] is the directory
494 # argument.
495 if os.path.isdir(args[2]):
496 gclient_utils.RemoveDirectory(args[2])
maruel@chromium.org953586a2010-06-15 14:22:24 +0000497 else:
498 # Progress was made, convert to update since an aborted checkout
499 # is now an update.
maruel@chromium.org2de10252010-02-08 01:10:39 +0000500 args = ['update'] + args[1:]
maruel@chromium.org953586a2010-06-15 14:22:24 +0000501 else:
502 # It was an update or export.
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000503 # We enforce that some progress has been made or a known failure.
504 if len(file_list) == previous_list_len and not IsKnownFailure():
505 # No known svn error was found and no progress, bail out.
506 raise
maruel@chromium.orgbec588d2010-10-26 13:50:25 +0000507 if retries == 10:
maruel@chromium.org03507062010-10-26 00:58:27 +0000508 raise
cbentzel@chromium.org2aee2292010-09-03 14:15:25 +0000509 print "Sleeping %.1f seconds and retrying...." % backoff_time
510 time.sleep(backoff_time)
511 backoff_time *= 1.3
maruel@chromium.org953586a2010-06-15 14:22:24 +0000512 continue
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000513 break
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000514
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000515 @staticmethod
maruel@chromium.org54019f32010-09-09 13:50:11 +0000516 def CaptureInfo(cwd):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000517 """Returns a dictionary from the svn info output for the given file.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000518
maruel@chromium.org54019f32010-09-09 13:50:11 +0000519 Throws an exception if svn info fails."""
maruel@chromium.orgd25fb8f2011-04-07 13:40:15 +0000520 result = {}
maruel@chromium.orgade9c592011-04-07 15:59:11 +0000521 output = SVN.Capture(['info', '--xml', cwd])
522 info = ElementTree.XML(output)
523 if info is None:
524 return result
525 entry = info.find('entry')
maruel@chromium.org6f323bb2011-04-26 15:42:53 +0000526 if entry is None:
527 return result
maruel@chromium.orgade9c592011-04-07 15:59:11 +0000528
529 # Use .text when the item is not optional.
530 result['Path'] = entry.attrib['path']
531 result['Revision'] = int(entry.attrib['revision'])
532 result['Node Kind'] = entry.attrib['kind']
533 # Differs across versions.
534 if result['Node Kind'] == 'dir':
535 result['Node Kind'] = 'directory'
536 result['URL'] = entry.find('url').text
537 repository = entry.find('repository')
538 result['Repository Root'] = repository.find('root').text
539 result['UUID'] = repository.find('uuid')
540 wc_info = entry.find('wc-info')
541 if wc_info is not None:
542 result['Schedule'] = wc_info.find('schedule').text
543 result['Copied From URL'] = wc_info.find('copy-from-url')
544 result['Copied From Rev'] = wc_info.find('copy-from-rev')
545 else:
546 result['Schedule'] = None
547 result['Copied From URL'] = None
548 result['Copied From Rev'] = None
549 for key in result.keys():
550 if isinstance(result[key], unicode):
551 # Unicode results interferes with the higher layers matching up things
552 # in the deps dictionary.
553 result[key] = result[key].encode()
554 # Automatic conversion of optional parameters.
555 result[key] = getattr(result[key], 'text', result[key])
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000556 return result
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000557
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000558 @staticmethod
maruel@chromium.org54019f32010-09-09 13:50:11 +0000559 def CaptureRevision(cwd):
nasser@codeaurora.org5d63eb82010-03-24 23:22:09 +0000560 """Get the base revision of a SVN repository.
561
562 Returns:
563 Int base revision
564 """
maruel@chromium.orgade9c592011-04-07 15:59:11 +0000565 return SVN.CaptureInfo(cwd).get('Revision')
nasser@codeaurora.org5d63eb82010-03-24 23:22:09 +0000566
567 @staticmethod
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000568 def CaptureStatus(files):
569 """Returns the svn 1.5 svn status emulated output.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000570
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000571 @files can be a string (one file) or a list of files.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000572
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000573 Returns an array of (status, file) tuples."""
574 command = ["status", "--xml"]
575 if not files:
576 pass
577 elif isinstance(files, basestring):
578 command.append(files)
579 else:
580 command.extend(files)
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000581
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000582 status_letter = {
583 None: ' ',
584 '': ' ',
585 'added': 'A',
586 'conflicted': 'C',
587 'deleted': 'D',
588 'external': 'X',
589 'ignored': 'I',
590 'incomplete': '!',
591 'merged': 'G',
592 'missing': '!',
593 'modified': 'M',
594 'none': ' ',
595 'normal': ' ',
596 'obstructed': '~',
597 'replaced': 'R',
598 'unversioned': '?',
599 }
maruel@chromium.orgade9c592011-04-07 15:59:11 +0000600 dom = ElementTree.XML(SVN.Capture(command))
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000601 results = []
maruel@chromium.orgade9c592011-04-07 15:59:11 +0000602 if dom is None:
603 return results
604 # /status/target/entry/(wc-status|commit|author|date)
605 for target in dom.findall('target'):
606 for entry in target.findall('entry'):
607 file_path = entry.attrib['path']
608 wc_status = entry.find('wc-status')
609 # Emulate svn 1.5 status ouput...
610 statuses = [' '] * 7
611 # Col 0
612 xml_item_status = wc_status.attrib['item']
613 if xml_item_status in status_letter:
614 statuses[0] = status_letter[xml_item_status]
615 else:
616 raise gclient_utils.Error(
617 'Unknown item status "%s"; please implement me!' %
618 xml_item_status)
619 # Col 1
620 xml_props_status = wc_status.attrib['props']
621 if xml_props_status == 'modified':
622 statuses[1] = 'M'
623 elif xml_props_status == 'conflicted':
624 statuses[1] = 'C'
625 elif (not xml_props_status or xml_props_status == 'none' or
626 xml_props_status == 'normal'):
627 pass
628 else:
629 raise gclient_utils.Error(
630 'Unknown props status "%s"; please implement me!' %
631 xml_props_status)
632 # Col 2
633 if wc_status.attrib.get('wc-locked') == 'true':
634 statuses[2] = 'L'
635 # Col 3
636 if wc_status.attrib.get('copied') == 'true':
637 statuses[3] = '+'
638 # Col 4
639 if wc_status.attrib.get('switched') == 'true':
640 statuses[4] = 'S'
641 # TODO(maruel): Col 5 and 6
642 item = (''.join(statuses), file_path)
643 results.append(item)
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000644 return results
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000645
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000646 @staticmethod
647 def IsMoved(filename):
648 """Determine if a file has been added through svn mv"""
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000649 return SVN.IsMovedInfo(SVN.CaptureInfo(filename))
650
651 @staticmethod
652 def IsMovedInfo(info):
653 """Determine if a file has been added through svn mv"""
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000654 return (info.get('Copied From URL') and
655 info.get('Copied From Rev') and
656 info.get('Schedule') == 'add')
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000657
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000658 @staticmethod
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000659 def GetFileProperty(filename, property_name):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000660 """Returns the value of an SVN property for the given file.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000661
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000662 Args:
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000663 filename: The file to check
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000664 property_name: The name of the SVN property, e.g. "svn:mime-type"
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000665
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000666 Returns:
667 The value of the property, which will be the empty string if the property
668 is not set on the file. If the file is not under version control, the
669 empty string is also returned.
670 """
maruel@chromium.org54019f32010-09-09 13:50:11 +0000671 try:
672 return SVN.Capture(['propget', property_name, filename])
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000673 except subprocess2.CalledProcessError:
maruel@chromium.org54019f32010-09-09 13:50:11 +0000674 return ''
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000675
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000676 @staticmethod
maruel@chromium.org1c7db8e2010-01-07 02:00:19 +0000677 def DiffItem(filename, full_move=False, revision=None):
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000678 """Diffs a single file.
679
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000680 Should be simple, eh? No it isn't.
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000681 Be sure to be in the appropriate directory before calling to have the
maruel@chromium.orga9371762009-12-22 18:27:38 +0000682 expected relative path.
683 full_move means that move or copy operations should completely recreate the
684 files, usually in the prospect to apply the patch for a try job."""
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000685 # If the user specified a custom diff command in their svn config file,
686 # then it'll be used when we do svn diff, which we don't want to happen
687 # since we want the unified diff. Using --diff-cmd=diff doesn't always
688 # work, since they can have another diff executable in their path that
689 # gives different line endings. So we use a bogus temp directory as the
690 # config directory, which gets around these problems.
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000691 bogus_dir = tempfile.mkdtemp()
692 try:
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000693 # Use "svn info" output instead of os.path.isdir because the latter fails
694 # when the file is deleted.
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000695 return SVN._DiffItemInternal(filename, SVN.CaptureInfo(filename),
696 bogus_dir,
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000697 full_move=full_move, revision=revision)
698 finally:
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000699 gclient_utils.RemoveDirectory(bogus_dir)
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000700
701 @staticmethod
702 def _DiffItemInternal(filename, info, bogus_dir, full_move=False,
703 revision=None):
704 """Grabs the diff data."""
705 command = ["diff", "--config-dir", bogus_dir, filename]
706 if revision:
707 command.extend(['--revision', revision])
708 data = None
709 if SVN.IsMovedInfo(info):
710 if full_move:
711 if info.get("Node Kind") == "directory":
712 # Things become tricky here. It's a directory copy/move. We need to
713 # diff all the files inside it.
714 # This will put a lot of pressure on the heap. This is why StringIO
715 # is used and converted back into a string at the end. The reason to
716 # return a string instead of a StringIO is that StringIO.write()
717 # doesn't accept a StringIO object. *sigh*.
718 for (dirpath, dirnames, filenames) in os.walk(filename):
719 # Cleanup all files starting with a '.'.
720 for d in dirnames:
721 if d.startswith('.'):
722 dirnames.remove(d)
723 for f in filenames:
724 if f.startswith('.'):
725 filenames.remove(f)
726 for f in filenames:
727 if data is None:
728 data = cStringIO.StringIO()
729 data.write(GenFakeDiff(os.path.join(dirpath, f)))
730 if data:
731 tmp = data.getvalue()
732 data.close()
733 data = tmp
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000734 else:
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000735 data = GenFakeDiff(filename)
736 else:
737 if info.get("Node Kind") != "directory":
maruel@chromium.org0836c562010-01-22 01:10:06 +0000738 # svn diff on a mv/cp'd file outputs nothing if there was no change.
maruel@chromium.org54019f32010-09-09 13:50:11 +0000739 data = SVN.Capture(command)
maruel@chromium.org0836c562010-01-22 01:10:06 +0000740 if not data:
741 # We put in an empty Index entry so upload.py knows about them.
maruel@chromium.orgc6d170e2010-06-03 00:06:00 +0000742 data = "Index: %s\n" % filename.replace(os.sep, '/')
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000743 # Otherwise silently ignore directories.
744 else:
745 if info.get("Node Kind") != "directory":
746 # Normal simple case.
maruel@chromium.orgf8b3f942011-03-24 17:33:50 +0000747 try:
748 data = SVN.Capture(command)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000749 except subprocess2.CalledProcessError:
maruel@chromium.orgf8b3f942011-03-24 17:33:50 +0000750 if revision:
751 data = GenFakeDiff(filename)
752 else:
753 raise
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000754 # Otherwise silently ignore directories.
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000755 return data
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000756
757 @staticmethod
maruel@chromium.org1c7db8e2010-01-07 02:00:19 +0000758 def GenerateDiff(filenames, root=None, full_move=False, revision=None):
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000759 """Returns a string containing the diff for the given file list.
760
761 The files in the list should either be absolute paths or relative to the
762 given root. If no root directory is provided, the repository root will be
763 used.
764 The diff will always use relative paths.
765 """
maruel@chromium.org00fdcb32011-02-24 01:41:02 +0000766 assert isinstance(filenames, (list, tuple))
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000767 previous_cwd = os.getcwd()
maruel@chromium.orgfd9cbbb2010-01-08 23:04:03 +0000768 root = root or SVN.GetCheckoutRoot(previous_cwd)
769 root = os.path.normcase(os.path.join(root, ''))
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000770 def RelativePath(path, root):
771 """We must use relative paths."""
maruel@chromium.orgfd9cbbb2010-01-08 23:04:03 +0000772 if os.path.normcase(path).startswith(root):
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000773 return path[len(root):]
774 return path
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000775 # If the user specified a custom diff command in their svn config file,
776 # then it'll be used when we do svn diff, which we don't want to happen
777 # since we want the unified diff. Using --diff-cmd=diff doesn't always
778 # work, since they can have another diff executable in their path that
779 # gives different line endings. So we use a bogus temp directory as the
780 # config directory, which gets around these problems.
781 bogus_dir = tempfile.mkdtemp()
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000782 try:
783 os.chdir(root)
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000784 # Cleanup filenames
785 filenames = [RelativePath(f, root) for f in filenames]
786 # Get information about the modified items (files and directories)
787 data = dict([(f, SVN.CaptureInfo(f)) for f in filenames])
gavinp@google.com3fda4cc2010-06-29 13:29:27 +0000788 diffs = []
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000789 if full_move:
790 # Eliminate modified files inside moved/copied directory.
791 for (filename, info) in data.iteritems():
792 if SVN.IsMovedInfo(info) and info.get("Node Kind") == "directory":
793 # Remove files inside the directory.
794 filenames = [f for f in filenames
795 if not f.startswith(filename + os.path.sep)]
796 for filename in data.keys():
797 if not filename in filenames:
798 # Remove filtered out items.
799 del data[filename]
gavinp@google.com3fda4cc2010-06-29 13:29:27 +0000800 else:
801 metaheaders = []
802 for (filename, info) in data.iteritems():
803 if SVN.IsMovedInfo(info):
804 # for now, the most common case is a head copy,
805 # so let's just encode that as a straight up cp.
806 srcurl = info.get('Copied From URL')
807 root = info.get('Repository Root')
808 rev = int(info.get('Copied From Rev'))
809 assert srcurl.startswith(root)
810 src = srcurl[len(root)+1:]
maruel@chromium.org00fdcb32011-02-24 01:41:02 +0000811 try:
812 srcinfo = SVN.CaptureInfo(srcurl)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000813 except subprocess2.CalledProcessError, e:
maruel@chromium.org00fdcb32011-02-24 01:41:02 +0000814 if not 'Not a valid URL' in e.stderr:
815 raise
816 # Assume the file was deleted. No idea how to figure out at which
817 # revision the file was deleted.
818 srcinfo = {'Revision': rev}
gavinp@google.com3fda4cc2010-06-29 13:29:27 +0000819 if (srcinfo.get('Revision') != rev and
820 SVN.Capture(['diff', '-r', '%d:head' % rev, srcurl])):
821 metaheaders.append("#$ svn cp -r %d %s %s "
822 "### WARNING: note non-trunk copy\n" %
823 (rev, src, filename))
824 else:
825 metaheaders.append("#$ cp %s %s\n" % (src,
826 filename))
827
828 if metaheaders:
829 diffs.append("### BEGIN SVN COPY METADATA\n")
830 diffs.extend(metaheaders)
831 diffs.append("### END SVN COPY METADATA\n")
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000832 # Now ready to do the actual diff.
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000833 for filename in sorted(data.iterkeys()):
834 diffs.append(SVN._DiffItemInternal(filename, data[filename], bogus_dir,
835 full_move=full_move,
836 revision=revision))
837 # Use StringIO since it can be messy when diffing a directory move with
838 # full_move=True.
839 buf = cStringIO.StringIO()
840 for d in filter(None, diffs):
841 buf.write(d)
842 result = buf.getvalue()
843 buf.close()
844 return result
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000845 finally:
846 os.chdir(previous_cwd)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000847 gclient_utils.RemoveDirectory(bogus_dir)
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000848
849 @staticmethod
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000850 def GetEmail(repo_root):
851 """Retrieves the svn account which we assume is an email address."""
maruel@chromium.org54019f32010-09-09 13:50:11 +0000852 try:
853 infos = SVN.CaptureInfo(repo_root)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000854 except subprocess2.CalledProcessError:
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000855 return None
856
857 # Should check for uuid but it is incorrectly saved for https creds.
maruel@chromium.org54019f32010-09-09 13:50:11 +0000858 root = infos['Repository Root']
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000859 realm = root.rsplit('/', 1)[0]
maruel@chromium.org54019f32010-09-09 13:50:11 +0000860 uuid = infos['UUID']
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000861 if root.startswith('https') or not uuid:
862 regexp = re.compile(r'<%s:\d+>.*' % realm)
863 else:
864 regexp = re.compile(r'<%s:\d+> %s' % (realm, uuid))
865 if regexp is None:
866 return None
867 if sys.platform.startswith('win'):
868 if not 'APPDATA' in os.environ:
869 return None
maruel@chromium.org720d9f32009-11-21 17:38:57 +0000870 auth_dir = os.path.join(os.environ['APPDATA'], 'Subversion', 'auth',
871 'svn.simple')
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000872 else:
873 if not 'HOME' in os.environ:
874 return None
875 auth_dir = os.path.join(os.environ['HOME'], '.subversion', 'auth',
876 'svn.simple')
877 for credfile in os.listdir(auth_dir):
878 cred_info = SVN.ReadSimpleAuth(os.path.join(auth_dir, credfile))
879 if regexp.match(cred_info.get('svn:realmstring')):
880 return cred_info.get('username')
881
882 @staticmethod
883 def ReadSimpleAuth(filename):
884 f = open(filename, 'r')
885 values = {}
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000886 def ReadOneItem(item_type):
887 m = re.match(r'%s (\d+)' % item_type, f.readline())
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000888 if not m:
889 return None
890 data = f.read(int(m.group(1)))
891 if f.read(1) != '\n':
892 return None
893 return data
894
895 while True:
896 key = ReadOneItem('K')
897 if not key:
898 break
899 value = ReadOneItem('V')
900 if not value:
901 break
902 values[key] = value
903 return values
maruel@chromium.org94b1ee92009-12-19 20:27:20 +0000904
905 @staticmethod
906 def GetCheckoutRoot(directory):
907 """Returns the top level directory of the current repository.
908
909 The directory is returned as an absolute path.
910 """
maruel@chromium.orgf7ae6d52009-12-22 20:49:04 +0000911 directory = os.path.abspath(directory)
maruel@chromium.org54019f32010-09-09 13:50:11 +0000912 try:
maruel@chromium.org885d6e82011-02-24 20:21:46 +0000913 info = SVN.CaptureInfo(directory)
914 cur_dir_repo_root = info['Repository Root']
915 url = info['URL']
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000916 except subprocess2.CalledProcessError:
maruel@chromium.org94b1ee92009-12-19 20:27:20 +0000917 return None
maruel@chromium.org94b1ee92009-12-19 20:27:20 +0000918 while True:
919 parent = os.path.dirname(directory)
maruel@chromium.org54019f32010-09-09 13:50:11 +0000920 try:
maruel@chromium.org885d6e82011-02-24 20:21:46 +0000921 info = SVN.CaptureInfo(parent)
922 if (info['Repository Root'] != cur_dir_repo_root or
923 info['URL'] != os.path.dirname(url)):
maruel@chromium.org54019f32010-09-09 13:50:11 +0000924 break
maruel@chromium.org885d6e82011-02-24 20:21:46 +0000925 url = info['URL']
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000926 except subprocess2.CalledProcessError:
maruel@chromium.org94b1ee92009-12-19 20:27:20 +0000927 break
928 directory = parent
maruel@chromium.orgfd9cbbb2010-01-08 23:04:03 +0000929 return GetCasedPath(directory)
tony@chromium.org57564662010-04-14 02:35:12 +0000930
maruel@chromium.org94aa50f2011-10-11 19:31:26 +0000931 @classmethod
932 def AssertVersion(cls, min_version):
tony@chromium.org57564662010-04-14 02:35:12 +0000933 """Asserts svn's version is at least min_version."""
maruel@chromium.org94aa50f2011-10-11 19:31:26 +0000934 if cls.current_version is None:
935 cls.current_version = cls.Capture(['--version']).split()[2]
936 current_version_list = map(only_int, cls.current_version.split('.'))
tony@chromium.org57564662010-04-14 02:35:12 +0000937 for min_ver in map(int, min_version.split('.')):
938 ver = current_version_list.pop(0)
939 if ver < min_ver:
maruel@chromium.org94aa50f2011-10-11 19:31:26 +0000940 return (False, cls.current_version)
tony@chromium.org57564662010-04-14 02:35:12 +0000941 elif ver > min_ver:
maruel@chromium.org94aa50f2011-10-11 19:31:26 +0000942 return (True, cls.current_version)
943 return (True, cls.current_version)
maruel@chromium.org07ab60e2011-02-08 21:54:00 +0000944
945 @staticmethod
946 def Revert(repo_root, callback=None, ignore_externals=False):
947 """Reverts all svn modifications in repo_root, including properties.
948
949 Deletes any modified files or directory.
950
951 A "svn update --revision BASE" call is required after to revive deleted
952 files.
953 """
954 for file_status in SVN.CaptureStatus(repo_root):
955 file_path = os.path.join(repo_root, file_status[1])
maruel@chromium.org8c415122011-03-15 17:14:27 +0000956 if (ignore_externals and
957 file_status[0][0] == 'X' and
958 file_status[0][1:].isspace()):
maruel@chromium.org07ab60e2011-02-08 21:54:00 +0000959 # Ignore externals.
960 logging.info('Ignoring external %s' % file_status[1])
961 continue
962
963 if callback:
964 callback(file_status)
965
maruel@chromium.org8c415122011-03-15 17:14:27 +0000966 if os.path.exists(file_path):
967 # svn revert is really stupid. It fails on inconsistent line-endings,
968 # on switched directories, etc. So take no chance and delete everything!
969 # In theory, it wouldn't be necessary for property-only change but then
970 # it'd have to look for switched directories, etc so it's not worth
971 # optimizing this use case.
972 if os.path.isfile(file_path) or os.path.islink(file_path):
973 logging.info('os.remove(%s)' % file_path)
974 os.remove(file_path)
975 elif os.path.isdir(file_path):
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000976 logging.info('RemoveDirectory(%s)' % file_path)
maruel@chromium.org8c415122011-03-15 17:14:27 +0000977 gclient_utils.RemoveDirectory(file_path)
978 else:
979 logging.critical(
980 ('No idea what is %s.\nYou just found a bug in gclient'
981 ', please ping maruel@chromium.org ASAP!') % file_path)
maruel@chromium.org07ab60e2011-02-08 21:54:00 +0000982
maruel@chromium.org8c415122011-03-15 17:14:27 +0000983 if (file_status[0][0] in ('D', 'A', '!') or
984 not file_status[0][1:].isspace()):
maruel@chromium.orgaf453492011-03-03 21:04:09 +0000985 # Added, deleted file requires manual intervention and require calling
maruel@chromium.org07ab60e2011-02-08 21:54:00 +0000986 # revert, like for properties.
maruel@chromium.orgaf453492011-03-03 21:04:09 +0000987 try:
988 SVN.Capture(['revert', file_status[1]], cwd=repo_root)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000989 except subprocess2.CalledProcessError:
maruel@chromium.orgaf453492011-03-03 21:04:09 +0000990 if not os.path.exists(file_path):
991 continue
992 raise