blob: eb5c52403c3e2595d14b133a7d0d00e289811d10 [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]6d8115d2014-04-23 20:59:23100 def ApplyEnvVars(kwargs):
101 env = kwargs.pop('env', None) or os.environ.copy()
102 # Don't prompt for passwords; just fail quickly and noisily.
103 # By default, git will use an interactive terminal prompt when a username/
104 # password is needed. That shouldn't happen in the chromium workflow,
105 # and if it does, then gclient may hide the prompt in the midst of a flood
106 # of terminal spew. The only indication that something has gone wrong
107 # will be when gclient hangs unresponsively. Instead, we disable the
108 # password prompt and simply allow git to fail noisily. The error
109 # message produced by git will be copied to gclient's output.
110 env.setdefault('GIT_ASKPASS', 'true')
111 env.setdefault('SSH_ASKPASS', 'true')
[email protected]82b91cd2013-07-09 06:33:41112 # 'cat' is a magical git string that disables pagers on all platforms.
[email protected]6d8115d2014-04-23 20:59:23113 env.setdefault('GIT_PAGER', 'cat')
114 return env
115
116 @staticmethod
117 def Capture(args, cwd, strip_out=True, **kwargs):
118 env = GIT.ApplyEnvVars(kwargs)
[email protected]4380c802013-07-12 23:38:41119 output = subprocess2.check_output(
[email protected]82b91cd2013-07-09 06:33:41120 ['git'] + args,
[email protected]4380c802013-07-12 23:38:41121 cwd=cwd, stderr=subprocess2.PIPE, env=env, **kwargs)
122 return output.strip() if strip_out else output
[email protected]d5800f12009-11-12 20:03:43123
[email protected]5aeb7dd2009-11-17 18:09:01124 @staticmethod
[email protected]80a9ef12011-12-13 20:44:10125 def CaptureStatus(files, cwd, upstream_branch):
[email protected]5aeb7dd2009-11-17 18:09:01126 """Returns git status.
[email protected]d5800f12009-11-12 20:03:43127
[email protected]5aeb7dd2009-11-17 18:09:01128 @files can be a string (one file) or a list of files.
[email protected]d5800f12009-11-12 20:03:43129
[email protected]5aeb7dd2009-11-17 18:09:01130 Returns an array of (status, file) tuples."""
[email protected]786fb682010-06-02 15:16:23131 if upstream_branch is None:
[email protected]80a9ef12011-12-13 20:44:10132 upstream_branch = GIT.GetUpstreamBranch(cwd)
[email protected]786fb682010-06-02 15:16:23133 if upstream_branch is None:
[email protected]ad80e3b2010-09-09 14:18:28134 raise gclient_utils.Error('Cannot determine upstream branch')
[email protected]9249f642013-06-03 21:36:18135 command = ['diff', '--name-status', '--no-renames',
136 '-r', '%s...' % upstream_branch]
[email protected]5aeb7dd2009-11-17 18:09:01137 if not files:
138 pass
139 elif isinstance(files, basestring):
140 command.append(files)
141 else:
142 command.extend(files)
[email protected]a41249c2013-07-03 00:09:12143 status = GIT.Capture(command, cwd)
[email protected]5aeb7dd2009-11-17 18:09:01144 results = []
145 if status:
[email protected]ad80e3b2010-09-09 14:18:28146 for statusline in status.splitlines():
[email protected]cc1614b2010-09-20 17:13:17147 # 3-way merges can cause the status can be 'MMM' instead of 'M'. This
148 # can happen when the user has 2 local branches and he diffs between
149 # these 2 branches instead diffing to upstream.
150 m = re.match('^(\w)+\t(.+)$', statusline)
[email protected]5aeb7dd2009-11-17 18:09:01151 if not m:
[email protected]ad80e3b2010-09-09 14:18:28152 raise gclient_utils.Error(
153 'status currently unsupported: %s' % statusline)
[email protected]cc1614b2010-09-20 17:13:17154 # Only grab the first letter.
155 results.append(('%s ' % m.group(1)[0], m.group(2)))
[email protected]5aeb7dd2009-11-17 18:09:01156 return results
[email protected]d5800f12009-11-12 20:03:43157
[email protected]c78f2462009-11-21 01:20:57158 @staticmethod
[email protected]ead4c7e2014-04-03 01:01:06159 def IsWorkTreeDirty(cwd):
160 return GIT.Capture(['status', '-s'], cwd=cwd) != ''
161
162 @staticmethod
[email protected]ad80e3b2010-09-09 14:18:28163 def GetEmail(cwd):
[email protected]c78f2462009-11-21 01:20:57164 """Retrieves the user email address if known."""
165 # We could want to look at the svn cred when it has a svn remote but it
166 # should be fine for now, users should simply configure their git settings.
[email protected]ad80e3b2010-09-09 14:18:28167 try:
[email protected]a41249c2013-07-03 00:09:12168 return GIT.Capture(['config', 'user.email'], cwd=cwd)
[email protected]da64d632011-09-08 17:41:15169 except subprocess2.CalledProcessError:
[email protected]ad80e3b2010-09-09 14:18:28170 return ''
[email protected]f2f9d552009-12-22 00:12:57171
172 @staticmethod
173 def ShortBranchName(branch):
174 """Converts a name like 'refs/heads/foo' to just 'foo'."""
175 return branch.replace('refs/heads/', '')
176
177 @staticmethod
178 def GetBranchRef(cwd):
[email protected]b24a8e12009-12-22 13:45:48179 """Returns the full branch reference, e.g. 'refs/heads/master'."""
[email protected]a41249c2013-07-03 00:09:12180 return GIT.Capture(['symbolic-ref', 'HEAD'], cwd=cwd)
[email protected]f2f9d552009-12-22 00:12:57181
182 @staticmethod
[email protected]b24a8e12009-12-22 13:45:48183 def GetBranch(cwd):
184 """Returns the short branch name, e.g. 'master'."""
[email protected]c308a742009-12-22 18:29:33185 return GIT.ShortBranchName(GIT.GetBranchRef(cwd))
[email protected]b24a8e12009-12-22 13:45:48186
187 @staticmethod
[email protected]6c2b49d2014-02-26 23:57:38188 def IsGitSvn(cwd):
[email protected]b09097a2014-04-09 19:09:08189 """Returns True if this repo looks like it's using git-svn."""
[email protected]f2f9d552009-12-22 00:12:57190 # If you have any "svn-remote.*" config keys, we think you're using svn.
191 try:
[email protected]a41249c2013-07-03 00:09:12192 GIT.Capture(['config', '--local', '--get-regexp', r'^svn-remote\.'],
[email protected]6c2b49d2014-02-26 23:57:38193 cwd=cwd)
[email protected]f2f9d552009-12-22 00:12:57194 return True
[email protected]da64d632011-09-08 17:41:15195 except subprocess2.CalledProcessError:
[email protected]f2f9d552009-12-22 00:12:57196 return False
197
198 @staticmethod
[email protected]866276c2011-03-18 20:09:31199 def MatchSvnGlob(url, base_url, glob_spec, allow_wildcards):
200 """Return the corresponding git ref if |base_url| together with |glob_spec|
201 matches the full |url|.
202
203 If |allow_wildcards| is true, |glob_spec| can contain wildcards (see below).
204 """
205 fetch_suburl, as_ref = glob_spec.split(':')
206 if allow_wildcards:
207 glob_match = re.match('(.+/)?(\*|{[^/]*})(/.+)?', fetch_suburl)
208 if glob_match:
209 # Parse specs like "branches/*/src:refs/remotes/svn/*" or
210 # "branches/{472,597,648}/src:refs/remotes/svn/*".
211 branch_re = re.escape(base_url)
212 if glob_match.group(1):
213 branch_re += '/' + re.escape(glob_match.group(1))
214 wildcard = glob_match.group(2)
215 if wildcard == '*':
216 branch_re += '([^/]*)'
217 else:
218 # Escape and replace surrounding braces with parentheses and commas
219 # with pipe symbols.
220 wildcard = re.escape(wildcard)
221 wildcard = re.sub('^\\\\{', '(', wildcard)
222 wildcard = re.sub('\\\\,', '|', wildcard)
223 wildcard = re.sub('\\\\}$', ')', wildcard)
224 branch_re += wildcard
225 if glob_match.group(3):
226 branch_re += re.escape(glob_match.group(3))
227 match = re.match(branch_re, url)
228 if match:
229 return re.sub('\*$', match.group(1), as_ref)
230
231 # Parse specs like "trunk/src:refs/remotes/origin/trunk".
232 if fetch_suburl:
233 full_url = base_url + '/' + fetch_suburl
234 else:
235 full_url = base_url
236 if full_url == url:
237 return as_ref
238 return None
239
240 @staticmethod
[email protected]f2f9d552009-12-22 00:12:57241 def GetSVNBranch(cwd):
242 """Returns the svn branch name if found."""
243 # Try to figure out which remote branch we're based on.
244 # Strategy:
[email protected]ade368c2011-03-01 08:57:50245 # 1) iterate through our branch history and find the svn URL.
246 # 2) find the svn-remote that fetches from the URL.
[email protected]f2f9d552009-12-22 00:12:57247
248 # regexp matching the git-svn line that contains the URL.
249 git_svn_re = re.compile(r'^\s*git-svn-id: (\S+)@', re.MULTILINE)
250
[email protected]ade368c2011-03-01 08:57:50251 # We don't want to go through all of history, so read a line from the
252 # pipe at a time.
253 # The -100 is an arbitrary limit so we don't search forever.
254 cmd = ['git', 'log', '-100', '--pretty=medium']
[email protected]f94e3f12011-12-13 21:03:46255 proc = subprocess2.Popen(cmd, cwd=cwd, stdout=subprocess2.PIPE)
[email protected]e8c28622011-04-05 14:41:44256 url = None
[email protected]ade368c2011-03-01 08:57:50257 for line in proc.stdout:
258 match = git_svn_re.match(line)
259 if match:
260 url = match.group(1)
261 proc.stdout.close() # Cut pipe.
262 break
[email protected]f2f9d552009-12-22 00:12:57263
[email protected]ade368c2011-03-01 08:57:50264 if url:
265 svn_remote_re = re.compile(r'^svn-remote\.([^.]+)\.url (.*)$')
[email protected]80a9ef12011-12-13 20:44:10266 remotes = GIT.Capture(
[email protected]a41249c2013-07-03 00:09:12267 ['config', '--local', '--get-regexp', r'^svn-remote\..*\.url'],
[email protected]80a9ef12011-12-13 20:44:10268 cwd=cwd).splitlines()
[email protected]ade368c2011-03-01 08:57:50269 for remote in remotes:
270 match = svn_remote_re.match(remote)
[email protected]f2f9d552009-12-22 00:12:57271 if match:
[email protected]ade368c2011-03-01 08:57:50272 remote = match.group(1)
273 base_url = match.group(2)
[email protected]866276c2011-03-18 20:09:31274 try:
275 fetch_spec = GIT.Capture(
[email protected]a41249c2013-07-03 00:09:12276 ['config', '--local', 'svn-remote.%s.fetch' % remote],
277 cwd=cwd)
[email protected]866276c2011-03-18 20:09:31278 branch = GIT.MatchSvnGlob(url, base_url, fetch_spec, False)
[email protected]da64d632011-09-08 17:41:15279 except subprocess2.CalledProcessError:
[email protected]866276c2011-03-18 20:09:31280 branch = None
281 if branch:
282 return branch
283 try:
284 branch_spec = GIT.Capture(
[email protected]a41249c2013-07-03 00:09:12285 ['config', '--local', 'svn-remote.%s.branches' % remote],
286 cwd=cwd)
[email protected]866276c2011-03-18 20:09:31287 branch = GIT.MatchSvnGlob(url, base_url, branch_spec, True)
[email protected]da64d632011-09-08 17:41:15288 except subprocess2.CalledProcessError:
[email protected]866276c2011-03-18 20:09:31289 branch = None
290 if branch:
291 return branch
292 try:
293 tag_spec = GIT.Capture(
[email protected]a41249c2013-07-03 00:09:12294 ['config', '--local', 'svn-remote.%s.tags' % remote],
295 cwd=cwd)
[email protected]866276c2011-03-18 20:09:31296 branch = GIT.MatchSvnGlob(url, base_url, tag_spec, True)
[email protected]da64d632011-09-08 17:41:15297 except subprocess2.CalledProcessError:
[email protected]866276c2011-03-18 20:09:31298 branch = None
299 if branch:
300 return branch
[email protected]f2f9d552009-12-22 00:12:57301
302 @staticmethod
303 def FetchUpstreamTuple(cwd):
304 """Returns a tuple containg remote and remote ref,
305 e.g. 'origin', 'refs/heads/master'
[email protected]81e012c2010-04-29 16:07:24306 Tries to be intelligent and understand git-svn.
[email protected]f2f9d552009-12-22 00:12:57307 """
308 remote = '.'
[email protected]b24a8e12009-12-22 13:45:48309 branch = GIT.GetBranch(cwd)
[email protected]ad80e3b2010-09-09 14:18:28310 try:
311 upstream_branch = GIT.Capture(
[email protected]a41249c2013-07-03 00:09:12312 ['config', '--local', 'branch.%s.merge' % branch], cwd=cwd)
[email protected]da64d632011-09-08 17:41:15313 except subprocess2.CalledProcessError:
[email protected]ad80e3b2010-09-09 14:18:28314 upstream_branch = None
[email protected]f2f9d552009-12-22 00:12:57315 if upstream_branch:
[email protected]ad80e3b2010-09-09 14:18:28316 try:
317 remote = GIT.Capture(
[email protected]a41249c2013-07-03 00:09:12318 ['config', '--local', 'branch.%s.remote' % branch], cwd=cwd)
[email protected]da64d632011-09-08 17:41:15319 except subprocess2.CalledProcessError:
[email protected]ad80e3b2010-09-09 14:18:28320 pass
[email protected]f2f9d552009-12-22 00:12:57321 else:
[email protected]ade368c2011-03-01 08:57:50322 try:
323 upstream_branch = GIT.Capture(
[email protected]a41249c2013-07-03 00:09:12324 ['config', '--local', 'rietveld.upstream-branch'], cwd=cwd)
[email protected]da64d632011-09-08 17:41:15325 except subprocess2.CalledProcessError:
[email protected]ade368c2011-03-01 08:57:50326 upstream_branch = None
327 if upstream_branch:
328 try:
329 remote = GIT.Capture(
[email protected]a41249c2013-07-03 00:09:12330 ['config', '--local', 'rietveld.upstream-remote'], cwd=cwd)
[email protected]da64d632011-09-08 17:41:15331 except subprocess2.CalledProcessError:
[email protected]ade368c2011-03-01 08:57:50332 pass
[email protected]81e012c2010-04-29 16:07:24333 else:
[email protected]ade368c2011-03-01 08:57:50334 # Fall back on trying a git-svn upstream branch.
335 if GIT.IsGitSvn(cwd):
336 upstream_branch = GIT.GetSVNBranch(cwd)
[email protected]a630bd72010-04-29 23:32:34337 else:
[email protected]ade368c2011-03-01 08:57:50338 # Else, try to guess the origin remote.
339 remote_branches = GIT.Capture(['branch', '-r'], cwd=cwd).split()
340 if 'origin/master' in remote_branches:
341 # Fall back on origin/master if it exits.
342 remote = 'origin'
343 upstream_branch = 'refs/heads/master'
344 elif 'origin/trunk' in remote_branches:
345 # Fall back on origin/trunk if it exists. Generally a shared
346 # git-svn clone
347 remote = 'origin'
348 upstream_branch = 'refs/heads/trunk'
349 else:
350 # Give up.
351 remote = None
352 upstream_branch = None
[email protected]f2f9d552009-12-22 00:12:57353 return remote, upstream_branch
354
355 @staticmethod
[email protected]81e012c2010-04-29 16:07:24356 def GetUpstreamBranch(cwd):
[email protected]f2f9d552009-12-22 00:12:57357 """Gets the current branch's upstream branch."""
358 remote, upstream_branch = GIT.FetchUpstreamTuple(cwd)
[email protected]a630bd72010-04-29 23:32:34359 if remote != '.' and upstream_branch:
[email protected]f2f9d552009-12-22 00:12:57360 upstream_branch = upstream_branch.replace('heads', 'remotes/' + remote)
361 return upstream_branch
362
363 @staticmethod
[email protected]8ede00e2010-01-12 14:35:28364 def GenerateDiff(cwd, branch=None, branch_head='HEAD', full_move=False,
365 files=None):
[email protected]a9371762009-12-22 18:27:38366 """Diffs against the upstream branch or optionally another branch.
367
368 full_move means that move or copy operations should completely recreate the
369 files, usually in the prospect to apply the patch for a try job."""
[email protected]f2f9d552009-12-22 00:12:57370 if not branch:
[email protected]81e012c2010-04-29 16:07:24371 branch = GIT.GetUpstreamBranch(cwd)
[email protected]33167332012-02-23 21:15:30372 command = ['diff', '-p', '--no-color', '--no-prefix', '--no-ext-diff',
[email protected]400f3e72010-05-19 14:23:36373 branch + "..." + branch_head]
[email protected]9249f642013-06-03 21:36:18374 if full_move:
375 command.append('--no-renames')
376 else:
[email protected]a9371762009-12-22 18:27:38377 command.append('-C')
[email protected]8ede00e2010-01-12 14:35:28378 # TODO(maruel): --binary support.
379 if files:
380 command.append('--')
381 command.extend(files)
[email protected]4380c802013-07-12 23:38:41382 diff = GIT.Capture(command, cwd=cwd, strip_out=False).splitlines(True)
[email protected]f2f9d552009-12-22 00:12:57383 for i in range(len(diff)):
384 # In the case of added files, replace /dev/null with the path to the
385 # file being added.
386 if diff[i].startswith('--- /dev/null'):
387 diff[i] = '--- %s' % diff[i+1][4:]
388 return ''.join(diff)
[email protected]c78f2462009-11-21 01:20:57389
[email protected]b24a8e12009-12-22 13:45:48390 @staticmethod
[email protected]8ede00e2010-01-12 14:35:28391 def GetDifferentFiles(cwd, branch=None, branch_head='HEAD'):
392 """Returns the list of modified files between two branches."""
393 if not branch:
[email protected]81e012c2010-04-29 16:07:24394 branch = GIT.GetUpstreamBranch(cwd)
[email protected]838f0f22010-04-09 17:02:50395 command = ['diff', '--name-only', branch + "..." + branch_head]
[email protected]ad80e3b2010-09-09 14:18:28396 return GIT.Capture(command, cwd=cwd).splitlines(False)
[email protected]8ede00e2010-01-12 14:35:28397
398 @staticmethod
[email protected]b24a8e12009-12-22 13:45:48399 def GetPatchName(cwd):
400 """Constructs a name for this patch."""
[email protected]a41249c2013-07-03 00:09:12401 short_sha = GIT.Capture(['rev-parse', '--short=4', 'HEAD'], cwd=cwd)
[email protected]862ff8e2010-08-06 15:29:16402 return "%s#%s" % (GIT.GetBranch(cwd), short_sha)
[email protected]b24a8e12009-12-22 13:45:48403
404 @staticmethod
[email protected]ad80e3b2010-09-09 14:18:28405 def GetCheckoutRoot(cwd):
[email protected]01d8c1d2010-01-07 01:56:59406 """Returns the top level directory of a git checkout as an absolute path.
[email protected]b24a8e12009-12-22 13:45:48407 """
[email protected]a41249c2013-07-03 00:09:12408 root = GIT.Capture(['rev-parse', '--show-cdup'], cwd=cwd)
[email protected]ad80e3b2010-09-09 14:18:28409 return os.path.abspath(os.path.join(cwd, root))
[email protected]b24a8e12009-12-22 13:45:48410
[email protected]e5d1e612011-12-19 19:49:19411 @staticmethod
[email protected]ead4c7e2014-04-03 01:01:06412 def GetGitDir(cwd):
413 return os.path.abspath(GIT.Capture(['rev-parse', '--git-dir'], cwd=cwd))
414
415 @staticmethod
416 def IsInsideWorkTree(cwd):
417 try:
418 return GIT.Capture(['rev-parse', '--is-inside-work-tree'], cwd=cwd)
419 except (OSError, subprocess2.CalledProcessError):
420 return False
421
422 @staticmethod
[email protected]e5d1e612011-12-19 19:49:19423 def GetGitSvnHeadRev(cwd):
424 """Gets the most recently pulled git-svn revision."""
425 try:
426 output = GIT.Capture(['svn', 'info'], cwd=cwd)
427 match = re.search(r'^Revision: ([0-9]+)$', output, re.MULTILINE)
428 return int(match.group(1)) if match else None
429 except (subprocess2.CalledProcessError, ValueError):
430 return None
431
432 @staticmethod
[email protected]492a3682012-08-10 00:28:28433 def ParseGitSvnSha1(output):
434 """Parses git-svn output for the first sha1."""
435 match = re.search(r'[0-9a-fA-F]{40}', output)
436 return match.group(0) if match else None
437
438 @staticmethod
[email protected]e5d1e612011-12-19 19:49:19439 def GetSha1ForSvnRev(cwd, rev):
440 """Returns a corresponding git sha1 for a SVN revision."""
[email protected]6c2b49d2014-02-26 23:57:38441 if not GIT.IsGitSvn(cwd=cwd):
[email protected]e5d1e612011-12-19 19:49:19442 return None
443 try:
[email protected]c51def32012-10-15 18:50:37444 output = GIT.Capture(['svn', 'find-rev', 'r' + str(rev)], cwd=cwd)
445 return GIT.ParseGitSvnSha1(output)
446 except subprocess2.CalledProcessError:
447 return None
448
449 @staticmethod
450 def GetBlessedSha1ForSvnRev(cwd, rev):
451 """Returns a git commit hash from the master branch history that has
452 accurate .DEPS.git and git submodules. To understand why this is more
453 complicated than a simple call to `git svn find-rev`, refer to:
454
455 http://www.chromium.org/developers/how-tos/git-repo
456 """
457 git_svn_rev = GIT.GetSha1ForSvnRev(cwd, rev)
458 if not git_svn_rev:
459 return None
460 try:
[email protected]312a6a42012-10-11 21:19:42461 output = GIT.Capture(
462 ['rev-list', '--ancestry-path', '--reverse',
463 '--grep', 'SVN changes up to revision [0-9]*',
464 '%s..refs/remotes/origin/master' % git_svn_rev], cwd=cwd)
465 if not output:
466 return None
467 sha1 = output.splitlines()[0]
468 if not sha1:
469 return None
470 output = GIT.Capture(['rev-list', '-n', '1', '%s^1' % sha1], cwd=cwd)
471 if git_svn_rev != output.rstrip():
472 raise gclient_utils.Error(sha1)
473 return sha1
[email protected]e5d1e612011-12-19 19:49:19474 except subprocess2.CalledProcessError:
475 return None
476
477 @staticmethod
[email protected]a41249c2013-07-03 00:09:12478 def IsValidRevision(cwd, rev, sha_only=False):
479 """Verifies the revision is a proper git revision.
480
481 sha_only: Fail unless rev is a sha hash.
482 """
[email protected]81473862012-06-27 17:30:56483 # 'git rev-parse foo' where foo is *any* 40 character hex string will return
484 # the string and return code 0. So strip one character to force 'git
485 # rev-parse' to do a hash table look-up and returns 128 if the hash is not
486 # present.
[email protected]a41249c2013-07-03 00:09:12487 lookup_rev = rev
[email protected]81473862012-06-27 17:30:56488 if re.match(r'^[0-9a-fA-F]{40}$', rev):
[email protected]a41249c2013-07-03 00:09:12489 lookup_rev = rev[:-1]
[email protected]e5d1e612011-12-19 19:49:19490 try:
[email protected]224ba242013-07-08 22:02:31491 sha = GIT.Capture(['rev-parse', lookup_rev], cwd=cwd).lower()
[email protected]a41249c2013-07-03 00:09:12492 if lookup_rev != rev:
493 # Make sure we get the original 40 chars back.
[email protected]68953172014-06-11 22:14:35494 return rev.lower() == sha
[email protected]a41249c2013-07-03 00:09:12495 if sha_only:
[email protected]68953172014-06-11 22:14:35496 return sha.startswith(rev.lower())
497 return True
[email protected]e5d1e612011-12-19 19:49:19498 except subprocess2.CalledProcessError:
499 return False
500
[email protected]36ac2392011-10-12 16:36:11501 @classmethod
502 def AssertVersion(cls, min_version):
[email protected]d0f854a2010-03-11 19:35:53503 """Asserts git's version is at least min_version."""
[email protected]36ac2392011-10-12 16:36:11504 if cls.current_version is None:
[email protected]fcffd482012-02-24 01:47:00505 current_version = cls.Capture(['--version'], '.')
506 matched = re.search(r'version ([0-9\.]+)', current_version)
507 cls.current_version = matched.group(1)
[email protected]36ac2392011-10-12 16:36:11508 current_version_list = map(only_int, cls.current_version.split('.'))
[email protected]d0f854a2010-03-11 19:35:53509 for min_ver in map(int, min_version.split('.')):
510 ver = current_version_list.pop(0)
511 if ver < min_ver:
[email protected]36ac2392011-10-12 16:36:11512 return (False, cls.current_version)
[email protected]d0f854a2010-03-11 19:35:53513 elif ver > min_ver:
[email protected]36ac2392011-10-12 16:36:11514 return (True, cls.current_version)
515 return (True, cls.current_version)
[email protected]d0f854a2010-03-11 19:35:53516
[email protected]d5800f12009-11-12 20:03:43517
[email protected]5aeb7dd2009-11-17 18:09:01518class SVN(object):
[email protected]57564662010-04-14 02:35:12519 current_version = None
[email protected]d5800f12009-11-12 20:03:43520
[email protected]5aeb7dd2009-11-17 18:09:01521 @staticmethod
[email protected]d579fcf2011-12-13 20:36:03522 def Capture(args, cwd, **kwargs):
[email protected]54019f32010-09-09 13:50:11523 """Always redirect stderr.
[email protected]d5800f12009-11-12 20:03:43524
[email protected]da64d632011-09-08 17:41:15525 Throws an exception if non-0 is returned.
526 """
[email protected]904af082011-09-08 22:06:09527 return subprocess2.check_output(
[email protected]d579fcf2011-12-13 20:36:03528 ['svn'] + args, stderr=subprocess2.PIPE, cwd=cwd, **kwargs)
[email protected]d5800f12009-11-12 20:03:43529
[email protected]5aeb7dd2009-11-17 18:09:01530 @staticmethod
[email protected]2b9aa8e2010-08-25 20:01:42531 def RunAndGetFileList(verbose, args, cwd, file_list, stdout=None):
[email protected]5aeb7dd2009-11-17 18:09:01532 """Runs svn checkout, update, or status, output to stdout.
[email protected]d5800f12009-11-12 20:03:43533
[email protected]5aeb7dd2009-11-17 18:09:01534 The first item in args must be either "checkout", "update", or "status".
[email protected]d5800f12009-11-12 20:03:43535
[email protected]5aeb7dd2009-11-17 18:09:01536 svn's stdout is parsed to collect a list of files checked out or updated.
537 These files are appended to file_list. svn's stdout is also printed to
538 sys.stdout as in Run.
[email protected]d5800f12009-11-12 20:03:43539
[email protected]5aeb7dd2009-11-17 18:09:01540 Args:
[email protected]03807072010-08-16 17:18:44541 verbose: If True, uses verbose output
[email protected]5aeb7dd2009-11-17 18:09:01542 args: A sequence of command line parameters to be passed to svn.
[email protected]2b9aa8e2010-08-25 20:01:42543 cwd: The directory where svn is to be run.
[email protected]d5800f12009-11-12 20:03:43544
[email protected]5aeb7dd2009-11-17 18:09:01545 Raises:
546 Error: An error occurred while running the svn command.
547 """
[email protected]2b9aa8e2010-08-25 20:01:42548 stdout = stdout or sys.stdout
[email protected]396e1a62013-07-03 19:41:04549 if file_list is None:
550 # Even if our caller doesn't care about file_list, we use it internally.
551 file_list = []
[email protected]d5800f12009-11-12 20:03:43552
[email protected]5aeb7dd2009-11-17 18:09:01553 # svn update and svn checkout use the same pattern: the first three columns
554 # are for file status, property status, and lock status. This is followed
555 # by two spaces, and then the path to the file.
556 update_pattern = '^... (.*)$'
[email protected]d5800f12009-11-12 20:03:43557
[email protected]5aeb7dd2009-11-17 18:09:01558 # The first three columns of svn status are the same as for svn update and
559 # svn checkout. The next three columns indicate addition-with-history,
560 # switch, and remote lock status. This is followed by one space, and then
561 # the path to the file.
562 status_pattern = '^...... (.*)$'
[email protected]d5800f12009-11-12 20:03:43563
[email protected]5aeb7dd2009-11-17 18:09:01564 # args[0] must be a supported command. This will blow up if it's something
565 # else, which is good. Note that the patterns are only effective when
566 # these commands are used in their ordinary forms, the patterns are invalid
567 # for "svn status --show-updates", for example.
568 pattern = {
569 'checkout': update_pattern,
570 'status': status_pattern,
571 'update': update_pattern,
572 }[args[0]]
[email protected]5aeb7dd2009-11-17 18:09:01573 compiled_pattern = re.compile(pattern)
[email protected]b71b67e2009-11-24 20:48:19574 # Place an upper limit.
[email protected]2aee22982010-09-03 14:15:25575 backoff_time = 5
[email protected]bec588d2010-10-26 13:50:25576 retries = 0
[email protected]03507062010-10-26 00:58:27577 while True:
[email protected]bec588d2010-10-26 13:50:25578 retries += 1
[email protected]b71b67e2009-11-24 20:48:19579 previous_list_len = len(file_list)
580 failure = []
[email protected]54d1f1a2010-01-08 19:53:47581
[email protected]b71b67e2009-11-24 20:48:19582 def CaptureMatchingLines(line):
583 match = compiled_pattern.search(line)
584 if match:
585 file_list.append(match.group(1))
586 if line.startswith('svn: '):
[email protected]8599aa72010-02-08 20:27:14587 failure.append(line)
[email protected]54d1f1a2010-01-08 19:53:47588
[email protected]b71b67e2009-11-24 20:48:19589 try:
[email protected]17d01792010-09-01 18:07:10590 gclient_utils.CheckCallAndFilterAndHeader(
591 ['svn'] + args,
592 cwd=cwd,
593 always=verbose,
594 filter_fn=CaptureMatchingLines,
595 stdout=stdout)
[email protected]da64d632011-09-08 17:41:15596 except subprocess2.CalledProcessError:
[email protected]6133c5b2010-08-18 18:34:48597 def IsKnownFailure():
598 for x in failure:
599 if (x.startswith('svn: OPTIONS of') or
600 x.startswith('svn: PROPFIND of') or
601 x.startswith('svn: REPORT of') or
[email protected]f61fc932010-08-19 13:05:24602 x.startswith('svn: Unknown hostname') or
[email protected]7d8b97d2011-10-11 23:32:30603 x.startswith('svn: Server sent unexpected return value') or
604 x.startswith('svn: Can\'t connect to host')):
[email protected]6133c5b2010-08-18 18:34:48605 return True
606 return False
607
[email protected]953586a2010-06-15 14:22:24608 # Subversion client is really misbehaving with Google Code.
609 if args[0] == 'checkout':
610 # Ensure at least one file was checked out, otherwise *delete* the
611 # directory.
612 if len(file_list) == previous_list_len:
[email protected]6133c5b2010-08-18 18:34:48613 if not IsKnownFailure():
[email protected]953586a2010-06-15 14:22:24614 # No known svn error was found, bail out.
615 raise
[email protected]6133c5b2010-08-18 18:34:48616 # No file were checked out, so make sure the directory is
617 # deleted in case it's messed up and try again.
618 # Warning: It's bad, it assumes args[2] is the directory
619 # argument.
620 if os.path.isdir(args[2]):
[email protected]dc112ac2013-04-24 13:00:19621 gclient_utils.rmtree(args[2])
[email protected]953586a2010-06-15 14:22:24622 else:
623 # Progress was made, convert to update since an aborted checkout
624 # is now an update.
[email protected]2de10252010-02-08 01:10:39625 args = ['update'] + args[1:]
[email protected]953586a2010-06-15 14:22:24626 else:
627 # It was an update or export.
[email protected]6133c5b2010-08-18 18:34:48628 # We enforce that some progress has been made or a known failure.
629 if len(file_list) == previous_list_len and not IsKnownFailure():
630 # No known svn error was found and no progress, bail out.
631 raise
[email protected]bec588d2010-10-26 13:50:25632 if retries == 10:
[email protected]03507062010-10-26 00:58:27633 raise
[email protected]2aee22982010-09-03 14:15:25634 print "Sleeping %.1f seconds and retrying...." % backoff_time
635 time.sleep(backoff_time)
636 backoff_time *= 1.3
[email protected]953586a2010-06-15 14:22:24637 continue
[email protected]b71b67e2009-11-24 20:48:19638 break
[email protected]d5800f12009-11-12 20:03:43639
[email protected]5aeb7dd2009-11-17 18:09:01640 @staticmethod
[email protected]d579fcf2011-12-13 20:36:03641 def CaptureRemoteInfo(url):
642 """Returns a dictionary from the svn info output for the given url.
643
644 Throws an exception if svn info fails.
645 """
646 assert isinstance(url, str)
647 return SVN._CaptureInfo([url], None)
648
649 @staticmethod
650 def CaptureLocalInfo(files, cwd):
651 """Returns a dictionary from the svn info output for the given files.
652
653 Throws an exception if svn info fails.
654 """
655 assert isinstance(files, (list, tuple))
656 return SVN._CaptureInfo(files, cwd)
657
658 @staticmethod
659 def _CaptureInfo(files, cwd):
[email protected]5aeb7dd2009-11-17 18:09:01660 """Returns a dictionary from the svn info output for the given file.
[email protected]d5800f12009-11-12 20:03:43661
[email protected]54019f32010-09-09 13:50:11662 Throws an exception if svn info fails."""
[email protected]d25fb8f2011-04-07 13:40:15663 result = {}
[email protected]d579fcf2011-12-13 20:36:03664 info = ElementTree.XML(SVN.Capture(['info', '--xml'] + files, cwd))
[email protected]ade9c592011-04-07 15:59:11665 if info is None:
666 return result
667 entry = info.find('entry')
[email protected]6f323bb2011-04-26 15:42:53668 if entry is None:
669 return result
[email protected]ade9c592011-04-07 15:59:11670
671 # Use .text when the item is not optional.
672 result['Path'] = entry.attrib['path']
[email protected]7d654672012-01-05 19:07:23673 rev = entry.attrib['revision']
674 try:
675 result['Revision'] = int(rev)
676 except ValueError:
677 result['Revision'] = None
[email protected]ade9c592011-04-07 15:59:11678 result['Node Kind'] = entry.attrib['kind']
679 # Differs across versions.
680 if result['Node Kind'] == 'dir':
681 result['Node Kind'] = 'directory'
682 result['URL'] = entry.find('url').text
683 repository = entry.find('repository')
684 result['Repository Root'] = repository.find('root').text
685 result['UUID'] = repository.find('uuid')
686 wc_info = entry.find('wc-info')
687 if wc_info is not None:
688 result['Schedule'] = wc_info.find('schedule').text
689 result['Copied From URL'] = wc_info.find('copy-from-url')
690 result['Copied From Rev'] = wc_info.find('copy-from-rev')
691 else:
692 result['Schedule'] = None
693 result['Copied From URL'] = None
694 result['Copied From Rev'] = None
695 for key in result.keys():
696 if isinstance(result[key], unicode):
697 # Unicode results interferes with the higher layers matching up things
698 # in the deps dictionary.
699 result[key] = result[key].encode()
700 # Automatic conversion of optional parameters.
701 result[key] = getattr(result[key], 'text', result[key])
[email protected]5aeb7dd2009-11-17 18:09:01702 return result
[email protected]d5800f12009-11-12 20:03:43703
[email protected]5aeb7dd2009-11-17 18:09:01704 @staticmethod
[email protected]54019f32010-09-09 13:50:11705 def CaptureRevision(cwd):
[email protected]5d63eb82010-03-24 23:22:09706 """Get the base revision of a SVN repository.
707
708 Returns:
709 Int base revision
710 """
[email protected]d579fcf2011-12-13 20:36:03711 return SVN.CaptureLocalInfo([], cwd).get('Revision')
[email protected]5d63eb82010-03-24 23:22:09712
713 @staticmethod
[email protected]ea15cb72012-05-04 14:16:31714 def CaptureStatus(files, cwd, no_ignore=False):
[email protected]5aeb7dd2009-11-17 18:09:01715 """Returns the svn 1.5 svn status emulated output.
[email protected]d5800f12009-11-12 20:03:43716
[email protected]5aeb7dd2009-11-17 18:09:01717 @files can be a string (one file) or a list of files.
[email protected]d5800f12009-11-12 20:03:43718
[email protected]5aeb7dd2009-11-17 18:09:01719 Returns an array of (status, file) tuples."""
720 command = ["status", "--xml"]
[email protected]ea15cb72012-05-04 14:16:31721 if no_ignore:
722 command.append('--no-ignore')
[email protected]5aeb7dd2009-11-17 18:09:01723 if not files:
724 pass
725 elif isinstance(files, basestring):
726 command.append(files)
727 else:
728 command.extend(files)
[email protected]d5800f12009-11-12 20:03:43729
[email protected]5aeb7dd2009-11-17 18:09:01730 status_letter = {
731 None: ' ',
732 '': ' ',
733 'added': 'A',
734 'conflicted': 'C',
735 'deleted': 'D',
736 'external': 'X',
737 'ignored': 'I',
738 'incomplete': '!',
739 'merged': 'G',
740 'missing': '!',
741 'modified': 'M',
742 'none': ' ',
743 'normal': ' ',
744 'obstructed': '~',
745 'replaced': 'R',
746 'unversioned': '?',
747 }
[email protected]d579fcf2011-12-13 20:36:03748 dom = ElementTree.XML(SVN.Capture(command, cwd))
[email protected]5aeb7dd2009-11-17 18:09:01749 results = []
[email protected]ade9c592011-04-07 15:59:11750 if dom is None:
751 return results
752 # /status/target/entry/(wc-status|commit|author|date)
753 for target in dom.findall('target'):
754 for entry in target.findall('entry'):
755 file_path = entry.attrib['path']
756 wc_status = entry.find('wc-status')
757 # Emulate svn 1.5 status ouput...
758 statuses = [' '] * 7
759 # Col 0
760 xml_item_status = wc_status.attrib['item']
761 if xml_item_status in status_letter:
762 statuses[0] = status_letter[xml_item_status]
763 else:
764 raise gclient_utils.Error(
765 'Unknown item status "%s"; please implement me!' %
766 xml_item_status)
767 # Col 1
768 xml_props_status = wc_status.attrib['props']
769 if xml_props_status == 'modified':
770 statuses[1] = 'M'
771 elif xml_props_status == 'conflicted':
772 statuses[1] = 'C'
773 elif (not xml_props_status or xml_props_status == 'none' or
774 xml_props_status == 'normal'):
775 pass
776 else:
777 raise gclient_utils.Error(
778 'Unknown props status "%s"; please implement me!' %
779 xml_props_status)
780 # Col 2
781 if wc_status.attrib.get('wc-locked') == 'true':
782 statuses[2] = 'L'
783 # Col 3
784 if wc_status.attrib.get('copied') == 'true':
785 statuses[3] = '+'
786 # Col 4
787 if wc_status.attrib.get('switched') == 'true':
788 statuses[4] = 'S'
789 # TODO(maruel): Col 5 and 6
790 item = (''.join(statuses), file_path)
791 results.append(item)
[email protected]5aeb7dd2009-11-17 18:09:01792 return results
[email protected]d5800f12009-11-12 20:03:43793
[email protected]5aeb7dd2009-11-17 18:09:01794 @staticmethod
[email protected]d579fcf2011-12-13 20:36:03795 def IsMoved(filename, cwd):
[email protected]5aeb7dd2009-11-17 18:09:01796 """Determine if a file has been added through svn mv"""
[email protected]d579fcf2011-12-13 20:36:03797 assert isinstance(filename, basestring)
798 return SVN.IsMovedInfo(SVN.CaptureLocalInfo([filename], cwd))
[email protected]3c55d982010-05-06 14:25:44799
800 @staticmethod
801 def IsMovedInfo(info):
802 """Determine if a file has been added through svn mv"""
[email protected]5aeb7dd2009-11-17 18:09:01803 return (info.get('Copied From URL') and
804 info.get('Copied From Rev') and
805 info.get('Schedule') == 'add')
[email protected]d5800f12009-11-12 20:03:43806
[email protected]5aeb7dd2009-11-17 18:09:01807 @staticmethod
[email protected]d579fcf2011-12-13 20:36:03808 def GetFileProperty(filename, property_name, cwd):
[email protected]5aeb7dd2009-11-17 18:09:01809 """Returns the value of an SVN property for the given file.
[email protected]d5800f12009-11-12 20:03:43810
[email protected]5aeb7dd2009-11-17 18:09:01811 Args:
[email protected]6e29d572010-06-04 17:32:20812 filename: The file to check
[email protected]5aeb7dd2009-11-17 18:09:01813 property_name: The name of the SVN property, e.g. "svn:mime-type"
[email protected]d5800f12009-11-12 20:03:43814
[email protected]5aeb7dd2009-11-17 18:09:01815 Returns:
816 The value of the property, which will be the empty string if the property
817 is not set on the file. If the file is not under version control, the
818 empty string is also returned.
819 """
[email protected]54019f32010-09-09 13:50:11820 try:
[email protected]d579fcf2011-12-13 20:36:03821 return SVN.Capture(['propget', property_name, filename], cwd)
[email protected]da64d632011-09-08 17:41:15822 except subprocess2.CalledProcessError:
[email protected]54019f32010-09-09 13:50:11823 return ''
[email protected]d5800f12009-11-12 20:03:43824
[email protected]5aeb7dd2009-11-17 18:09:01825 @staticmethod
[email protected]d579fcf2011-12-13 20:36:03826 def GenerateDiff(filenames, cwd, full_move, revision):
[email protected]f2f9d552009-12-22 00:12:57827 """Returns a string containing the diff for the given file list.
828
829 The files in the list should either be absolute paths or relative to the
830 given root. If no root directory is provided, the repository root will be
831 used.
832 The diff will always use relative paths.
833 """
[email protected]00fdcb32011-02-24 01:41:02834 assert isinstance(filenames, (list, tuple))
[email protected]0db557c2013-04-24 23:44:23835 # If the user specified a custom diff command in their svn config file,
836 # then it'll be used when we do svn diff, which we don't want to happen
837 # since we want the unified diff.
838 if SVN.AssertVersion("1.7")[0]:
839 # On svn >= 1.7, the "--internal-diff" flag will solve this.
840 return SVN._GenerateDiffInternal(filenames, cwd, full_move, revision,
841 ["diff", "--internal-diff"],
842 ["diff", "--internal-diff"])
843 else:
844 # On svn < 1.7, the "--internal-diff" flag doesn't exist. Using
845 # --diff-cmd=diff doesn't always work, since e.g. Windows cmd users may
846 # not have a "diff" executable in their path at all. So we use an empty
847 # temporary directory as the config directory, which bypasses any user
848 # settings for the diff-cmd. However, we don't pass this for the
849 # remote_safe_diff_command parameter, since when a new config-dir is
850 # specified for an svn diff against a remote URL, it triggers
851 # authentication prompts. In this case there isn't really a good
852 # alternative to svn 1.7's --internal-diff flag.
853 bogus_dir = tempfile.mkdtemp()
854 try:
855 return SVN._GenerateDiffInternal(filenames, cwd, full_move, revision,
856 ["diff", "--config-dir", bogus_dir],
857 ["diff"])
858 finally:
859 gclient_utils.rmtree(bogus_dir)
860
861 @staticmethod
862 def _GenerateDiffInternal(filenames, cwd, full_move, revision, diff_command,
863 remote_safe_diff_command):
[email protected]d579fcf2011-12-13 20:36:03864 root = os.path.normcase(os.path.join(cwd, ''))
[email protected]f2f9d552009-12-22 00:12:57865 def RelativePath(path, root):
866 """We must use relative paths."""
[email protected]fd9cbbb2010-01-08 23:04:03867 if os.path.normcase(path).startswith(root):
[email protected]f2f9d552009-12-22 00:12:57868 return path[len(root):]
869 return path
[email protected]0db557c2013-04-24 23:44:23870 # Cleanup filenames
871 filenames = [RelativePath(f, root) for f in filenames]
872 # Get information about the modified items (files and directories)
873 data = dict((f, SVN.CaptureLocalInfo([f], root)) for f in filenames)
874 diffs = []
875 if full_move:
876 # Eliminate modified files inside moved/copied directory.
877 for (filename, info) in data.iteritems():
878 if SVN.IsMovedInfo(info) and info.get("Node Kind") == "directory":
879 # Remove files inside the directory.
880 filenames = [f for f in filenames
881 if not f.startswith(filename + os.path.sep)]
882 for filename in data.keys():
883 if not filename in filenames:
884 # Remove filtered out items.
885 del data[filename]
886 else:
887 metaheaders = []
888 for (filename, info) in data.iteritems():
889 if SVN.IsMovedInfo(info):
890 # for now, the most common case is a head copy,
891 # so let's just encode that as a straight up cp.
892 srcurl = info.get('Copied From URL')
893 file_root = info.get('Repository Root')
894 rev = int(info.get('Copied From Rev'))
895 assert srcurl.startswith(file_root)
896 src = srcurl[len(file_root)+1:]
897 try:
898 srcinfo = SVN.CaptureRemoteInfo(srcurl)
899 except subprocess2.CalledProcessError, e:
900 if not 'Not a valid URL' in e.stderr:
901 raise
902 # Assume the file was deleted. No idea how to figure out at which
903 # revision the file was deleted.
904 srcinfo = {'Revision': rev}
905 if (srcinfo.get('Revision') != rev and
906 SVN.Capture(remote_safe_diff_command + ['-r', '%d:head' % rev,
907 srcurl], cwd)):
908 metaheaders.append("#$ svn cp -r %d %s %s "
909 "### WARNING: note non-trunk copy\n" %
910 (rev, src, filename))
911 else:
912 metaheaders.append("#$ cp %s %s\n" % (src,
913 filename))
914 if metaheaders:
915 diffs.append("### BEGIN SVN COPY METADATA\n")
916 diffs.extend(metaheaders)
917 diffs.append("### END SVN COPY METADATA\n")
918 # Now ready to do the actual diff.
919 for filename in sorted(data):
920 diffs.append(SVN._DiffItemInternal(
921 filename, cwd, data[filename], diff_command, full_move, revision))
922 # Use StringIO since it can be messy when diffing a directory move with
923 # full_move=True.
924 buf = cStringIO.StringIO()
925 for d in filter(None, diffs):
926 buf.write(d)
927 result = buf.getvalue()
928 buf.close()
929 return result
[email protected]f2f9d552009-12-22 00:12:57930
931 @staticmethod
[email protected]0db557c2013-04-24 23:44:23932 def _DiffItemInternal(filename, cwd, info, diff_command, full_move, revision):
[email protected]917ea7f2013-04-19 20:10:03933 """Grabs the diff data."""
[email protected]0db557c2013-04-24 23:44:23934 command = diff_command + [filename]
[email protected]917ea7f2013-04-19 20:10:03935 if revision:
936 command.extend(['--revision', revision])
937 data = None
938 if SVN.IsMovedInfo(info):
939 if full_move:
940 if info.get("Node Kind") == "directory":
941 # Things become tricky here. It's a directory copy/move. We need to
942 # diff all the files inside it.
943 # This will put a lot of pressure on the heap. This is why StringIO
944 # is used and converted back into a string at the end. The reason to
945 # return a string instead of a StringIO is that StringIO.write()
946 # doesn't accept a StringIO object. *sigh*.
947 for (dirpath, dirnames, filenames) in os.walk(filename):
948 # Cleanup all files starting with a '.'.
949 for d in dirnames:
950 if d.startswith('.'):
951 dirnames.remove(d)
952 for f in filenames:
953 if f.startswith('.'):
954 filenames.remove(f)
955 for f in filenames:
956 if data is None:
957 data = cStringIO.StringIO()
958 data.write(GenFakeDiff(os.path.join(dirpath, f)))
959 if data:
960 tmp = data.getvalue()
961 data.close()
962 data = tmp
963 else:
964 data = GenFakeDiff(filename)
965 else:
966 if info.get("Node Kind") != "directory":
967 # svn diff on a mv/cp'd file outputs nothing if there was no change.
968 data = SVN.Capture(command, cwd)
969 if not data:
970 # We put in an empty Index entry so upload.py knows about them.
971 data = "Index: %s\n" % filename.replace(os.sep, '/')
972 # Otherwise silently ignore directories.
973 else:
974 if info.get("Node Kind") != "directory":
975 # Normal simple case.
976 try:
977 data = SVN.Capture(command, cwd)
978 except subprocess2.CalledProcessError:
979 if revision:
980 data = GenFakeDiff(filename)
981 else:
982 raise
983 # Otherwise silently ignore directories.
984 return data
985
986 @staticmethod
[email protected]d579fcf2011-12-13 20:36:03987 def GetEmail(cwd):
[email protected]c78f2462009-11-21 01:20:57988 """Retrieves the svn account which we assume is an email address."""
[email protected]54019f32010-09-09 13:50:11989 try:
[email protected]d579fcf2011-12-13 20:36:03990 infos = SVN.CaptureLocalInfo([], cwd)
[email protected]da64d632011-09-08 17:41:15991 except subprocess2.CalledProcessError:
[email protected]c78f2462009-11-21 01:20:57992 return None
993
994 # Should check for uuid but it is incorrectly saved for https creds.
[email protected]54019f32010-09-09 13:50:11995 root = infos['Repository Root']
[email protected]c78f2462009-11-21 01:20:57996 realm = root.rsplit('/', 1)[0]
[email protected]54019f32010-09-09 13:50:11997 uuid = infos['UUID']
[email protected]c78f2462009-11-21 01:20:57998 if root.startswith('https') or not uuid:
999 regexp = re.compile(r'<%s:\d+>.*' % realm)
1000 else:
1001 regexp = re.compile(r'<%s:\d+> %s' % (realm, uuid))
1002 if regexp is None:
1003 return None
1004 if sys.platform.startswith('win'):
1005 if not 'APPDATA' in os.environ:
1006 return None
[email protected]720d9f32009-11-21 17:38:571007 auth_dir = os.path.join(os.environ['APPDATA'], 'Subversion', 'auth',
1008 'svn.simple')
[email protected]c78f2462009-11-21 01:20:571009 else:
1010 if not 'HOME' in os.environ:
1011 return None
1012 auth_dir = os.path.join(os.environ['HOME'], '.subversion', 'auth',
1013 'svn.simple')
1014 for credfile in os.listdir(auth_dir):
1015 cred_info = SVN.ReadSimpleAuth(os.path.join(auth_dir, credfile))
1016 if regexp.match(cred_info.get('svn:realmstring')):
1017 return cred_info.get('username')
1018
1019 @staticmethod
1020 def ReadSimpleAuth(filename):
1021 f = open(filename, 'r')
1022 values = {}
[email protected]6e29d572010-06-04 17:32:201023 def ReadOneItem(item_type):
1024 m = re.match(r'%s (\d+)' % item_type, f.readline())
[email protected]c78f2462009-11-21 01:20:571025 if not m:
1026 return None
1027 data = f.read(int(m.group(1)))
1028 if f.read(1) != '\n':
1029 return None
1030 return data
1031
1032 while True:
1033 key = ReadOneItem('K')
1034 if not key:
1035 break
1036 value = ReadOneItem('V')
1037 if not value:
1038 break
1039 values[key] = value
1040 return values
[email protected]94b1ee92009-12-19 20:27:201041
1042 @staticmethod
[email protected]d579fcf2011-12-13 20:36:031043 def GetCheckoutRoot(cwd):
[email protected]94b1ee92009-12-19 20:27:201044 """Returns the top level directory of the current repository.
1045
1046 The directory is returned as an absolute path.
1047 """
[email protected]d579fcf2011-12-13 20:36:031048 cwd = os.path.abspath(cwd)
[email protected]54019f32010-09-09 13:50:111049 try:
[email protected]d579fcf2011-12-13 20:36:031050 info = SVN.CaptureLocalInfo([], cwd)
[email protected]885d6e82011-02-24 20:21:461051 cur_dir_repo_root = info['Repository Root']
1052 url = info['URL']
[email protected]da64d632011-09-08 17:41:151053 except subprocess2.CalledProcessError:
[email protected]94b1ee92009-12-19 20:27:201054 return None
[email protected]94b1ee92009-12-19 20:27:201055 while True:
[email protected]d579fcf2011-12-13 20:36:031056 parent = os.path.dirname(cwd)
[email protected]54019f32010-09-09 13:50:111057 try:
[email protected]d579fcf2011-12-13 20:36:031058 info = SVN.CaptureLocalInfo([], parent)
[email protected]885d6e82011-02-24 20:21:461059 if (info['Repository Root'] != cur_dir_repo_root or
1060 info['URL'] != os.path.dirname(url)):
[email protected]54019f32010-09-09 13:50:111061 break
[email protected]885d6e82011-02-24 20:21:461062 url = info['URL']
[email protected]da64d632011-09-08 17:41:151063 except subprocess2.CalledProcessError:
[email protected]94b1ee92009-12-19 20:27:201064 break
[email protected]d579fcf2011-12-13 20:36:031065 cwd = parent
1066 return GetCasedPath(cwd)
[email protected]57564662010-04-14 02:35:121067
[email protected]e5d1e612011-12-19 19:49:191068 @staticmethod
1069 def IsValidRevision(url):
1070 """Verifies the revision looks like an SVN revision."""
1071 try:
1072 SVN.Capture(['info', url], cwd=None)
1073 return True
1074 except subprocess2.CalledProcessError:
1075 return False
1076
[email protected]36ac2392011-10-12 16:36:111077 @classmethod
1078 def AssertVersion(cls, min_version):
[email protected]57564662010-04-14 02:35:121079 """Asserts svn's version is at least min_version."""
[email protected]36ac2392011-10-12 16:36:111080 if cls.current_version is None:
[email protected]13b522c2012-07-20 17:16:511081 cls.current_version = cls.Capture(['--version', '--quiet'], None)
[email protected]36ac2392011-10-12 16:36:111082 current_version_list = map(only_int, cls.current_version.split('.'))
[email protected]57564662010-04-14 02:35:121083 for min_ver in map(int, min_version.split('.')):
1084 ver = current_version_list.pop(0)
1085 if ver < min_ver:
[email protected]36ac2392011-10-12 16:36:111086 return (False, cls.current_version)
[email protected]57564662010-04-14 02:35:121087 elif ver > min_ver:
[email protected]36ac2392011-10-12 16:36:111088 return (True, cls.current_version)
1089 return (True, cls.current_version)
[email protected]07ab60e2011-02-08 21:54:001090
1091 @staticmethod
[email protected]ea15cb72012-05-04 14:16:311092 def Revert(cwd, callback=None, ignore_externals=False, no_ignore=False):
[email protected]d579fcf2011-12-13 20:36:031093 """Reverts all svn modifications in cwd, including properties.
[email protected]07ab60e2011-02-08 21:54:001094
1095 Deletes any modified files or directory.
1096
1097 A "svn update --revision BASE" call is required after to revive deleted
1098 files.
1099 """
[email protected]ea15cb72012-05-04 14:16:311100 for file_status in SVN.CaptureStatus(None, cwd, no_ignore=no_ignore):
[email protected]d579fcf2011-12-13 20:36:031101 file_path = os.path.join(cwd, file_status[1])
[email protected]8c415122011-03-15 17:14:271102 if (ignore_externals and
1103 file_status[0][0] == 'X' and
1104 file_status[0][1:].isspace()):
[email protected]07ab60e2011-02-08 21:54:001105 # Ignore externals.
1106 logging.info('Ignoring external %s' % file_status[1])
1107 continue
1108
[email protected]62087572012-04-24 23:16:281109 # This is the case where '! L .' is returned by 'svn status'. Just
1110 # strip off the '/.'.
1111 if file_path.endswith(os.path.sep + '.'):
1112 file_path = file_path[:-2]
1113
[email protected]07ab60e2011-02-08 21:54:001114 if callback:
1115 callback(file_status)
1116
[email protected]8c415122011-03-15 17:14:271117 if os.path.exists(file_path):
1118 # svn revert is really stupid. It fails on inconsistent line-endings,
1119 # on switched directories, etc. So take no chance and delete everything!
1120 # In theory, it wouldn't be necessary for property-only change but then
1121 # it'd have to look for switched directories, etc so it's not worth
1122 # optimizing this use case.
1123 if os.path.isfile(file_path) or os.path.islink(file_path):
1124 logging.info('os.remove(%s)' % file_path)
1125 os.remove(file_path)
1126 elif os.path.isdir(file_path):
[email protected]dc112ac2013-04-24 13:00:191127 logging.info('rmtree(%s)' % file_path)
1128 gclient_utils.rmtree(file_path)
[email protected]8c415122011-03-15 17:14:271129 else:
1130 logging.critical(
1131 ('No idea what is %s.\nYou just found a bug in gclient'
1132 ', please ping [email protected] ASAP!') % file_path)
[email protected]07ab60e2011-02-08 21:54:001133
[email protected]8c415122011-03-15 17:14:271134 if (file_status[0][0] in ('D', 'A', '!') or
1135 not file_status[0][1:].isspace()):
[email protected]af453492011-03-03 21:04:091136 # Added, deleted file requires manual intervention and require calling
[email protected]07ab60e2011-02-08 21:54:001137 # revert, like for properties.
[email protected]d579fcf2011-12-13 20:36:031138 if not os.path.isdir(cwd):
[email protected]8b322b32011-11-01 19:05:501139 # '.' was deleted. It's not worth continuing.
1140 return
[email protected]af453492011-03-03 21:04:091141 try:
[email protected]d579fcf2011-12-13 20:36:031142 SVN.Capture(['revert', file_status[1]], cwd=cwd)
[email protected]da64d632011-09-08 17:41:151143 except subprocess2.CalledProcessError:
[email protected]af453492011-03-03 21:04:091144 if not os.path.exists(file_path):
1145 continue
1146 raise