blob: 56e795fcfecbd9f35fbcc9d67f24eed2f6cb9477 [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.org36ac2392011-10-12 16:36:11 +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.org36ac2392011-10-12 16:36:11 +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
supersat@chromium.org56f4c472011-12-02 20:09:16 +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:
supersat@chromium.org56f4c472011-12-02 20:09:16 +0000112 upstream_branch = GIT.GetUpstreamBranch(os.getcwd())
msb@chromium.org786fb682010-06-02 15:16:23 +0000113 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.org36ac2392011-10-12 16:36:11 +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.org36ac2392011-10-12 16:36:11 +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.org36ac2392011-10-12 16:36:11 +0000391 return (False, cls.current_version)
maruel@chromium.orgd0f854a2010-03-11 19:35:53 +0000392 elif ver > min_ver:
maruel@chromium.org36ac2392011-10-12 16:36:11 +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.orgd579fcf2011-12-13 20:36:03 +0000401 def Capture(args, cwd, **kwargs):
maruel@chromium.org54019f32010-09-09 13:50:11 +0000402 """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(
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000407 ['svn'] + args, stderr=subprocess2.PIPE, cwd=cwd, **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
maruel@chromium.org7d8b97d2011-10-11 23:32:30 +0000479 x.startswith('svn: Server sent unexpected return value') or
480 x.startswith('svn: Can\'t connect to host')):
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000481 return True
482 return False
483
maruel@chromium.org953586a2010-06-15 14:22:24 +0000484 # Subversion client is really misbehaving with Google Code.
485 if args[0] == 'checkout':
486 # Ensure at least one file was checked out, otherwise *delete* the
487 # directory.
488 if len(file_list) == previous_list_len:
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000489 if not IsKnownFailure():
maruel@chromium.org953586a2010-06-15 14:22:24 +0000490 # No known svn error was found, bail out.
491 raise
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000492 # No file were checked out, so make sure the directory is
493 # deleted in case it's messed up and try again.
494 # Warning: It's bad, it assumes args[2] is the directory
495 # argument.
496 if os.path.isdir(args[2]):
497 gclient_utils.RemoveDirectory(args[2])
maruel@chromium.org953586a2010-06-15 14:22:24 +0000498 else:
499 # Progress was made, convert to update since an aborted checkout
500 # is now an update.
maruel@chromium.org2de10252010-02-08 01:10:39 +0000501 args = ['update'] + args[1:]
maruel@chromium.org953586a2010-06-15 14:22:24 +0000502 else:
503 # It was an update or export.
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000504 # We enforce that some progress has been made or a known failure.
505 if len(file_list) == previous_list_len and not IsKnownFailure():
506 # No known svn error was found and no progress, bail out.
507 raise
maruel@chromium.orgbec588d2010-10-26 13:50:25 +0000508 if retries == 10:
maruel@chromium.org03507062010-10-26 00:58:27 +0000509 raise
cbentzel@chromium.org2aee2292010-09-03 14:15:25 +0000510 print "Sleeping %.1f seconds and retrying...." % backoff_time
511 time.sleep(backoff_time)
512 backoff_time *= 1.3
maruel@chromium.org953586a2010-06-15 14:22:24 +0000513 continue
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000514 break
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000515
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000516 @staticmethod
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000517 def CaptureRemoteInfo(url):
518 """Returns a dictionary from the svn info output for the given url.
519
520 Throws an exception if svn info fails.
521 """
522 assert isinstance(url, str)
523 return SVN._CaptureInfo([url], None)
524
525 @staticmethod
526 def CaptureLocalInfo(files, cwd):
527 """Returns a dictionary from the svn info output for the given files.
528
529 Throws an exception if svn info fails.
530 """
531 assert isinstance(files, (list, tuple))
532 return SVN._CaptureInfo(files, cwd)
533
534 @staticmethod
535 def _CaptureInfo(files, cwd):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000536 """Returns a dictionary from the svn info output for the given file.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000537
maruel@chromium.org54019f32010-09-09 13:50:11 +0000538 Throws an exception if svn info fails."""
maruel@chromium.orgd25fb8f2011-04-07 13:40:15 +0000539 result = {}
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000540 info = ElementTree.XML(SVN.Capture(['info', '--xml'] + files, cwd))
maruel@chromium.orgade9c592011-04-07 15:59:11 +0000541 if info is None:
542 return result
543 entry = info.find('entry')
maruel@chromium.org6f323bb2011-04-26 15:42:53 +0000544 if entry is None:
545 return result
maruel@chromium.orgade9c592011-04-07 15:59:11 +0000546
547 # Use .text when the item is not optional.
548 result['Path'] = entry.attrib['path']
549 result['Revision'] = int(entry.attrib['revision'])
550 result['Node Kind'] = entry.attrib['kind']
551 # Differs across versions.
552 if result['Node Kind'] == 'dir':
553 result['Node Kind'] = 'directory'
554 result['URL'] = entry.find('url').text
555 repository = entry.find('repository')
556 result['Repository Root'] = repository.find('root').text
557 result['UUID'] = repository.find('uuid')
558 wc_info = entry.find('wc-info')
559 if wc_info is not None:
560 result['Schedule'] = wc_info.find('schedule').text
561 result['Copied From URL'] = wc_info.find('copy-from-url')
562 result['Copied From Rev'] = wc_info.find('copy-from-rev')
563 else:
564 result['Schedule'] = None
565 result['Copied From URL'] = None
566 result['Copied From Rev'] = None
567 for key in result.keys():
568 if isinstance(result[key], unicode):
569 # Unicode results interferes with the higher layers matching up things
570 # in the deps dictionary.
571 result[key] = result[key].encode()
572 # Automatic conversion of optional parameters.
573 result[key] = getattr(result[key], 'text', result[key])
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000574 return result
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000575
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000576 @staticmethod
maruel@chromium.org54019f32010-09-09 13:50:11 +0000577 def CaptureRevision(cwd):
nasser@codeaurora.org5d63eb82010-03-24 23:22:09 +0000578 """Get the base revision of a SVN repository.
579
580 Returns:
581 Int base revision
582 """
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000583 return SVN.CaptureLocalInfo([], cwd).get('Revision')
nasser@codeaurora.org5d63eb82010-03-24 23:22:09 +0000584
585 @staticmethod
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000586 def CaptureStatus(files, cwd):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000587 """Returns the svn 1.5 svn status emulated output.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000588
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000589 @files can be a string (one file) or a list of files.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000590
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000591 Returns an array of (status, file) tuples."""
592 command = ["status", "--xml"]
593 if not files:
594 pass
595 elif isinstance(files, basestring):
596 command.append(files)
597 else:
598 command.extend(files)
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000599
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000600 status_letter = {
601 None: ' ',
602 '': ' ',
603 'added': 'A',
604 'conflicted': 'C',
605 'deleted': 'D',
606 'external': 'X',
607 'ignored': 'I',
608 'incomplete': '!',
609 'merged': 'G',
610 'missing': '!',
611 'modified': 'M',
612 'none': ' ',
613 'normal': ' ',
614 'obstructed': '~',
615 'replaced': 'R',
616 'unversioned': '?',
617 }
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000618 dom = ElementTree.XML(SVN.Capture(command, cwd))
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000619 results = []
maruel@chromium.orgade9c592011-04-07 15:59:11 +0000620 if dom is None:
621 return results
622 # /status/target/entry/(wc-status|commit|author|date)
623 for target in dom.findall('target'):
624 for entry in target.findall('entry'):
625 file_path = entry.attrib['path']
626 wc_status = entry.find('wc-status')
627 # Emulate svn 1.5 status ouput...
628 statuses = [' '] * 7
629 # Col 0
630 xml_item_status = wc_status.attrib['item']
631 if xml_item_status in status_letter:
632 statuses[0] = status_letter[xml_item_status]
633 else:
634 raise gclient_utils.Error(
635 'Unknown item status "%s"; please implement me!' %
636 xml_item_status)
637 # Col 1
638 xml_props_status = wc_status.attrib['props']
639 if xml_props_status == 'modified':
640 statuses[1] = 'M'
641 elif xml_props_status == 'conflicted':
642 statuses[1] = 'C'
643 elif (not xml_props_status or xml_props_status == 'none' or
644 xml_props_status == 'normal'):
645 pass
646 else:
647 raise gclient_utils.Error(
648 'Unknown props status "%s"; please implement me!' %
649 xml_props_status)
650 # Col 2
651 if wc_status.attrib.get('wc-locked') == 'true':
652 statuses[2] = 'L'
653 # Col 3
654 if wc_status.attrib.get('copied') == 'true':
655 statuses[3] = '+'
656 # Col 4
657 if wc_status.attrib.get('switched') == 'true':
658 statuses[4] = 'S'
659 # TODO(maruel): Col 5 and 6
660 item = (''.join(statuses), file_path)
661 results.append(item)
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000662 return results
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000663
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000664 @staticmethod
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000665 def IsMoved(filename, cwd):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000666 """Determine if a file has been added through svn mv"""
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000667 assert isinstance(filename, basestring)
668 return SVN.IsMovedInfo(SVN.CaptureLocalInfo([filename], cwd))
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000669
670 @staticmethod
671 def IsMovedInfo(info):
672 """Determine if a file has been added through svn mv"""
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000673 return (info.get('Copied From URL') and
674 info.get('Copied From Rev') and
675 info.get('Schedule') == 'add')
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000676
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000677 @staticmethod
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000678 def GetFileProperty(filename, property_name, cwd):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000679 """Returns the value of an SVN property for the given file.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000680
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000681 Args:
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000682 filename: The file to check
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000683 property_name: The name of the SVN property, e.g. "svn:mime-type"
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000684
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000685 Returns:
686 The value of the property, which will be the empty string if the property
687 is not set on the file. If the file is not under version control, the
688 empty string is also returned.
689 """
maruel@chromium.org54019f32010-09-09 13:50:11 +0000690 try:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000691 return SVN.Capture(['propget', property_name, filename], cwd)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000692 except subprocess2.CalledProcessError:
maruel@chromium.org54019f32010-09-09 13:50:11 +0000693 return ''
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000694
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000695 @staticmethod
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000696 def DiffItem(filename, cwd, full_move, revision):
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000697 """Diffs a single file.
698
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000699 Should be simple, eh? No it isn't.
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000700 Be sure to be in the appropriate directory before calling to have the
maruel@chromium.orga9371762009-12-22 18:27:38 +0000701 expected relative path.
702 full_move means that move or copy operations should completely recreate the
703 files, usually in the prospect to apply the patch for a try job."""
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000704 # If the user specified a custom diff command in their svn config file,
705 # then it'll be used when we do svn diff, which we don't want to happen
706 # since we want the unified diff. Using --diff-cmd=diff doesn't always
707 # work, since they can have another diff executable in their path that
708 # gives different line endings. So we use a bogus temp directory as the
709 # config directory, which gets around these problems.
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000710 bogus_dir = tempfile.mkdtemp()
711 try:
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000712 # Use "svn info" output instead of os.path.isdir because the latter fails
713 # when the file is deleted.
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000714 return SVN._DiffItemInternal(
715 filename,
716 cwd,
717 SVN.CaptureLocalInfo([filename], cwd),
718 bogus_dir,
719 full_move,
720 revision)
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000721 finally:
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000722 gclient_utils.RemoveDirectory(bogus_dir)
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000723
724 @staticmethod
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000725 def _DiffItemInternal(filename, cwd, info, bogus_dir, full_move, revision):
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000726 """Grabs the diff data."""
727 command = ["diff", "--config-dir", bogus_dir, filename]
728 if revision:
729 command.extend(['--revision', revision])
730 data = None
731 if SVN.IsMovedInfo(info):
732 if full_move:
733 if info.get("Node Kind") == "directory":
734 # Things become tricky here. It's a directory copy/move. We need to
735 # diff all the files inside it.
736 # This will put a lot of pressure on the heap. This is why StringIO
737 # is used and converted back into a string at the end. The reason to
738 # return a string instead of a StringIO is that StringIO.write()
739 # doesn't accept a StringIO object. *sigh*.
740 for (dirpath, dirnames, filenames) in os.walk(filename):
741 # Cleanup all files starting with a '.'.
742 for d in dirnames:
743 if d.startswith('.'):
744 dirnames.remove(d)
745 for f in filenames:
746 if f.startswith('.'):
747 filenames.remove(f)
748 for f in filenames:
749 if data is None:
750 data = cStringIO.StringIO()
751 data.write(GenFakeDiff(os.path.join(dirpath, f)))
752 if data:
753 tmp = data.getvalue()
754 data.close()
755 data = tmp
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000756 else:
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000757 data = GenFakeDiff(filename)
758 else:
759 if info.get("Node Kind") != "directory":
maruel@chromium.org0836c562010-01-22 01:10:06 +0000760 # svn diff on a mv/cp'd file outputs nothing if there was no change.
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000761 data = SVN.Capture(command, cwd)
maruel@chromium.org0836c562010-01-22 01:10:06 +0000762 if not data:
763 # We put in an empty Index entry so upload.py knows about them.
maruel@chromium.orgc6d170e2010-06-03 00:06:00 +0000764 data = "Index: %s\n" % filename.replace(os.sep, '/')
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000765 # Otherwise silently ignore directories.
766 else:
767 if info.get("Node Kind") != "directory":
768 # Normal simple case.
maruel@chromium.orgf8b3f942011-03-24 17:33:50 +0000769 try:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000770 data = SVN.Capture(command, cwd)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000771 except subprocess2.CalledProcessError:
maruel@chromium.orgf8b3f942011-03-24 17:33:50 +0000772 if revision:
773 data = GenFakeDiff(filename)
774 else:
775 raise
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000776 # Otherwise silently ignore directories.
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000777 return data
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000778
779 @staticmethod
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000780 def GenerateDiff(filenames, cwd, full_move, revision):
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000781 """Returns a string containing the diff for the given file list.
782
783 The files in the list should either be absolute paths or relative to the
784 given root. If no root directory is provided, the repository root will be
785 used.
786 The diff will always use relative paths.
787 """
maruel@chromium.org00fdcb32011-02-24 01:41:02 +0000788 assert isinstance(filenames, (list, tuple))
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000789 root = os.path.normcase(os.path.join(cwd, ''))
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000790 def RelativePath(path, root):
791 """We must use relative paths."""
maruel@chromium.orgfd9cbbb2010-01-08 23:04:03 +0000792 if os.path.normcase(path).startswith(root):
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000793 return path[len(root):]
794 return path
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000795 # If the user specified a custom diff command in their svn config file,
796 # then it'll be used when we do svn diff, which we don't want to happen
797 # since we want the unified diff. Using --diff-cmd=diff doesn't always
798 # work, since they can have another diff executable in their path that
799 # gives different line endings. So we use a bogus temp directory as the
800 # config directory, which gets around these problems.
801 bogus_dir = tempfile.mkdtemp()
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000802 try:
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000803 # Cleanup filenames
804 filenames = [RelativePath(f, root) for f in filenames]
805 # Get information about the modified items (files and directories)
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000806 data = dict([(f, SVN.CaptureLocalInfo([f], root)) for f in filenames])
gavinp@google.com3fda4cc2010-06-29 13:29:27 +0000807 diffs = []
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000808 if full_move:
809 # Eliminate modified files inside moved/copied directory.
810 for (filename, info) in data.iteritems():
811 if SVN.IsMovedInfo(info) and info.get("Node Kind") == "directory":
812 # Remove files inside the directory.
813 filenames = [f for f in filenames
814 if not f.startswith(filename + os.path.sep)]
815 for filename in data.keys():
816 if not filename in filenames:
817 # Remove filtered out items.
818 del data[filename]
gavinp@google.com3fda4cc2010-06-29 13:29:27 +0000819 else:
820 metaheaders = []
821 for (filename, info) in data.iteritems():
822 if SVN.IsMovedInfo(info):
823 # for now, the most common case is a head copy,
824 # so let's just encode that as a straight up cp.
825 srcurl = info.get('Copied From URL')
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000826 file_root = info.get('Repository Root')
gavinp@google.com3fda4cc2010-06-29 13:29:27 +0000827 rev = int(info.get('Copied From Rev'))
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000828 assert srcurl.startswith(file_root)
829 src = srcurl[len(file_root)+1:]
maruel@chromium.org00fdcb32011-02-24 01:41:02 +0000830 try:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000831 srcinfo = SVN.CaptureRemoteInfo(srcurl)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000832 except subprocess2.CalledProcessError, e:
maruel@chromium.org00fdcb32011-02-24 01:41:02 +0000833 if not 'Not a valid URL' in e.stderr:
834 raise
835 # Assume the file was deleted. No idea how to figure out at which
836 # revision the file was deleted.
837 srcinfo = {'Revision': rev}
gavinp@google.com3fda4cc2010-06-29 13:29:27 +0000838 if (srcinfo.get('Revision') != rev and
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000839 SVN.Capture(['diff', '-r', '%d:head' % rev, srcurl], cwd)):
gavinp@google.com3fda4cc2010-06-29 13:29:27 +0000840 metaheaders.append("#$ svn cp -r %d %s %s "
841 "### WARNING: note non-trunk copy\n" %
842 (rev, src, filename))
843 else:
844 metaheaders.append("#$ cp %s %s\n" % (src,
845 filename))
846
847 if metaheaders:
848 diffs.append("### BEGIN SVN COPY METADATA\n")
849 diffs.extend(metaheaders)
850 diffs.append("### END SVN COPY METADATA\n")
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000851 # Now ready to do the actual diff.
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000852 for filename in sorted(data.iterkeys()):
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000853 diffs.append(SVN._DiffItemInternal(
854 filename, cwd, data[filename], bogus_dir, full_move, revision))
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000855 # Use StringIO since it can be messy when diffing a directory move with
856 # full_move=True.
857 buf = cStringIO.StringIO()
858 for d in filter(None, diffs):
859 buf.write(d)
860 result = buf.getvalue()
861 buf.close()
862 return result
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000863 finally:
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000864 gclient_utils.RemoveDirectory(bogus_dir)
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000865
866 @staticmethod
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000867 def GetEmail(cwd):
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000868 """Retrieves the svn account which we assume is an email address."""
maruel@chromium.org54019f32010-09-09 13:50:11 +0000869 try:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000870 infos = SVN.CaptureLocalInfo([], cwd)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000871 except subprocess2.CalledProcessError:
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000872 return None
873
874 # Should check for uuid but it is incorrectly saved for https creds.
maruel@chromium.org54019f32010-09-09 13:50:11 +0000875 root = infos['Repository Root']
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000876 realm = root.rsplit('/', 1)[0]
maruel@chromium.org54019f32010-09-09 13:50:11 +0000877 uuid = infos['UUID']
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000878 if root.startswith('https') or not uuid:
879 regexp = re.compile(r'<%s:\d+>.*' % realm)
880 else:
881 regexp = re.compile(r'<%s:\d+> %s' % (realm, uuid))
882 if regexp is None:
883 return None
884 if sys.platform.startswith('win'):
885 if not 'APPDATA' in os.environ:
886 return None
maruel@chromium.org720d9f32009-11-21 17:38:57 +0000887 auth_dir = os.path.join(os.environ['APPDATA'], 'Subversion', 'auth',
888 'svn.simple')
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000889 else:
890 if not 'HOME' in os.environ:
891 return None
892 auth_dir = os.path.join(os.environ['HOME'], '.subversion', 'auth',
893 'svn.simple')
894 for credfile in os.listdir(auth_dir):
895 cred_info = SVN.ReadSimpleAuth(os.path.join(auth_dir, credfile))
896 if regexp.match(cred_info.get('svn:realmstring')):
897 return cred_info.get('username')
898
899 @staticmethod
900 def ReadSimpleAuth(filename):
901 f = open(filename, 'r')
902 values = {}
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000903 def ReadOneItem(item_type):
904 m = re.match(r'%s (\d+)' % item_type, f.readline())
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000905 if not m:
906 return None
907 data = f.read(int(m.group(1)))
908 if f.read(1) != '\n':
909 return None
910 return data
911
912 while True:
913 key = ReadOneItem('K')
914 if not key:
915 break
916 value = ReadOneItem('V')
917 if not value:
918 break
919 values[key] = value
920 return values
maruel@chromium.org94b1ee92009-12-19 20:27:20 +0000921
922 @staticmethod
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000923 def GetCheckoutRoot(cwd):
maruel@chromium.org94b1ee92009-12-19 20:27:20 +0000924 """Returns the top level directory of the current repository.
925
926 The directory is returned as an absolute path.
927 """
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000928 cwd = os.path.abspath(cwd)
maruel@chromium.org54019f32010-09-09 13:50:11 +0000929 try:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000930 info = SVN.CaptureLocalInfo([], cwd)
maruel@chromium.org885d6e82011-02-24 20:21:46 +0000931 cur_dir_repo_root = info['Repository Root']
932 url = info['URL']
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000933 except subprocess2.CalledProcessError:
maruel@chromium.org94b1ee92009-12-19 20:27:20 +0000934 return None
maruel@chromium.org94b1ee92009-12-19 20:27:20 +0000935 while True:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000936 parent = os.path.dirname(cwd)
maruel@chromium.org54019f32010-09-09 13:50:11 +0000937 try:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000938 info = SVN.CaptureLocalInfo([], parent)
maruel@chromium.org885d6e82011-02-24 20:21:46 +0000939 if (info['Repository Root'] != cur_dir_repo_root or
940 info['URL'] != os.path.dirname(url)):
maruel@chromium.org54019f32010-09-09 13:50:11 +0000941 break
maruel@chromium.org885d6e82011-02-24 20:21:46 +0000942 url = info['URL']
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000943 except subprocess2.CalledProcessError:
maruel@chromium.org94b1ee92009-12-19 20:27:20 +0000944 break
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000945 cwd = parent
946 return GetCasedPath(cwd)
tony@chromium.org57564662010-04-14 02:35:12 +0000947
maruel@chromium.org36ac2392011-10-12 16:36:11 +0000948 @classmethod
949 def AssertVersion(cls, min_version):
tony@chromium.org57564662010-04-14 02:35:12 +0000950 """Asserts svn's version is at least min_version."""
maruel@chromium.org36ac2392011-10-12 16:36:11 +0000951 if cls.current_version is None:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000952 cls.current_version = cls.Capture(['--version'], None).split()[2]
maruel@chromium.org36ac2392011-10-12 16:36:11 +0000953 current_version_list = map(only_int, cls.current_version.split('.'))
tony@chromium.org57564662010-04-14 02:35:12 +0000954 for min_ver in map(int, min_version.split('.')):
955 ver = current_version_list.pop(0)
956 if ver < min_ver:
maruel@chromium.org36ac2392011-10-12 16:36:11 +0000957 return (False, cls.current_version)
tony@chromium.org57564662010-04-14 02:35:12 +0000958 elif ver > min_ver:
maruel@chromium.org36ac2392011-10-12 16:36:11 +0000959 return (True, cls.current_version)
960 return (True, cls.current_version)
maruel@chromium.org07ab60e2011-02-08 21:54:00 +0000961
962 @staticmethod
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000963 def Revert(cwd, callback=None, ignore_externals=False):
964 """Reverts all svn modifications in cwd, including properties.
maruel@chromium.org07ab60e2011-02-08 21:54:00 +0000965
966 Deletes any modified files or directory.
967
968 A "svn update --revision BASE" call is required after to revive deleted
969 files.
970 """
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000971 for file_status in SVN.CaptureStatus(None, cwd):
972 file_path = os.path.join(cwd, file_status[1])
maruel@chromium.org8c415122011-03-15 17:14:27 +0000973 if (ignore_externals and
974 file_status[0][0] == 'X' and
975 file_status[0][1:].isspace()):
maruel@chromium.org07ab60e2011-02-08 21:54:00 +0000976 # Ignore externals.
977 logging.info('Ignoring external %s' % file_status[1])
978 continue
979
980 if callback:
981 callback(file_status)
982
maruel@chromium.org8c415122011-03-15 17:14:27 +0000983 if os.path.exists(file_path):
984 # svn revert is really stupid. It fails on inconsistent line-endings,
985 # on switched directories, etc. So take no chance and delete everything!
986 # In theory, it wouldn't be necessary for property-only change but then
987 # it'd have to look for switched directories, etc so it's not worth
988 # optimizing this use case.
989 if os.path.isfile(file_path) or os.path.islink(file_path):
990 logging.info('os.remove(%s)' % file_path)
991 os.remove(file_path)
992 elif os.path.isdir(file_path):
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000993 logging.info('RemoveDirectory(%s)' % file_path)
maruel@chromium.org8c415122011-03-15 17:14:27 +0000994 gclient_utils.RemoveDirectory(file_path)
995 else:
996 logging.critical(
997 ('No idea what is %s.\nYou just found a bug in gclient'
998 ', please ping maruel@chromium.org ASAP!') % file_path)
maruel@chromium.org07ab60e2011-02-08 21:54:00 +0000999
maruel@chromium.org8c415122011-03-15 17:14:27 +00001000 if (file_status[0][0] in ('D', 'A', '!') or
1001 not file_status[0][1:].isspace()):
maruel@chromium.orgaf453492011-03-03 21:04:09 +00001002 # Added, deleted file requires manual intervention and require calling
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001003 # revert, like for properties.
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001004 if not os.path.isdir(cwd):
maruel@chromium.org8b322b32011-11-01 19:05:50 +00001005 # '.' was deleted. It's not worth continuing.
1006 return
maruel@chromium.orgaf453492011-03-03 21:04:09 +00001007 try:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001008 SVN.Capture(['revert', file_status[1]], cwd=cwd)
maruel@chromium.orgda64d632011-09-08 17:41:15 +00001009 except subprocess2.CalledProcessError:
maruel@chromium.orgaf453492011-03-03 21:04:09 +00001010 if not os.path.exists(file_path):
1011 continue
1012 raise