blob: 47a7c6e0ca9f41465908cfcc45580e5eb88def8a [file] [log] [blame]
[email protected]7d654672012-01-05 19:07:231# Copyright (c) 2012 The Chromium Authors. All rights reserved.
[email protected]d5800f12009-11-12 20:03:432# Use of this source code is governed by a BSD-style license that can be
3# found in the LICENSE file.
4
[email protected]5aeb7dd2009-11-17 18:09:015"""SCM-specific utility classes."""
[email protected]d5800f12009-11-12 20:03:436
[email protected]3c55d982010-05-06 14:25:447import cStringIO
[email protected]fd9cbbb2010-01-08 23:04:038import glob
[email protected]07ab60e2011-02-08 21:54:009import logging
[email protected]d5800f12009-11-12 20:03:4310import os
11import re
[email protected]d5800f12009-11-12 20:03:4312import sys
[email protected]4755b582013-04-18 21:38:4013import tempfile
[email protected]fd876172010-04-30 14:01:0514import time
[email protected]ade9c592011-04-07 15:59:1115from xml.etree import ElementTree
[email protected]d5800f12009-11-12 20:03:4316
17import gclient_utils
[email protected]31cb48a2011-04-04 18:01:3618import subprocess2
19
[email protected]d5800f12009-11-12 20:03:4320
[email protected]b24a8e12009-12-22 13:45:4821def ValidateEmail(email):
[email protected]6e29d572010-06-04 17:32:2022 return (re.match(r"^[a-zA-Z0-9._%-+]+@[a-zA-Z0-9._%-]+.[a-zA-Z]{2,6}$", email)
23 is not None)
[email protected]b24a8e12009-12-22 13:45:4824
[email protected]d5800f12009-11-12 20:03:4325
[email protected]fd9cbbb2010-01-08 23:04:0326def 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
[email protected]3c55d982010-05-06 14:25:4446def GenFakeDiff(filename):
47 """Generates a fake diff from a file."""
48 file_content = gclient_utils.FileRead(filename, 'rb').splitlines(True)
[email protected]c6d170e2010-06-03 00:06:0049 filename = filename.replace(os.sep, '/')
[email protected]3c55d982010-05-06 14:25:4450 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
[email protected]5c8c6de2011-03-18 16:20:1868def 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'
[email protected]c98c0c52011-04-06 13:39:4375 elif os.path.isdir(os.path.join(root, '.git')):
[email protected]5c8c6de2011-03-18 16:20:1876 return 'git'
77 else:
[email protected]c98c0c52011-04-06 13:39:4378 try:
[email protected]91def9b2011-09-14 16:28:0779 subprocess2.check_call(
[email protected]5c8c6de2011-03-18 16:20:1880 ['git', 'rev-parse', '--show-cdup'],
[email protected]c98c0c52011-04-06 13:39:4381 stdout=subprocess2.VOID,
[email protected]87e6d332011-09-09 19:01:2882 stderr=subprocess2.VOID,
[email protected]c98c0c52011-04-06 13:39:4383 cwd=root)
[email protected]5c8c6de2011-03-18 16:20:1884 return 'git'
[email protected]c98c0c52011-04-06 13:39:4385 except (OSError, subprocess2.CalledProcessError):
[email protected]5c8c6de2011-03-18 16:20:1886 return None
87
88
[email protected]36ac2392011-10-12 16:36:1189def only_int(val):
90 if val.isdigit():
91 return int(val)
92 else:
93 return 0
94
95
[email protected]5aeb7dd2009-11-17 18:09:0196class GIT(object):
[email protected]36ac2392011-10-12 16:36:1197 current_version = None
98
[email protected]5aeb7dd2009-11-17 18:09:0199 @staticmethod
[email protected]80a9ef12011-12-13 20:44:10100 def Capture(args, cwd, **kwargs):
[email protected]da64d632011-09-08 17:41:15101 return subprocess2.check_output(
[email protected]80a9ef12011-12-13 20:44:10102 ['git'] + args, cwd=cwd, stderr=subprocess2.PIPE, **kwargs)
[email protected]d5800f12009-11-12 20:03:43103
[email protected]5aeb7dd2009-11-17 18:09:01104 @staticmethod
[email protected]80a9ef12011-12-13 20:44:10105 def CaptureStatus(files, cwd, upstream_branch):
[email protected]5aeb7dd2009-11-17 18:09:01106 """Returns git status.
[email protected]d5800f12009-11-12 20:03:43107
[email protected]5aeb7dd2009-11-17 18:09:01108 @files can be a string (one file) or a list of files.
[email protected]d5800f12009-11-12 20:03:43109
[email protected]5aeb7dd2009-11-17 18:09:01110 Returns an array of (status, file) tuples."""
[email protected]786fb682010-06-02 15:16:23111 if upstream_branch is None:
[email protected]80a9ef12011-12-13 20:44:10112 upstream_branch = GIT.GetUpstreamBranch(cwd)
[email protected]786fb682010-06-02 15:16:23113 if upstream_branch is None:
[email protected]ad80e3b2010-09-09 14:18:28114 raise gclient_utils.Error('Cannot determine upstream branch')
115 command = ['diff', '--name-status', '-r', '%s...' % upstream_branch]
[email protected]5aeb7dd2009-11-17 18:09:01116 if not files:
117 pass
118 elif isinstance(files, basestring):
119 command.append(files)
120 else:
121 command.extend(files)
[email protected]80a9ef12011-12-13 20:44:10122 status = GIT.Capture(command, cwd).rstrip()
[email protected]5aeb7dd2009-11-17 18:09:01123 results = []
124 if status:
[email protected]ad80e3b2010-09-09 14:18:28125 for statusline in status.splitlines():
[email protected]cc1614b2010-09-20 17:13:17126 # 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)
[email protected]5aeb7dd2009-11-17 18:09:01130 if not m:
[email protected]ad80e3b2010-09-09 14:18:28131 raise gclient_utils.Error(
132 'status currently unsupported: %s' % statusline)
[email protected]cc1614b2010-09-20 17:13:17133 # Only grab the first letter.
134 results.append(('%s ' % m.group(1)[0], m.group(2)))
[email protected]5aeb7dd2009-11-17 18:09:01135 return results
[email protected]d5800f12009-11-12 20:03:43136
[email protected]c78f2462009-11-21 01:20:57137 @staticmethod
[email protected]ad80e3b2010-09-09 14:18:28138 def GetEmail(cwd):
[email protected]c78f2462009-11-21 01:20:57139 """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.
[email protected]ad80e3b2010-09-09 14:18:28142 try:
143 return GIT.Capture(['config', 'user.email'], cwd=cwd).strip()
[email protected]da64d632011-09-08 17:41:15144 except subprocess2.CalledProcessError:
[email protected]ad80e3b2010-09-09 14:18:28145 return ''
[email protected]f2f9d552009-12-22 00:12:57146
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):
[email protected]b24a8e12009-12-22 13:45:48154 """Returns the full branch reference, e.g. 'refs/heads/master'."""
[email protected]ad80e3b2010-09-09 14:18:28155 return GIT.Capture(['symbolic-ref', 'HEAD'], cwd=cwd).strip()
[email protected]f2f9d552009-12-22 00:12:57156
157 @staticmethod
[email protected]b24a8e12009-12-22 13:45:48158 def GetBranch(cwd):
159 """Returns the short branch name, e.g. 'master'."""
[email protected]c308a742009-12-22 18:29:33160 return GIT.ShortBranchName(GIT.GetBranchRef(cwd))
[email protected]b24a8e12009-12-22 13:45:48161
162 @staticmethod
[email protected]f2f9d552009-12-22 00:12:57163 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:
[email protected]ad80e3b2010-09-09 14:18:28167 GIT.Capture(['config', '--get-regexp', r'^svn-remote\.'], cwd=cwd)
[email protected]f2f9d552009-12-22 00:12:57168 return True
[email protected]da64d632011-09-08 17:41:15169 except subprocess2.CalledProcessError:
[email protected]f2f9d552009-12-22 00:12:57170 return False
171
172 @staticmethod
[email protected]866276c2011-03-18 20:09:31173 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
[email protected]f2f9d552009-12-22 00:12:57215 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:
[email protected]ade368c2011-03-01 08:57:50219 # 1) iterate through our branch history and find the svn URL.
220 # 2) find the svn-remote that fetches from the URL.
[email protected]f2f9d552009-12-22 00:12:57221
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
[email protected]ade368c2011-03-01 08:57:50225 # 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']
[email protected]f94e3f12011-12-13 21:03:46229 proc = subprocess2.Popen(cmd, cwd=cwd, stdout=subprocess2.PIPE)
[email protected]e8c28622011-04-05 14:41:44230 url = None
[email protected]ade368c2011-03-01 08:57:50231 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
[email protected]f2f9d552009-12-22 00:12:57237
[email protected]ade368c2011-03-01 08:57:50238 if url:
239 svn_remote_re = re.compile(r'^svn-remote\.([^.]+)\.url (.*)$')
[email protected]80a9ef12011-12-13 20:44:10240 remotes = GIT.Capture(
241 ['config', '--get-regexp', r'^svn-remote\..*\.url'],
242 cwd=cwd).splitlines()
[email protected]ade368c2011-03-01 08:57:50243 for remote in remotes:
244 match = svn_remote_re.match(remote)
[email protected]f2f9d552009-12-22 00:12:57245 if match:
[email protected]ade368c2011-03-01 08:57:50246 remote = match.group(1)
247 base_url = match.group(2)
[email protected]866276c2011-03-18 20:09:31248 try:
249 fetch_spec = GIT.Capture(
250 ['config', 'svn-remote.%s.fetch' % remote],
251 cwd=cwd).strip()
252 branch = GIT.MatchSvnGlob(url, base_url, fetch_spec, False)
[email protected]da64d632011-09-08 17:41:15253 except subprocess2.CalledProcessError:
[email protected]866276c2011-03-18 20:09:31254 branch = None
255 if branch:
256 return branch
257 try:
258 branch_spec = GIT.Capture(
259 ['config', 'svn-remote.%s.branches' % remote],
260 cwd=cwd).strip()
261 branch = GIT.MatchSvnGlob(url, base_url, branch_spec, True)
[email protected]da64d632011-09-08 17:41:15262 except subprocess2.CalledProcessError:
[email protected]866276c2011-03-18 20:09:31263 branch = None
264 if branch:
265 return branch
266 try:
267 tag_spec = GIT.Capture(
268 ['config', 'svn-remote.%s.tags' % remote],
269 cwd=cwd).strip()
270 branch = GIT.MatchSvnGlob(url, base_url, tag_spec, True)
[email protected]da64d632011-09-08 17:41:15271 except subprocess2.CalledProcessError:
[email protected]866276c2011-03-18 20:09:31272 branch = None
273 if branch:
274 return branch
[email protected]f2f9d552009-12-22 00:12:57275
276 @staticmethod
277 def FetchUpstreamTuple(cwd):
278 """Returns a tuple containg remote and remote ref,
279 e.g. 'origin', 'refs/heads/master'
[email protected]81e012c2010-04-29 16:07:24280 Tries to be intelligent and understand git-svn.
[email protected]f2f9d552009-12-22 00:12:57281 """
282 remote = '.'
[email protected]b24a8e12009-12-22 13:45:48283 branch = GIT.GetBranch(cwd)
[email protected]ad80e3b2010-09-09 14:18:28284 try:
285 upstream_branch = GIT.Capture(
286 ['config', 'branch.%s.merge' % branch], cwd=cwd).strip()
[email protected]da64d632011-09-08 17:41:15287 except subprocess2.CalledProcessError:
[email protected]ad80e3b2010-09-09 14:18:28288 upstream_branch = None
[email protected]f2f9d552009-12-22 00:12:57289 if upstream_branch:
[email protected]ad80e3b2010-09-09 14:18:28290 try:
291 remote = GIT.Capture(
292 ['config', 'branch.%s.remote' % branch], cwd=cwd).strip()
[email protected]da64d632011-09-08 17:41:15293 except subprocess2.CalledProcessError:
[email protected]ad80e3b2010-09-09 14:18:28294 pass
[email protected]f2f9d552009-12-22 00:12:57295 else:
[email protected]ade368c2011-03-01 08:57:50296 try:
297 upstream_branch = GIT.Capture(
298 ['config', 'rietveld.upstream-branch'], cwd=cwd).strip()
[email protected]da64d632011-09-08 17:41:15299 except subprocess2.CalledProcessError:
[email protected]ade368c2011-03-01 08:57:50300 upstream_branch = None
301 if upstream_branch:
302 try:
303 remote = GIT.Capture(
304 ['config', 'rietveld.upstream-remote'], cwd=cwd).strip()
[email protected]da64d632011-09-08 17:41:15305 except subprocess2.CalledProcessError:
[email protected]ade368c2011-03-01 08:57:50306 pass
[email protected]81e012c2010-04-29 16:07:24307 else:
[email protected]ade368c2011-03-01 08:57:50308 # Fall back on trying a git-svn upstream branch.
309 if GIT.IsGitSvn(cwd):
310 upstream_branch = GIT.GetSVNBranch(cwd)
[email protected]a630bd72010-04-29 23:32:34311 else:
[email protected]ade368c2011-03-01 08:57:50312 # Else, try to guess the origin remote.
313 remote_branches = GIT.Capture(['branch', '-r'], cwd=cwd).split()
314 if 'origin/master' in remote_branches:
315 # Fall back on origin/master if it exits.
316 remote = 'origin'
317 upstream_branch = 'refs/heads/master'
318 elif 'origin/trunk' in remote_branches:
319 # Fall back on origin/trunk if it exists. Generally a shared
320 # git-svn clone
321 remote = 'origin'
322 upstream_branch = 'refs/heads/trunk'
323 else:
324 # Give up.
325 remote = None
326 upstream_branch = None
[email protected]f2f9d552009-12-22 00:12:57327 return remote, upstream_branch
328
329 @staticmethod
[email protected]81e012c2010-04-29 16:07:24330 def GetUpstreamBranch(cwd):
[email protected]f2f9d552009-12-22 00:12:57331 """Gets the current branch's upstream branch."""
332 remote, upstream_branch = GIT.FetchUpstreamTuple(cwd)
[email protected]a630bd72010-04-29 23:32:34333 if remote != '.' and upstream_branch:
[email protected]f2f9d552009-12-22 00:12:57334 upstream_branch = upstream_branch.replace('heads', 'remotes/' + remote)
335 return upstream_branch
336
337 @staticmethod
[email protected]8ede00e2010-01-12 14:35:28338 def GenerateDiff(cwd, branch=None, branch_head='HEAD', full_move=False,
339 files=None):
[email protected]a9371762009-12-22 18:27:38340 """Diffs against the upstream branch or optionally another branch.
341
342 full_move means that move or copy operations should completely recreate the
343 files, usually in the prospect to apply the patch for a try job."""
[email protected]f2f9d552009-12-22 00:12:57344 if not branch:
[email protected]81e012c2010-04-29 16:07:24345 branch = GIT.GetUpstreamBranch(cwd)
[email protected]33167332012-02-23 21:15:30346 command = ['diff', '-p', '--no-color', '--no-prefix', '--no-ext-diff',
[email protected]400f3e72010-05-19 14:23:36347 branch + "..." + branch_head]
[email protected]a9371762009-12-22 18:27:38348 if not full_move:
349 command.append('-C')
[email protected]8ede00e2010-01-12 14:35:28350 # TODO(maruel): --binary support.
351 if files:
352 command.append('--')
353 command.extend(files)
[email protected]ad80e3b2010-09-09 14:18:28354 diff = GIT.Capture(command, cwd=cwd).splitlines(True)
[email protected]f2f9d552009-12-22 00:12:57355 for i in range(len(diff)):
356 # In the case of added files, replace /dev/null with the path to the
357 # file being added.
358 if diff[i].startswith('--- /dev/null'):
359 diff[i] = '--- %s' % diff[i+1][4:]
360 return ''.join(diff)
[email protected]c78f2462009-11-21 01:20:57361
[email protected]b24a8e12009-12-22 13:45:48362 @staticmethod
[email protected]8ede00e2010-01-12 14:35:28363 def GetDifferentFiles(cwd, branch=None, branch_head='HEAD'):
364 """Returns the list of modified files between two branches."""
365 if not branch:
[email protected]81e012c2010-04-29 16:07:24366 branch = GIT.GetUpstreamBranch(cwd)
[email protected]838f0f22010-04-09 17:02:50367 command = ['diff', '--name-only', branch + "..." + branch_head]
[email protected]ad80e3b2010-09-09 14:18:28368 return GIT.Capture(command, cwd=cwd).splitlines(False)
[email protected]8ede00e2010-01-12 14:35:28369
370 @staticmethod
[email protected]b24a8e12009-12-22 13:45:48371 def GetPatchName(cwd):
372 """Constructs a name for this patch."""
[email protected]ad80e3b2010-09-09 14:18:28373 short_sha = GIT.Capture(['rev-parse', '--short=4', 'HEAD'], cwd=cwd).strip()
[email protected]862ff8e2010-08-06 15:29:16374 return "%s#%s" % (GIT.GetBranch(cwd), short_sha)
[email protected]b24a8e12009-12-22 13:45:48375
376 @staticmethod
[email protected]ad80e3b2010-09-09 14:18:28377 def GetCheckoutRoot(cwd):
[email protected]01d8c1d2010-01-07 01:56:59378 """Returns the top level directory of a git checkout as an absolute path.
[email protected]b24a8e12009-12-22 13:45:48379 """
[email protected]ad80e3b2010-09-09 14:18:28380 root = GIT.Capture(['rev-parse', '--show-cdup'], cwd=cwd).strip()
381 return os.path.abspath(os.path.join(cwd, root))
[email protected]b24a8e12009-12-22 13:45:48382
[email protected]e5d1e612011-12-19 19:49:19383 @staticmethod
384 def GetGitSvnHeadRev(cwd):
385 """Gets the most recently pulled git-svn revision."""
386 try:
387 output = GIT.Capture(['svn', 'info'], cwd=cwd)
388 match = re.search(r'^Revision: ([0-9]+)$', output, re.MULTILINE)
389 return int(match.group(1)) if match else None
390 except (subprocess2.CalledProcessError, ValueError):
391 return None
392
393 @staticmethod
[email protected]492a3682012-08-10 00:28:28394 def ParseGitSvnSha1(output):
395 """Parses git-svn output for the first sha1."""
396 match = re.search(r'[0-9a-fA-F]{40}', output)
397 return match.group(0) if match else None
398
399 @staticmethod
[email protected]e5d1e612011-12-19 19:49:19400 def GetSha1ForSvnRev(cwd, rev):
401 """Returns a corresponding git sha1 for a SVN revision."""
402 if not GIT.IsGitSvn(cwd=cwd):
403 return None
404 try:
[email protected]c51def32012-10-15 18:50:37405 output = GIT.Capture(['svn', 'find-rev', 'r' + str(rev)], cwd=cwd)
406 return GIT.ParseGitSvnSha1(output)
407 except subprocess2.CalledProcessError:
408 return None
409
410 @staticmethod
411 def GetBlessedSha1ForSvnRev(cwd, rev):
412 """Returns a git commit hash from the master branch history that has
413 accurate .DEPS.git and git submodules. To understand why this is more
414 complicated than a simple call to `git svn find-rev`, refer to:
415
416 http://www.chromium.org/developers/how-tos/git-repo
417 """
418 git_svn_rev = GIT.GetSha1ForSvnRev(cwd, rev)
419 if not git_svn_rev:
420 return None
421 try:
[email protected]312a6a42012-10-11 21:19:42422 output = GIT.Capture(
423 ['rev-list', '--ancestry-path', '--reverse',
424 '--grep', 'SVN changes up to revision [0-9]*',
425 '%s..refs/remotes/origin/master' % git_svn_rev], cwd=cwd)
426 if not output:
427 return None
428 sha1 = output.splitlines()[0]
429 if not sha1:
430 return None
431 output = GIT.Capture(['rev-list', '-n', '1', '%s^1' % sha1], cwd=cwd)
432 if git_svn_rev != output.rstrip():
433 raise gclient_utils.Error(sha1)
434 return sha1
[email protected]e5d1e612011-12-19 19:49:19435 except subprocess2.CalledProcessError:
436 return None
437
438 @staticmethod
439 def IsValidRevision(cwd, rev):
440 """Verifies the revision is a proper git revision."""
[email protected]81473862012-06-27 17:30:56441 # 'git rev-parse foo' where foo is *any* 40 character hex string will return
442 # the string and return code 0. So strip one character to force 'git
443 # rev-parse' to do a hash table look-up and returns 128 if the hash is not
444 # present.
445 if re.match(r'^[0-9a-fA-F]{40}$', rev):
446 rev = rev[:-1]
[email protected]e5d1e612011-12-19 19:49:19447 try:
448 GIT.Capture(['rev-parse', rev], cwd=cwd)
449 return True
450 except subprocess2.CalledProcessError:
451 return False
452
[email protected]36ac2392011-10-12 16:36:11453 @classmethod
454 def AssertVersion(cls, min_version):
[email protected]d0f854a2010-03-11 19:35:53455 """Asserts git's version is at least min_version."""
[email protected]36ac2392011-10-12 16:36:11456 if cls.current_version is None:
[email protected]fcffd482012-02-24 01:47:00457 current_version = cls.Capture(['--version'], '.')
458 matched = re.search(r'version ([0-9\.]+)', current_version)
459 cls.current_version = matched.group(1)
[email protected]36ac2392011-10-12 16:36:11460 current_version_list = map(only_int, cls.current_version.split('.'))
[email protected]d0f854a2010-03-11 19:35:53461 for min_ver in map(int, min_version.split('.')):
462 ver = current_version_list.pop(0)
463 if ver < min_ver:
[email protected]36ac2392011-10-12 16:36:11464 return (False, cls.current_version)
[email protected]d0f854a2010-03-11 19:35:53465 elif ver > min_ver:
[email protected]36ac2392011-10-12 16:36:11466 return (True, cls.current_version)
467 return (True, cls.current_version)
[email protected]d0f854a2010-03-11 19:35:53468
[email protected]d5800f12009-11-12 20:03:43469
[email protected]5aeb7dd2009-11-17 18:09:01470class SVN(object):
[email protected]57564662010-04-14 02:35:12471 current_version = None
[email protected]d5800f12009-11-12 20:03:43472
[email protected]5aeb7dd2009-11-17 18:09:01473 @staticmethod
[email protected]d579fcf2011-12-13 20:36:03474 def Capture(args, cwd, **kwargs):
[email protected]54019f32010-09-09 13:50:11475 """Always redirect stderr.
[email protected]d5800f12009-11-12 20:03:43476
[email protected]da64d632011-09-08 17:41:15477 Throws an exception if non-0 is returned.
478 """
[email protected]904af082011-09-08 22:06:09479 return subprocess2.check_output(
[email protected]d579fcf2011-12-13 20:36:03480 ['svn'] + args, stderr=subprocess2.PIPE, cwd=cwd, **kwargs)
[email protected]d5800f12009-11-12 20:03:43481
[email protected]5aeb7dd2009-11-17 18:09:01482 @staticmethod
[email protected]2b9aa8e2010-08-25 20:01:42483 def RunAndGetFileList(verbose, args, cwd, file_list, stdout=None):
[email protected]5aeb7dd2009-11-17 18:09:01484 """Runs svn checkout, update, or status, output to stdout.
[email protected]d5800f12009-11-12 20:03:43485
[email protected]5aeb7dd2009-11-17 18:09:01486 The first item in args must be either "checkout", "update", or "status".
[email protected]d5800f12009-11-12 20:03:43487
[email protected]5aeb7dd2009-11-17 18:09:01488 svn's stdout is parsed to collect a list of files checked out or updated.
489 These files are appended to file_list. svn's stdout is also printed to
490 sys.stdout as in Run.
[email protected]d5800f12009-11-12 20:03:43491
[email protected]5aeb7dd2009-11-17 18:09:01492 Args:
[email protected]03807072010-08-16 17:18:44493 verbose: If True, uses verbose output
[email protected]5aeb7dd2009-11-17 18:09:01494 args: A sequence of command line parameters to be passed to svn.
[email protected]2b9aa8e2010-08-25 20:01:42495 cwd: The directory where svn is to be run.
[email protected]d5800f12009-11-12 20:03:43496
[email protected]5aeb7dd2009-11-17 18:09:01497 Raises:
498 Error: An error occurred while running the svn command.
499 """
[email protected]2b9aa8e2010-08-25 20:01:42500 stdout = stdout or sys.stdout
[email protected]d5800f12009-11-12 20:03:43501
[email protected]5aeb7dd2009-11-17 18:09:01502 # svn update and svn checkout use the same pattern: the first three columns
503 # are for file status, property status, and lock status. This is followed
504 # by two spaces, and then the path to the file.
505 update_pattern = '^... (.*)$'
[email protected]d5800f12009-11-12 20:03:43506
[email protected]5aeb7dd2009-11-17 18:09:01507 # The first three columns of svn status are the same as for svn update and
508 # svn checkout. The next three columns indicate addition-with-history,
509 # switch, and remote lock status. This is followed by one space, and then
510 # the path to the file.
511 status_pattern = '^...... (.*)$'
[email protected]d5800f12009-11-12 20:03:43512
[email protected]5aeb7dd2009-11-17 18:09:01513 # args[0] must be a supported command. This will blow up if it's something
514 # else, which is good. Note that the patterns are only effective when
515 # these commands are used in their ordinary forms, the patterns are invalid
516 # for "svn status --show-updates", for example.
517 pattern = {
518 'checkout': update_pattern,
519 'status': status_pattern,
520 'update': update_pattern,
521 }[args[0]]
[email protected]5aeb7dd2009-11-17 18:09:01522 compiled_pattern = re.compile(pattern)
[email protected]b71b67e2009-11-24 20:48:19523 # Place an upper limit.
[email protected]2aee22982010-09-03 14:15:25524 backoff_time = 5
[email protected]bec588d2010-10-26 13:50:25525 retries = 0
[email protected]03507062010-10-26 00:58:27526 while True:
[email protected]bec588d2010-10-26 13:50:25527 retries += 1
[email protected]b71b67e2009-11-24 20:48:19528 previous_list_len = len(file_list)
529 failure = []
[email protected]54d1f1a2010-01-08 19:53:47530
[email protected]b71b67e2009-11-24 20:48:19531 def CaptureMatchingLines(line):
532 match = compiled_pattern.search(line)
533 if match:
534 file_list.append(match.group(1))
535 if line.startswith('svn: '):
[email protected]8599aa72010-02-08 20:27:14536 failure.append(line)
[email protected]54d1f1a2010-01-08 19:53:47537
[email protected]b71b67e2009-11-24 20:48:19538 try:
[email protected]17d01792010-09-01 18:07:10539 gclient_utils.CheckCallAndFilterAndHeader(
540 ['svn'] + args,
541 cwd=cwd,
542 always=verbose,
543 filter_fn=CaptureMatchingLines,
544 stdout=stdout)
[email protected]da64d632011-09-08 17:41:15545 except subprocess2.CalledProcessError:
[email protected]6133c5b2010-08-18 18:34:48546 def IsKnownFailure():
547 for x in failure:
548 if (x.startswith('svn: OPTIONS of') or
549 x.startswith('svn: PROPFIND of') or
550 x.startswith('svn: REPORT of') or
[email protected]f61fc932010-08-19 13:05:24551 x.startswith('svn: Unknown hostname') or
[email protected]7d8b97d2011-10-11 23:32:30552 x.startswith('svn: Server sent unexpected return value') or
553 x.startswith('svn: Can\'t connect to host')):
[email protected]6133c5b2010-08-18 18:34:48554 return True
555 return False
556
[email protected]953586a2010-06-15 14:22:24557 # Subversion client is really misbehaving with Google Code.
558 if args[0] == 'checkout':
559 # Ensure at least one file was checked out, otherwise *delete* the
560 # directory.
561 if len(file_list) == previous_list_len:
[email protected]6133c5b2010-08-18 18:34:48562 if not IsKnownFailure():
[email protected]953586a2010-06-15 14:22:24563 # No known svn error was found, bail out.
564 raise
[email protected]6133c5b2010-08-18 18:34:48565 # No file were checked out, so make sure the directory is
566 # deleted in case it's messed up and try again.
567 # Warning: It's bad, it assumes args[2] is the directory
568 # argument.
569 if os.path.isdir(args[2]):
[email protected]dc112ac2013-04-24 13:00:19570 gclient_utils.rmtree(args[2])
[email protected]953586a2010-06-15 14:22:24571 else:
572 # Progress was made, convert to update since an aborted checkout
573 # is now an update.
[email protected]2de10252010-02-08 01:10:39574 args = ['update'] + args[1:]
[email protected]953586a2010-06-15 14:22:24575 else:
576 # It was an update or export.
[email protected]6133c5b2010-08-18 18:34:48577 # We enforce that some progress has been made or a known failure.
578 if len(file_list) == previous_list_len and not IsKnownFailure():
579 # No known svn error was found and no progress, bail out.
580 raise
[email protected]bec588d2010-10-26 13:50:25581 if retries == 10:
[email protected]03507062010-10-26 00:58:27582 raise
[email protected]2aee22982010-09-03 14:15:25583 print "Sleeping %.1f seconds and retrying...." % backoff_time
584 time.sleep(backoff_time)
585 backoff_time *= 1.3
[email protected]953586a2010-06-15 14:22:24586 continue
[email protected]b71b67e2009-11-24 20:48:19587 break
[email protected]d5800f12009-11-12 20:03:43588
[email protected]5aeb7dd2009-11-17 18:09:01589 @staticmethod
[email protected]d579fcf2011-12-13 20:36:03590 def CaptureRemoteInfo(url):
591 """Returns a dictionary from the svn info output for the given url.
592
593 Throws an exception if svn info fails.
594 """
595 assert isinstance(url, str)
596 return SVN._CaptureInfo([url], None)
597
598 @staticmethod
599 def CaptureLocalInfo(files, cwd):
600 """Returns a dictionary from the svn info output for the given files.
601
602 Throws an exception if svn info fails.
603 """
604 assert isinstance(files, (list, tuple))
605 return SVN._CaptureInfo(files, cwd)
606
607 @staticmethod
608 def _CaptureInfo(files, cwd):
[email protected]5aeb7dd2009-11-17 18:09:01609 """Returns a dictionary from the svn info output for the given file.
[email protected]d5800f12009-11-12 20:03:43610
[email protected]54019f32010-09-09 13:50:11611 Throws an exception if svn info fails."""
[email protected]d25fb8f2011-04-07 13:40:15612 result = {}
[email protected]d579fcf2011-12-13 20:36:03613 info = ElementTree.XML(SVN.Capture(['info', '--xml'] + files, cwd))
[email protected]ade9c592011-04-07 15:59:11614 if info is None:
615 return result
616 entry = info.find('entry')
[email protected]6f323bb2011-04-26 15:42:53617 if entry is None:
618 return result
[email protected]ade9c592011-04-07 15:59:11619
620 # Use .text when the item is not optional.
621 result['Path'] = entry.attrib['path']
[email protected]7d654672012-01-05 19:07:23622 rev = entry.attrib['revision']
623 try:
624 result['Revision'] = int(rev)
625 except ValueError:
626 result['Revision'] = None
[email protected]ade9c592011-04-07 15:59:11627 result['Node Kind'] = entry.attrib['kind']
628 # Differs across versions.
629 if result['Node Kind'] == 'dir':
630 result['Node Kind'] = 'directory'
631 result['URL'] = entry.find('url').text
632 repository = entry.find('repository')
633 result['Repository Root'] = repository.find('root').text
634 result['UUID'] = repository.find('uuid')
635 wc_info = entry.find('wc-info')
636 if wc_info is not None:
637 result['Schedule'] = wc_info.find('schedule').text
638 result['Copied From URL'] = wc_info.find('copy-from-url')
639 result['Copied From Rev'] = wc_info.find('copy-from-rev')
640 else:
641 result['Schedule'] = None
642 result['Copied From URL'] = None
643 result['Copied From Rev'] = None
644 for key in result.keys():
645 if isinstance(result[key], unicode):
646 # Unicode results interferes with the higher layers matching up things
647 # in the deps dictionary.
648 result[key] = result[key].encode()
649 # Automatic conversion of optional parameters.
650 result[key] = getattr(result[key], 'text', result[key])
[email protected]5aeb7dd2009-11-17 18:09:01651 return result
[email protected]d5800f12009-11-12 20:03:43652
[email protected]5aeb7dd2009-11-17 18:09:01653 @staticmethod
[email protected]54019f32010-09-09 13:50:11654 def CaptureRevision(cwd):
[email protected]5d63eb82010-03-24 23:22:09655 """Get the base revision of a SVN repository.
656
657 Returns:
658 Int base revision
659 """
[email protected]d579fcf2011-12-13 20:36:03660 return SVN.CaptureLocalInfo([], cwd).get('Revision')
[email protected]5d63eb82010-03-24 23:22:09661
662 @staticmethod
[email protected]ea15cb72012-05-04 14:16:31663 def CaptureStatus(files, cwd, no_ignore=False):
[email protected]5aeb7dd2009-11-17 18:09:01664 """Returns the svn 1.5 svn status emulated output.
[email protected]d5800f12009-11-12 20:03:43665
[email protected]5aeb7dd2009-11-17 18:09:01666 @files can be a string (one file) or a list of files.
[email protected]d5800f12009-11-12 20:03:43667
[email protected]5aeb7dd2009-11-17 18:09:01668 Returns an array of (status, file) tuples."""
669 command = ["status", "--xml"]
[email protected]ea15cb72012-05-04 14:16:31670 if no_ignore:
671 command.append('--no-ignore')
[email protected]5aeb7dd2009-11-17 18:09:01672 if not files:
673 pass
674 elif isinstance(files, basestring):
675 command.append(files)
676 else:
677 command.extend(files)
[email protected]d5800f12009-11-12 20:03:43678
[email protected]5aeb7dd2009-11-17 18:09:01679 status_letter = {
680 None: ' ',
681 '': ' ',
682 'added': 'A',
683 'conflicted': 'C',
684 'deleted': 'D',
685 'external': 'X',
686 'ignored': 'I',
687 'incomplete': '!',
688 'merged': 'G',
689 'missing': '!',
690 'modified': 'M',
691 'none': ' ',
692 'normal': ' ',
693 'obstructed': '~',
694 'replaced': 'R',
695 'unversioned': '?',
696 }
[email protected]d579fcf2011-12-13 20:36:03697 dom = ElementTree.XML(SVN.Capture(command, cwd))
[email protected]5aeb7dd2009-11-17 18:09:01698 results = []
[email protected]ade9c592011-04-07 15:59:11699 if dom is None:
700 return results
701 # /status/target/entry/(wc-status|commit|author|date)
702 for target in dom.findall('target'):
703 for entry in target.findall('entry'):
704 file_path = entry.attrib['path']
705 wc_status = entry.find('wc-status')
706 # Emulate svn 1.5 status ouput...
707 statuses = [' '] * 7
708 # Col 0
709 xml_item_status = wc_status.attrib['item']
710 if xml_item_status in status_letter:
711 statuses[0] = status_letter[xml_item_status]
712 else:
713 raise gclient_utils.Error(
714 'Unknown item status "%s"; please implement me!' %
715 xml_item_status)
716 # Col 1
717 xml_props_status = wc_status.attrib['props']
718 if xml_props_status == 'modified':
719 statuses[1] = 'M'
720 elif xml_props_status == 'conflicted':
721 statuses[1] = 'C'
722 elif (not xml_props_status or xml_props_status == 'none' or
723 xml_props_status == 'normal'):
724 pass
725 else:
726 raise gclient_utils.Error(
727 'Unknown props status "%s"; please implement me!' %
728 xml_props_status)
729 # Col 2
730 if wc_status.attrib.get('wc-locked') == 'true':
731 statuses[2] = 'L'
732 # Col 3
733 if wc_status.attrib.get('copied') == 'true':
734 statuses[3] = '+'
735 # Col 4
736 if wc_status.attrib.get('switched') == 'true':
737 statuses[4] = 'S'
738 # TODO(maruel): Col 5 and 6
739 item = (''.join(statuses), file_path)
740 results.append(item)
[email protected]5aeb7dd2009-11-17 18:09:01741 return results
[email protected]d5800f12009-11-12 20:03:43742
[email protected]5aeb7dd2009-11-17 18:09:01743 @staticmethod
[email protected]d579fcf2011-12-13 20:36:03744 def IsMoved(filename, cwd):
[email protected]5aeb7dd2009-11-17 18:09:01745 """Determine if a file has been added through svn mv"""
[email protected]d579fcf2011-12-13 20:36:03746 assert isinstance(filename, basestring)
747 return SVN.IsMovedInfo(SVN.CaptureLocalInfo([filename], cwd))
[email protected]3c55d982010-05-06 14:25:44748
749 @staticmethod
750 def IsMovedInfo(info):
751 """Determine if a file has been added through svn mv"""
[email protected]5aeb7dd2009-11-17 18:09:01752 return (info.get('Copied From URL') and
753 info.get('Copied From Rev') and
754 info.get('Schedule') == 'add')
[email protected]d5800f12009-11-12 20:03:43755
[email protected]5aeb7dd2009-11-17 18:09:01756 @staticmethod
[email protected]d579fcf2011-12-13 20:36:03757 def GetFileProperty(filename, property_name, cwd):
[email protected]5aeb7dd2009-11-17 18:09:01758 """Returns the value of an SVN property for the given file.
[email protected]d5800f12009-11-12 20:03:43759
[email protected]5aeb7dd2009-11-17 18:09:01760 Args:
[email protected]6e29d572010-06-04 17:32:20761 filename: The file to check
[email protected]5aeb7dd2009-11-17 18:09:01762 property_name: The name of the SVN property, e.g. "svn:mime-type"
[email protected]d5800f12009-11-12 20:03:43763
[email protected]5aeb7dd2009-11-17 18:09:01764 Returns:
765 The value of the property, which will be the empty string if the property
766 is not set on the file. If the file is not under version control, the
767 empty string is also returned.
768 """
[email protected]54019f32010-09-09 13:50:11769 try:
[email protected]d579fcf2011-12-13 20:36:03770 return SVN.Capture(['propget', property_name, filename], cwd)
[email protected]da64d632011-09-08 17:41:15771 except subprocess2.CalledProcessError:
[email protected]54019f32010-09-09 13:50:11772 return ''
[email protected]d5800f12009-11-12 20:03:43773
[email protected]5aeb7dd2009-11-17 18:09:01774 @staticmethod
[email protected]d579fcf2011-12-13 20:36:03775 def GenerateDiff(filenames, cwd, full_move, revision):
[email protected]f2f9d552009-12-22 00:12:57776 """Returns a string containing the diff for the given file list.
777
778 The files in the list should either be absolute paths or relative to the
779 given root. If no root directory is provided, the repository root will be
780 used.
781 The diff will always use relative paths.
782 """
[email protected]00fdcb32011-02-24 01:41:02783 assert isinstance(filenames, (list, tuple))
[email protected]d579fcf2011-12-13 20:36:03784 root = os.path.normcase(os.path.join(cwd, ''))
[email protected]f2f9d552009-12-22 00:12:57785 def RelativePath(path, root):
786 """We must use relative paths."""
[email protected]fd9cbbb2010-01-08 23:04:03787 if os.path.normcase(path).startswith(root):
[email protected]f2f9d552009-12-22 00:12:57788 return path[len(root):]
789 return path
[email protected]6e905a62013-04-21 18:28:07790 # If the user specified a custom diff command in their svn config file,
791 # then it'll be used when we do svn diff, which we don't want to happen
792 # since we want the unified diff. Using --diff-cmd=diff doesn't always
[email protected]5b792f52013-04-21 18:28:40793 # work, since they can have another diff executable in their path that
794 # gives different line endings. So we use a bogus temp directory as the
795 # config directory, which gets around these problems.
[email protected]6e905a62013-04-21 18:28:07796 bogus_dir = tempfile.mkdtemp()
[email protected]6e905a62013-04-21 18:28:07797 try:
798 # Cleanup filenames
799 filenames = [RelativePath(f, root) for f in filenames]
800 # Get information about the modified items (files and directories)
[email protected]5b792f52013-04-21 18:28:40801 data = dict([(f, SVN.CaptureLocalInfo([f], root)) for f in filenames])
[email protected]6e905a62013-04-21 18:28:07802 diffs = []
803 if full_move:
804 # Eliminate modified files inside moved/copied directory.
805 for (filename, info) in data.iteritems():
806 if SVN.IsMovedInfo(info) and info.get("Node Kind") == "directory":
807 # Remove files inside the directory.
808 filenames = [f for f in filenames
809 if not f.startswith(filename + os.path.sep)]
810 for filename in data.keys():
811 if not filename in filenames:
812 # Remove filtered out items.
813 del data[filename]
814 else:
815 metaheaders = []
816 for (filename, info) in data.iteritems():
817 if SVN.IsMovedInfo(info):
818 # for now, the most common case is a head copy,
819 # so let's just encode that as a straight up cp.
820 srcurl = info.get('Copied From URL')
821 file_root = info.get('Repository Root')
822 rev = int(info.get('Copied From Rev'))
823 assert srcurl.startswith(file_root)
824 src = srcurl[len(file_root)+1:]
825 try:
826 srcinfo = SVN.CaptureRemoteInfo(srcurl)
827 except subprocess2.CalledProcessError, e:
828 if not 'Not a valid URL' in e.stderr:
829 raise
830 # Assume the file was deleted. No idea how to figure out at which
831 # revision the file was deleted.
832 srcinfo = {'Revision': rev}
833 if (srcinfo.get('Revision') != rev and
[email protected]5b792f52013-04-21 18:28:40834 SVN.Capture(['diff', '-r', '%d:head' % rev, srcurl], cwd)):
[email protected]6e905a62013-04-21 18:28:07835 metaheaders.append("#$ svn cp -r %d %s %s "
836 "### WARNING: note non-trunk copy\n" %
837 (rev, src, filename))
838 else:
839 metaheaders.append("#$ cp %s %s\n" % (src,
840 filename))
841
842 if metaheaders:
843 diffs.append("### BEGIN SVN COPY METADATA\n")
844 diffs.extend(metaheaders)
845 diffs.append("### END SVN COPY METADATA\n")
846 # Now ready to do the actual diff.
[email protected]5b792f52013-04-21 18:28:40847 for filename in sorted(data.iterkeys()):
[email protected]6e905a62013-04-21 18:28:07848 diffs.append(SVN._DiffItemInternal(
[email protected]5b792f52013-04-21 18:28:40849 filename, cwd, data[filename], bogus_dir, full_move, revision))
[email protected]6e905a62013-04-21 18:28:07850 # Use StringIO since it can be messy when diffing a directory move with
851 # full_move=True.
852 buf = cStringIO.StringIO()
853 for d in filter(None, diffs):
854 buf.write(d)
855 result = buf.getvalue()
856 buf.close()
857 return result
858 finally:
[email protected]dc112ac2013-04-24 13:00:19859 gclient_utils.rmtree(bogus_dir)
[email protected]f2f9d552009-12-22 00:12:57860
861 @staticmethod
[email protected]5b792f52013-04-21 18:28:40862 def _DiffItemInternal(filename, cwd, info, bogus_dir, full_move, revision):
[email protected]917ea7f2013-04-19 20:10:03863 """Grabs the diff data."""
[email protected]5b792f52013-04-21 18:28:40864 command = ["diff", "--config-dir", bogus_dir, filename]
[email protected]917ea7f2013-04-19 20:10:03865 if revision:
866 command.extend(['--revision', revision])
867 data = None
868 if SVN.IsMovedInfo(info):
869 if full_move:
870 if info.get("Node Kind") == "directory":
871 # Things become tricky here. It's a directory copy/move. We need to
872 # diff all the files inside it.
873 # This will put a lot of pressure on the heap. This is why StringIO
874 # is used and converted back into a string at the end. The reason to
875 # return a string instead of a StringIO is that StringIO.write()
876 # doesn't accept a StringIO object. *sigh*.
877 for (dirpath, dirnames, filenames) in os.walk(filename):
878 # Cleanup all files starting with a '.'.
879 for d in dirnames:
880 if d.startswith('.'):
881 dirnames.remove(d)
882 for f in filenames:
883 if f.startswith('.'):
884 filenames.remove(f)
885 for f in filenames:
886 if data is None:
887 data = cStringIO.StringIO()
888 data.write(GenFakeDiff(os.path.join(dirpath, f)))
889 if data:
890 tmp = data.getvalue()
891 data.close()
892 data = tmp
893 else:
894 data = GenFakeDiff(filename)
895 else:
896 if info.get("Node Kind") != "directory":
897 # svn diff on a mv/cp'd file outputs nothing if there was no change.
898 data = SVN.Capture(command, cwd)
899 if not data:
900 # We put in an empty Index entry so upload.py knows about them.
901 data = "Index: %s\n" % filename.replace(os.sep, '/')
902 # Otherwise silently ignore directories.
903 else:
904 if info.get("Node Kind") != "directory":
905 # Normal simple case.
906 try:
907 data = SVN.Capture(command, cwd)
908 except subprocess2.CalledProcessError:
909 if revision:
910 data = GenFakeDiff(filename)
911 else:
912 raise
913 # Otherwise silently ignore directories.
914 return data
915
916 @staticmethod
[email protected]d579fcf2011-12-13 20:36:03917 def GetEmail(cwd):
[email protected]c78f2462009-11-21 01:20:57918 """Retrieves the svn account which we assume is an email address."""
[email protected]54019f32010-09-09 13:50:11919 try:
[email protected]d579fcf2011-12-13 20:36:03920 infos = SVN.CaptureLocalInfo([], cwd)
[email protected]da64d632011-09-08 17:41:15921 except subprocess2.CalledProcessError:
[email protected]c78f2462009-11-21 01:20:57922 return None
923
924 # Should check for uuid but it is incorrectly saved for https creds.
[email protected]54019f32010-09-09 13:50:11925 root = infos['Repository Root']
[email protected]c78f2462009-11-21 01:20:57926 realm = root.rsplit('/', 1)[0]
[email protected]54019f32010-09-09 13:50:11927 uuid = infos['UUID']
[email protected]c78f2462009-11-21 01:20:57928 if root.startswith('https') or not uuid:
929 regexp = re.compile(r'<%s:\d+>.*' % realm)
930 else:
931 regexp = re.compile(r'<%s:\d+> %s' % (realm, uuid))
932 if regexp is None:
933 return None
934 if sys.platform.startswith('win'):
935 if not 'APPDATA' in os.environ:
936 return None
[email protected]720d9f32009-11-21 17:38:57937 auth_dir = os.path.join(os.environ['APPDATA'], 'Subversion', 'auth',
938 'svn.simple')
[email protected]c78f2462009-11-21 01:20:57939 else:
940 if not 'HOME' in os.environ:
941 return None
942 auth_dir = os.path.join(os.environ['HOME'], '.subversion', 'auth',
943 'svn.simple')
944 for credfile in os.listdir(auth_dir):
945 cred_info = SVN.ReadSimpleAuth(os.path.join(auth_dir, credfile))
946 if regexp.match(cred_info.get('svn:realmstring')):
947 return cred_info.get('username')
948
949 @staticmethod
950 def ReadSimpleAuth(filename):
951 f = open(filename, 'r')
952 values = {}
[email protected]6e29d572010-06-04 17:32:20953 def ReadOneItem(item_type):
954 m = re.match(r'%s (\d+)' % item_type, f.readline())
[email protected]c78f2462009-11-21 01:20:57955 if not m:
956 return None
957 data = f.read(int(m.group(1)))
958 if f.read(1) != '\n':
959 return None
960 return data
961
962 while True:
963 key = ReadOneItem('K')
964 if not key:
965 break
966 value = ReadOneItem('V')
967 if not value:
968 break
969 values[key] = value
970 return values
[email protected]94b1ee92009-12-19 20:27:20971
972 @staticmethod
[email protected]d579fcf2011-12-13 20:36:03973 def GetCheckoutRoot(cwd):
[email protected]94b1ee92009-12-19 20:27:20974 """Returns the top level directory of the current repository.
975
976 The directory is returned as an absolute path.
977 """
[email protected]d579fcf2011-12-13 20:36:03978 cwd = os.path.abspath(cwd)
[email protected]54019f32010-09-09 13:50:11979 try:
[email protected]d579fcf2011-12-13 20:36:03980 info = SVN.CaptureLocalInfo([], cwd)
[email protected]885d6e82011-02-24 20:21:46981 cur_dir_repo_root = info['Repository Root']
982 url = info['URL']
[email protected]da64d632011-09-08 17:41:15983 except subprocess2.CalledProcessError:
[email protected]94b1ee92009-12-19 20:27:20984 return None
[email protected]94b1ee92009-12-19 20:27:20985 while True:
[email protected]d579fcf2011-12-13 20:36:03986 parent = os.path.dirname(cwd)
[email protected]54019f32010-09-09 13:50:11987 try:
[email protected]d579fcf2011-12-13 20:36:03988 info = SVN.CaptureLocalInfo([], parent)
[email protected]885d6e82011-02-24 20:21:46989 if (info['Repository Root'] != cur_dir_repo_root or
990 info['URL'] != os.path.dirname(url)):
[email protected]54019f32010-09-09 13:50:11991 break
[email protected]885d6e82011-02-24 20:21:46992 url = info['URL']
[email protected]da64d632011-09-08 17:41:15993 except subprocess2.CalledProcessError:
[email protected]94b1ee92009-12-19 20:27:20994 break
[email protected]d579fcf2011-12-13 20:36:03995 cwd = parent
996 return GetCasedPath(cwd)
[email protected]57564662010-04-14 02:35:12997
[email protected]e5d1e612011-12-19 19:49:19998 @staticmethod
999 def IsValidRevision(url):
1000 """Verifies the revision looks like an SVN revision."""
1001 try:
1002 SVN.Capture(['info', url], cwd=None)
1003 return True
1004 except subprocess2.CalledProcessError:
1005 return False
1006
[email protected]36ac2392011-10-12 16:36:111007 @classmethod
1008 def AssertVersion(cls, min_version):
[email protected]57564662010-04-14 02:35:121009 """Asserts svn's version is at least min_version."""
[email protected]36ac2392011-10-12 16:36:111010 if cls.current_version is None:
[email protected]13b522c2012-07-20 17:16:511011 cls.current_version = cls.Capture(['--version', '--quiet'], None)
[email protected]36ac2392011-10-12 16:36:111012 current_version_list = map(only_int, cls.current_version.split('.'))
[email protected]57564662010-04-14 02:35:121013 for min_ver in map(int, min_version.split('.')):
1014 ver = current_version_list.pop(0)
1015 if ver < min_ver:
[email protected]36ac2392011-10-12 16:36:111016 return (False, cls.current_version)
[email protected]57564662010-04-14 02:35:121017 elif ver > min_ver:
[email protected]36ac2392011-10-12 16:36:111018 return (True, cls.current_version)
1019 return (True, cls.current_version)
[email protected]07ab60e2011-02-08 21:54:001020
1021 @staticmethod
[email protected]ea15cb72012-05-04 14:16:311022 def Revert(cwd, callback=None, ignore_externals=False, no_ignore=False):
[email protected]d579fcf2011-12-13 20:36:031023 """Reverts all svn modifications in cwd, including properties.
[email protected]07ab60e2011-02-08 21:54:001024
1025 Deletes any modified files or directory.
1026
1027 A "svn update --revision BASE" call is required after to revive deleted
1028 files.
1029 """
[email protected]ea15cb72012-05-04 14:16:311030 for file_status in SVN.CaptureStatus(None, cwd, no_ignore=no_ignore):
[email protected]d579fcf2011-12-13 20:36:031031 file_path = os.path.join(cwd, file_status[1])
[email protected]8c415122011-03-15 17:14:271032 if (ignore_externals and
1033 file_status[0][0] == 'X' and
1034 file_status[0][1:].isspace()):
[email protected]07ab60e2011-02-08 21:54:001035 # Ignore externals.
1036 logging.info('Ignoring external %s' % file_status[1])
1037 continue
1038
[email protected]62087572012-04-24 23:16:281039 # This is the case where '! L .' is returned by 'svn status'. Just
1040 # strip off the '/.'.
1041 if file_path.endswith(os.path.sep + '.'):
1042 file_path = file_path[:-2]
1043
[email protected]07ab60e2011-02-08 21:54:001044 if callback:
1045 callback(file_status)
1046
[email protected]8c415122011-03-15 17:14:271047 if os.path.exists(file_path):
1048 # svn revert is really stupid. It fails on inconsistent line-endings,
1049 # on switched directories, etc. So take no chance and delete everything!
1050 # In theory, it wouldn't be necessary for property-only change but then
1051 # it'd have to look for switched directories, etc so it's not worth
1052 # optimizing this use case.
1053 if os.path.isfile(file_path) or os.path.islink(file_path):
1054 logging.info('os.remove(%s)' % file_path)
1055 os.remove(file_path)
1056 elif os.path.isdir(file_path):
[email protected]dc112ac2013-04-24 13:00:191057 logging.info('rmtree(%s)' % file_path)
1058 gclient_utils.rmtree(file_path)
[email protected]8c415122011-03-15 17:14:271059 else:
1060 logging.critical(
1061 ('No idea what is %s.\nYou just found a bug in gclient'
1062 ', please ping [email protected] ASAP!') % file_path)
[email protected]07ab60e2011-02-08 21:54:001063
[email protected]8c415122011-03-15 17:14:271064 if (file_status[0][0] in ('D', 'A', '!') or
1065 not file_status[0][1:].isspace()):
[email protected]af453492011-03-03 21:04:091066 # Added, deleted file requires manual intervention and require calling
[email protected]07ab60e2011-02-08 21:54:001067 # revert, like for properties.
[email protected]d579fcf2011-12-13 20:36:031068 if not os.path.isdir(cwd):
[email protected]8b322b32011-11-01 19:05:501069 # '.' was deleted. It's not worth continuing.
1070 return
[email protected]af453492011-03-03 21:04:091071 try:
[email protected]d579fcf2011-12-13 20:36:031072 SVN.Capture(['revert', file_status[1]], cwd=cwd)
[email protected]da64d632011-09-08 17:41:151073 except subprocess2.CalledProcessError:
[email protected]af453492011-03-03 21:04:091074 if not os.path.exists(file_path):
1075 continue
1076 raise