blob: d0ae572c93c9bffc6a9b268c19cbf58e041c318f [file] [log] [blame]
maruel@chromium.org7d654672012-01-05 19:07:23 +00001# Copyright (c) 2012 The Chromium Authors. All rights reserved.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +00002# Use of this source code is governed by a BSD-style license that can be
3# found in the LICENSE file.
4
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +00005"""SCM-specific utility classes."""
maruel@chromium.orgd5800f12009-11-12 20:03:43 +00006
maruel@chromium.org3c55d982010-05-06 14:25:44 +00007import cStringIO
maruel@chromium.orgfd9cbbb2010-01-08 23:04:03 +00008import glob
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00009import logging
maruel@chromium.orgd5800f12009-11-12 20:03:43 +000010import os
11import re
maruel@chromium.orgd5800f12009-11-12 20:03:43 +000012import sys
pkasting@chromium.org4755b582013-04-18 21:38:40 +000013import tempfile
maruel@chromium.orgfd876172010-04-30 14:01:05 +000014import time
maruel@chromium.orgade9c592011-04-07 15:59:11 +000015from xml.etree import ElementTree
maruel@chromium.orgd5800f12009-11-12 20:03:43 +000016
17import gclient_utils
maruel@chromium.org31cb48a2011-04-04 18:01:36 +000018import subprocess2
19
maruel@chromium.orgd5800f12009-11-12 20:03:43 +000020
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +000021def ValidateEmail(email):
maruel@chromium.org6e29d572010-06-04 17:32:20 +000022 return (re.match(r"^[a-zA-Z0-9._%-+]+@[a-zA-Z0-9._%-]+.[a-zA-Z]{2,6}$", email)
23 is not None)
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +000024
maruel@chromium.orgd5800f12009-11-12 20:03:43 +000025
maruel@chromium.orgfd9cbbb2010-01-08 23:04:03 +000026def GetCasedPath(path):
27 """Elcheapos way to get the real path case on Windows."""
28 if sys.platform.startswith('win') and os.path.exists(path):
29 # Reconstruct the path.
30 path = os.path.abspath(path)
31 paths = path.split('\\')
32 for i in range(len(paths)):
33 if i == 0:
34 # Skip drive letter.
35 continue
36 subpath = '\\'.join(paths[:i+1])
37 prev = len('\\'.join(paths[:i]))
38 # glob.glob will return the cased path for the last item only. This is why
39 # we are calling it in a loop. Extract the data we want and put it back
40 # into the list.
41 paths[i] = glob.glob(subpath + '*')[0][prev+1:len(subpath)]
42 path = '\\'.join(paths)
43 return path
44
45
maruel@chromium.org3c55d982010-05-06 14:25:44 +000046def GenFakeDiff(filename):
47 """Generates a fake diff from a file."""
48 file_content = gclient_utils.FileRead(filename, 'rb').splitlines(True)
maruel@chromium.orgc6d170e2010-06-03 00:06:00 +000049 filename = filename.replace(os.sep, '/')
maruel@chromium.org3c55d982010-05-06 14:25:44 +000050 nb_lines = len(file_content)
51 # We need to use / since patch on unix will fail otherwise.
52 data = cStringIO.StringIO()
53 data.write("Index: %s\n" % filename)
54 data.write('=' * 67 + '\n')
55 # Note: Should we use /dev/null instead?
56 data.write("--- %s\n" % filename)
57 data.write("+++ %s\n" % filename)
58 data.write("@@ -0,0 +1,%d @@\n" % nb_lines)
59 # Prepend '+' to every lines.
60 for line in file_content:
61 data.write('+')
62 data.write(line)
63 result = data.getvalue()
64 data.close()
65 return result
66
67
maruel@chromium.org5c8c6de2011-03-18 16:20:18 +000068def determine_scm(root):
69 """Similar to upload.py's version but much simpler.
70
71 Returns 'svn', 'git' or None.
72 """
73 if os.path.isdir(os.path.join(root, '.svn')):
74 return 'svn'
maruel@chromium.orgc98c0c52011-04-06 13:39:43 +000075 elif os.path.isdir(os.path.join(root, '.git')):
maruel@chromium.org5c8c6de2011-03-18 16:20:18 +000076 return 'git'
77 else:
maruel@chromium.orgc98c0c52011-04-06 13:39:43 +000078 try:
maruel@chromium.org91def9b2011-09-14 16:28:07 +000079 subprocess2.check_call(
maruel@chromium.org5c8c6de2011-03-18 16:20:18 +000080 ['git', 'rev-parse', '--show-cdup'],
maruel@chromium.orgc98c0c52011-04-06 13:39:43 +000081 stdout=subprocess2.VOID,
maruel@chromium.org87e6d332011-09-09 19:01:28 +000082 stderr=subprocess2.VOID,
maruel@chromium.orgc98c0c52011-04-06 13:39:43 +000083 cwd=root)
maruel@chromium.org5c8c6de2011-03-18 16:20:18 +000084 return 'git'
maruel@chromium.orgc98c0c52011-04-06 13:39:43 +000085 except (OSError, subprocess2.CalledProcessError):
maruel@chromium.org5c8c6de2011-03-18 16:20:18 +000086 return None
87
88
maruel@chromium.org36ac2392011-10-12 16:36:11 +000089def only_int(val):
90 if val.isdigit():
91 return int(val)
92 else:
93 return 0
94
95
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +000096class GIT(object):
maruel@chromium.org36ac2392011-10-12 16:36:11 +000097 current_version = None
98
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +000099 @staticmethod
maruel@chromium.org80a9ef12011-12-13 20:44:10 +0000100 def Capture(args, cwd, **kwargs):
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000101 return subprocess2.check_output(
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000102 ['git', '--no-pager'] + args,
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000103 cwd=cwd, stderr=subprocess2.PIPE, **kwargs).strip()
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000104
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000105 @staticmethod
maruel@chromium.org80a9ef12011-12-13 20:44:10 +0000106 def CaptureStatus(files, cwd, upstream_branch):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000107 """Returns git status.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000108
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000109 @files can be a string (one file) or a list of files.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000110
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000111 Returns an array of (status, file) tuples."""
msb@chromium.org786fb682010-06-02 15:16:23 +0000112 if upstream_branch is None:
maruel@chromium.org80a9ef12011-12-13 20:44:10 +0000113 upstream_branch = GIT.GetUpstreamBranch(cwd)
msb@chromium.org786fb682010-06-02 15:16:23 +0000114 if upstream_branch is None:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000115 raise gclient_utils.Error('Cannot determine upstream branch')
mcgrathr@chromium.org9249f642013-06-03 21:36:18 +0000116 command = ['diff', '--name-status', '--no-renames',
117 '-r', '%s...' % upstream_branch]
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000118 if not files:
119 pass
120 elif isinstance(files, basestring):
121 command.append(files)
122 else:
123 command.extend(files)
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000124 status = GIT.Capture(command, cwd)
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000125 results = []
126 if status:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000127 for statusline in status.splitlines():
maruel@chromium.orgcc1614b2010-09-20 17:13:17 +0000128 # 3-way merges can cause the status can be 'MMM' instead of 'M'. This
129 # can happen when the user has 2 local branches and he diffs between
130 # these 2 branches instead diffing to upstream.
131 m = re.match('^(\w)+\t(.+)$', statusline)
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000132 if not m:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000133 raise gclient_utils.Error(
134 'status currently unsupported: %s' % statusline)
maruel@chromium.orgcc1614b2010-09-20 17:13:17 +0000135 # Only grab the first letter.
136 results.append(('%s ' % m.group(1)[0], m.group(2)))
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000137 return results
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000138
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000139 @staticmethod
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000140 def GetEmail(cwd):
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000141 """Retrieves the user email address if known."""
142 # We could want to look at the svn cred when it has a svn remote but it
143 # should be fine for now, users should simply configure their git settings.
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000144 try:
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000145 return GIT.Capture(['config', 'user.email'], cwd=cwd)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000146 except subprocess2.CalledProcessError:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000147 return ''
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000148
149 @staticmethod
150 def ShortBranchName(branch):
151 """Converts a name like 'refs/heads/foo' to just 'foo'."""
152 return branch.replace('refs/heads/', '')
153
154 @staticmethod
155 def GetBranchRef(cwd):
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000156 """Returns the full branch reference, e.g. 'refs/heads/master'."""
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000157 return GIT.Capture(['symbolic-ref', 'HEAD'], cwd=cwd)
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000158
159 @staticmethod
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000160 def GetBranch(cwd):
161 """Returns the short branch name, e.g. 'master'."""
maruel@chromium.orgc308a742009-12-22 18:29:33 +0000162 return GIT.ShortBranchName(GIT.GetBranchRef(cwd))
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000163
164 @staticmethod
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000165 def IsGitSvn(cwd):
166 """Returns true if this repo looks like it's using git-svn."""
167 # If you have any "svn-remote.*" config keys, we think you're using svn.
168 try:
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000169 GIT.Capture(['config', '--local', '--get-regexp', r'^svn-remote\.'],
170 cwd=cwd)
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000171 return True
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000172 except subprocess2.CalledProcessError:
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000173 return False
174
175 @staticmethod
bauerb@chromium.org866276c2011-03-18 20:09:31 +0000176 def MatchSvnGlob(url, base_url, glob_spec, allow_wildcards):
177 """Return the corresponding git ref if |base_url| together with |glob_spec|
178 matches the full |url|.
179
180 If |allow_wildcards| is true, |glob_spec| can contain wildcards (see below).
181 """
182 fetch_suburl, as_ref = glob_spec.split(':')
183 if allow_wildcards:
184 glob_match = re.match('(.+/)?(\*|{[^/]*})(/.+)?', fetch_suburl)
185 if glob_match:
186 # Parse specs like "branches/*/src:refs/remotes/svn/*" or
187 # "branches/{472,597,648}/src:refs/remotes/svn/*".
188 branch_re = re.escape(base_url)
189 if glob_match.group(1):
190 branch_re += '/' + re.escape(glob_match.group(1))
191 wildcard = glob_match.group(2)
192 if wildcard == '*':
193 branch_re += '([^/]*)'
194 else:
195 # Escape and replace surrounding braces with parentheses and commas
196 # with pipe symbols.
197 wildcard = re.escape(wildcard)
198 wildcard = re.sub('^\\\\{', '(', wildcard)
199 wildcard = re.sub('\\\\,', '|', wildcard)
200 wildcard = re.sub('\\\\}$', ')', wildcard)
201 branch_re += wildcard
202 if glob_match.group(3):
203 branch_re += re.escape(glob_match.group(3))
204 match = re.match(branch_re, url)
205 if match:
206 return re.sub('\*$', match.group(1), as_ref)
207
208 # Parse specs like "trunk/src:refs/remotes/origin/trunk".
209 if fetch_suburl:
210 full_url = base_url + '/' + fetch_suburl
211 else:
212 full_url = base_url
213 if full_url == url:
214 return as_ref
215 return None
216
217 @staticmethod
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000218 def GetSVNBranch(cwd):
219 """Returns the svn branch name if found."""
220 # Try to figure out which remote branch we're based on.
221 # Strategy:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000222 # 1) iterate through our branch history and find the svn URL.
223 # 2) find the svn-remote that fetches from the URL.
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000224
225 # regexp matching the git-svn line that contains the URL.
226 git_svn_re = re.compile(r'^\s*git-svn-id: (\S+)@', re.MULTILINE)
227
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000228 # We don't want to go through all of history, so read a line from the
229 # pipe at a time.
230 # The -100 is an arbitrary limit so we don't search forever.
231 cmd = ['git', 'log', '-100', '--pretty=medium']
maruel@chromium.orgf94e3f12011-12-13 21:03:46 +0000232 proc = subprocess2.Popen(cmd, cwd=cwd, stdout=subprocess2.PIPE)
maruel@chromium.orge8c28622011-04-05 14:41:44 +0000233 url = None
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000234 for line in proc.stdout:
235 match = git_svn_re.match(line)
236 if match:
237 url = match.group(1)
238 proc.stdout.close() # Cut pipe.
239 break
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000240
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000241 if url:
242 svn_remote_re = re.compile(r'^svn-remote\.([^.]+)\.url (.*)$')
maruel@chromium.org80a9ef12011-12-13 20:44:10 +0000243 remotes = GIT.Capture(
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000244 ['config', '--local', '--get-regexp', r'^svn-remote\..*\.url'],
maruel@chromium.org80a9ef12011-12-13 20:44:10 +0000245 cwd=cwd).splitlines()
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000246 for remote in remotes:
247 match = svn_remote_re.match(remote)
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000248 if match:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000249 remote = match.group(1)
250 base_url = match.group(2)
bauerb@chromium.org866276c2011-03-18 20:09:31 +0000251 try:
252 fetch_spec = GIT.Capture(
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000253 ['config', '--local', 'svn-remote.%s.fetch' % remote],
254 cwd=cwd)
bauerb@chromium.org866276c2011-03-18 20:09:31 +0000255 branch = GIT.MatchSvnGlob(url, base_url, fetch_spec, False)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000256 except subprocess2.CalledProcessError:
bauerb@chromium.org866276c2011-03-18 20:09:31 +0000257 branch = None
258 if branch:
259 return branch
260 try:
261 branch_spec = GIT.Capture(
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000262 ['config', '--local', 'svn-remote.%s.branches' % remote],
263 cwd=cwd)
bauerb@chromium.org866276c2011-03-18 20:09:31 +0000264 branch = GIT.MatchSvnGlob(url, base_url, branch_spec, True)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000265 except subprocess2.CalledProcessError:
bauerb@chromium.org866276c2011-03-18 20:09:31 +0000266 branch = None
267 if branch:
268 return branch
269 try:
270 tag_spec = GIT.Capture(
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000271 ['config', '--local', 'svn-remote.%s.tags' % remote],
272 cwd=cwd)
bauerb@chromium.org866276c2011-03-18 20:09:31 +0000273 branch = GIT.MatchSvnGlob(url, base_url, tag_spec, True)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000274 except subprocess2.CalledProcessError:
bauerb@chromium.org866276c2011-03-18 20:09:31 +0000275 branch = None
276 if branch:
277 return branch
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000278
279 @staticmethod
280 def FetchUpstreamTuple(cwd):
281 """Returns a tuple containg remote and remote ref,
282 e.g. 'origin', 'refs/heads/master'
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000283 Tries to be intelligent and understand git-svn.
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000284 """
285 remote = '.'
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000286 branch = GIT.GetBranch(cwd)
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000287 try:
288 upstream_branch = GIT.Capture(
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000289 ['config', '--local', 'branch.%s.merge' % branch], cwd=cwd)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000290 except subprocess2.CalledProcessError:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000291 upstream_branch = None
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000292 if upstream_branch:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000293 try:
294 remote = GIT.Capture(
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000295 ['config', '--local', 'branch.%s.remote' % branch], cwd=cwd)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000296 except subprocess2.CalledProcessError:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000297 pass
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000298 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000299 try:
300 upstream_branch = GIT.Capture(
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000301 ['config', '--local', 'rietveld.upstream-branch'], cwd=cwd)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000302 except subprocess2.CalledProcessError:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000303 upstream_branch = None
304 if upstream_branch:
305 try:
306 remote = GIT.Capture(
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000307 ['config', '--local', 'rietveld.upstream-remote'], cwd=cwd)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000308 except subprocess2.CalledProcessError:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000309 pass
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000310 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000311 # Fall back on trying a git-svn upstream branch.
312 if GIT.IsGitSvn(cwd):
313 upstream_branch = GIT.GetSVNBranch(cwd)
maruel@chromium.orga630bd72010-04-29 23:32:34 +0000314 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000315 # Else, try to guess the origin remote.
316 remote_branches = GIT.Capture(['branch', '-r'], cwd=cwd).split()
317 if 'origin/master' in remote_branches:
318 # Fall back on origin/master if it exits.
319 remote = 'origin'
320 upstream_branch = 'refs/heads/master'
321 elif 'origin/trunk' in remote_branches:
322 # Fall back on origin/trunk if it exists. Generally a shared
323 # git-svn clone
324 remote = 'origin'
325 upstream_branch = 'refs/heads/trunk'
326 else:
327 # Give up.
328 remote = None
329 upstream_branch = None
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000330 return remote, upstream_branch
331
332 @staticmethod
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000333 def GetUpstreamBranch(cwd):
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000334 """Gets the current branch's upstream branch."""
335 remote, upstream_branch = GIT.FetchUpstreamTuple(cwd)
maruel@chromium.orga630bd72010-04-29 23:32:34 +0000336 if remote != '.' and upstream_branch:
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000337 upstream_branch = upstream_branch.replace('heads', 'remotes/' + remote)
338 return upstream_branch
339
340 @staticmethod
maruel@chromium.org8ede00e2010-01-12 14:35:28 +0000341 def GenerateDiff(cwd, branch=None, branch_head='HEAD', full_move=False,
342 files=None):
maruel@chromium.orga9371762009-12-22 18:27:38 +0000343 """Diffs against the upstream branch or optionally another branch.
344
345 full_move means that move or copy operations should completely recreate the
346 files, usually in the prospect to apply the patch for a try job."""
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000347 if not branch:
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000348 branch = GIT.GetUpstreamBranch(cwd)
scottbyer@chromium.org33167332012-02-23 21:15:30 +0000349 command = ['diff', '-p', '--no-color', '--no-prefix', '--no-ext-diff',
evan@chromium.org400f3e72010-05-19 14:23:36 +0000350 branch + "..." + branch_head]
mcgrathr@chromium.org9249f642013-06-03 21:36:18 +0000351 if full_move:
352 command.append('--no-renames')
353 else:
maruel@chromium.orga9371762009-12-22 18:27:38 +0000354 command.append('-C')
maruel@chromium.org8ede00e2010-01-12 14:35:28 +0000355 # TODO(maruel): --binary support.
356 if files:
357 command.append('--')
358 command.extend(files)
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000359 diff = GIT.Capture(command, cwd=cwd).splitlines(True)
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000360 for i in range(len(diff)):
361 # In the case of added files, replace /dev/null with the path to the
362 # file being added.
363 if diff[i].startswith('--- /dev/null'):
364 diff[i] = '--- %s' % diff[i+1][4:]
365 return ''.join(diff)
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000366
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000367 @staticmethod
maruel@chromium.org8ede00e2010-01-12 14:35:28 +0000368 def GetDifferentFiles(cwd, branch=None, branch_head='HEAD'):
369 """Returns the list of modified files between two branches."""
370 if not branch:
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000371 branch = GIT.GetUpstreamBranch(cwd)
bauerb@chromium.org838f0f22010-04-09 17:02:50 +0000372 command = ['diff', '--name-only', branch + "..." + branch_head]
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000373 return GIT.Capture(command, cwd=cwd).splitlines(False)
maruel@chromium.org8ede00e2010-01-12 14:35:28 +0000374
375 @staticmethod
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000376 def GetPatchName(cwd):
377 """Constructs a name for this patch."""
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000378 short_sha = GIT.Capture(['rev-parse', '--short=4', 'HEAD'], cwd=cwd)
maruel@chromium.org862ff8e2010-08-06 15:29:16 +0000379 return "%s#%s" % (GIT.GetBranch(cwd), short_sha)
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000380
381 @staticmethod
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000382 def GetCheckoutRoot(cwd):
maruel@chromium.org01d8c1d2010-01-07 01:56:59 +0000383 """Returns the top level directory of a git checkout as an absolute path.
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000384 """
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000385 root = GIT.Capture(['rev-parse', '--show-cdup'], cwd=cwd)
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000386 return os.path.abspath(os.path.join(cwd, root))
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000387
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000388 @staticmethod
389 def GetGitSvnHeadRev(cwd):
390 """Gets the most recently pulled git-svn revision."""
391 try:
392 output = GIT.Capture(['svn', 'info'], cwd=cwd)
393 match = re.search(r'^Revision: ([0-9]+)$', output, re.MULTILINE)
394 return int(match.group(1)) if match else None
395 except (subprocess2.CalledProcessError, ValueError):
396 return None
397
398 @staticmethod
wittman@chromium.org492a3682012-08-10 00:28:28 +0000399 def ParseGitSvnSha1(output):
400 """Parses git-svn output for the first sha1."""
401 match = re.search(r'[0-9a-fA-F]{40}', output)
402 return match.group(0) if match else None
403
404 @staticmethod
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000405 def GetSha1ForSvnRev(cwd, rev):
406 """Returns a corresponding git sha1 for a SVN revision."""
407 if not GIT.IsGitSvn(cwd=cwd):
408 return None
409 try:
szager@chromium.orgc51def32012-10-15 18:50:37 +0000410 output = GIT.Capture(['svn', 'find-rev', 'r' + str(rev)], cwd=cwd)
411 return GIT.ParseGitSvnSha1(output)
412 except subprocess2.CalledProcessError:
413 return None
414
415 @staticmethod
416 def GetBlessedSha1ForSvnRev(cwd, rev):
417 """Returns a git commit hash from the master branch history that has
418 accurate .DEPS.git and git submodules. To understand why this is more
419 complicated than a simple call to `git svn find-rev`, refer to:
420
421 http://www.chromium.org/developers/how-tos/git-repo
422 """
423 git_svn_rev = GIT.GetSha1ForSvnRev(cwd, rev)
424 if not git_svn_rev:
425 return None
426 try:
szager@google.com312a6a42012-10-11 21:19:42 +0000427 output = GIT.Capture(
428 ['rev-list', '--ancestry-path', '--reverse',
429 '--grep', 'SVN changes up to revision [0-9]*',
430 '%s..refs/remotes/origin/master' % git_svn_rev], cwd=cwd)
431 if not output:
432 return None
433 sha1 = output.splitlines()[0]
434 if not sha1:
435 return None
436 output = GIT.Capture(['rev-list', '-n', '1', '%s^1' % sha1], cwd=cwd)
437 if git_svn_rev != output.rstrip():
438 raise gclient_utils.Error(sha1)
439 return sha1
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000440 except subprocess2.CalledProcessError:
441 return None
442
443 @staticmethod
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000444 def IsValidRevision(cwd, rev, sha_only=False):
445 """Verifies the revision is a proper git revision.
446
447 sha_only: Fail unless rev is a sha hash.
448 """
maruel@chromium.org81473862012-06-27 17:30:56 +0000449 # 'git rev-parse foo' where foo is *any* 40 character hex string will return
450 # the string and return code 0. So strip one character to force 'git
451 # rev-parse' to do a hash table look-up and returns 128 if the hash is not
452 # present.
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000453 lookup_rev = rev
maruel@chromium.org81473862012-06-27 17:30:56 +0000454 if re.match(r'^[0-9a-fA-F]{40}$', rev):
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000455 lookup_rev = rev[:-1]
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000456 try:
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000457 sha = GIT.Capture(['rev-parse', lookup_rev], cwd=cwd)
458 if lookup_rev != rev:
459 # Make sure we get the original 40 chars back.
460 return rev == sha
461 if sha_only:
462 return sha.startswith(rev)
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000463 return True
464 except subprocess2.CalledProcessError:
465 return False
466
maruel@chromium.org36ac2392011-10-12 16:36:11 +0000467 @classmethod
468 def AssertVersion(cls, min_version):
maruel@chromium.orgd0f854a2010-03-11 19:35:53 +0000469 """Asserts git's version is at least min_version."""
maruel@chromium.org36ac2392011-10-12 16:36:11 +0000470 if cls.current_version is None:
bashi@chromium.orgfcffd482012-02-24 01:47:00 +0000471 current_version = cls.Capture(['--version'], '.')
472 matched = re.search(r'version ([0-9\.]+)', current_version)
473 cls.current_version = matched.group(1)
maruel@chromium.org36ac2392011-10-12 16:36:11 +0000474 current_version_list = map(only_int, cls.current_version.split('.'))
maruel@chromium.orgd0f854a2010-03-11 19:35:53 +0000475 for min_ver in map(int, min_version.split('.')):
476 ver = current_version_list.pop(0)
477 if ver < min_ver:
maruel@chromium.org36ac2392011-10-12 16:36:11 +0000478 return (False, cls.current_version)
maruel@chromium.orgd0f854a2010-03-11 19:35:53 +0000479 elif ver > min_ver:
maruel@chromium.org36ac2392011-10-12 16:36:11 +0000480 return (True, cls.current_version)
481 return (True, cls.current_version)
maruel@chromium.orgd0f854a2010-03-11 19:35:53 +0000482
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000483
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000484class SVN(object):
tony@chromium.org57564662010-04-14 02:35:12 +0000485 current_version = None
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000486
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000487 @staticmethod
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000488 def Capture(args, cwd, **kwargs):
maruel@chromium.org54019f32010-09-09 13:50:11 +0000489 """Always redirect stderr.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000490
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000491 Throws an exception if non-0 is returned.
492 """
maruel@chromium.org904af082011-09-08 22:06:09 +0000493 return subprocess2.check_output(
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000494 ['svn'] + args, stderr=subprocess2.PIPE, cwd=cwd, **kwargs)
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000495
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000496 @staticmethod
maruel@chromium.org2b9aa8e2010-08-25 20:01:42 +0000497 def RunAndGetFileList(verbose, args, cwd, file_list, stdout=None):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000498 """Runs svn checkout, update, or status, output to stdout.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000499
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000500 The first item in args must be either "checkout", "update", or "status".
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000501
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000502 svn's stdout is parsed to collect a list of files checked out or updated.
503 These files are appended to file_list. svn's stdout is also printed to
504 sys.stdout as in Run.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000505
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000506 Args:
maruel@chromium.org03807072010-08-16 17:18:44 +0000507 verbose: If True, uses verbose output
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000508 args: A sequence of command line parameters to be passed to svn.
maruel@chromium.org2b9aa8e2010-08-25 20:01:42 +0000509 cwd: The directory where svn is to be run.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000510
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000511 Raises:
512 Error: An error occurred while running the svn command.
513 """
maruel@chromium.org2b9aa8e2010-08-25 20:01:42 +0000514 stdout = stdout or sys.stdout
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000515
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000516 # svn update and svn checkout use the same pattern: the first three columns
517 # are for file status, property status, and lock status. This is followed
518 # by two spaces, and then the path to the file.
519 update_pattern = '^... (.*)$'
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000520
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000521 # The first three columns of svn status are the same as for svn update and
522 # svn checkout. The next three columns indicate addition-with-history,
523 # switch, and remote lock status. This is followed by one space, and then
524 # the path to the file.
525 status_pattern = '^...... (.*)$'
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000526
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000527 # args[0] must be a supported command. This will blow up if it's something
528 # else, which is good. Note that the patterns are only effective when
529 # these commands are used in their ordinary forms, the patterns are invalid
530 # for "svn status --show-updates", for example.
531 pattern = {
532 'checkout': update_pattern,
533 'status': status_pattern,
534 'update': update_pattern,
535 }[args[0]]
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000536 compiled_pattern = re.compile(pattern)
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000537 # Place an upper limit.
cbentzel@chromium.org2aee2292010-09-03 14:15:25 +0000538 backoff_time = 5
maruel@chromium.orgbec588d2010-10-26 13:50:25 +0000539 retries = 0
maruel@chromium.org03507062010-10-26 00:58:27 +0000540 while True:
maruel@chromium.orgbec588d2010-10-26 13:50:25 +0000541 retries += 1
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000542 previous_list_len = len(file_list)
543 failure = []
maruel@chromium.org54d1f1a2010-01-08 19:53:47 +0000544
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000545 def CaptureMatchingLines(line):
546 match = compiled_pattern.search(line)
547 if match:
548 file_list.append(match.group(1))
549 if line.startswith('svn: '):
maruel@chromium.org8599aa72010-02-08 20:27:14 +0000550 failure.append(line)
maruel@chromium.org54d1f1a2010-01-08 19:53:47 +0000551
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000552 try:
maruel@chromium.org17d01792010-09-01 18:07:10 +0000553 gclient_utils.CheckCallAndFilterAndHeader(
554 ['svn'] + args,
555 cwd=cwd,
556 always=verbose,
557 filter_fn=CaptureMatchingLines,
558 stdout=stdout)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000559 except subprocess2.CalledProcessError:
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000560 def IsKnownFailure():
561 for x in failure:
562 if (x.startswith('svn: OPTIONS of') or
563 x.startswith('svn: PROPFIND of') or
564 x.startswith('svn: REPORT of') or
maruel@chromium.orgf61fc932010-08-19 13:05:24 +0000565 x.startswith('svn: Unknown hostname') or
maruel@chromium.org7d8b97d2011-10-11 23:32:30 +0000566 x.startswith('svn: Server sent unexpected return value') or
567 x.startswith('svn: Can\'t connect to host')):
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000568 return True
569 return False
570
maruel@chromium.org953586a2010-06-15 14:22:24 +0000571 # Subversion client is really misbehaving with Google Code.
572 if args[0] == 'checkout':
573 # Ensure at least one file was checked out, otherwise *delete* the
574 # directory.
575 if len(file_list) == previous_list_len:
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000576 if not IsKnownFailure():
maruel@chromium.org953586a2010-06-15 14:22:24 +0000577 # No known svn error was found, bail out.
578 raise
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000579 # No file were checked out, so make sure the directory is
580 # deleted in case it's messed up and try again.
581 # Warning: It's bad, it assumes args[2] is the directory
582 # argument.
583 if os.path.isdir(args[2]):
digit@chromium.orgdc112ac2013-04-24 13:00:19 +0000584 gclient_utils.rmtree(args[2])
maruel@chromium.org953586a2010-06-15 14:22:24 +0000585 else:
586 # Progress was made, convert to update since an aborted checkout
587 # is now an update.
maruel@chromium.org2de10252010-02-08 01:10:39 +0000588 args = ['update'] + args[1:]
maruel@chromium.org953586a2010-06-15 14:22:24 +0000589 else:
590 # It was an update or export.
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000591 # We enforce that some progress has been made or a known failure.
592 if len(file_list) == previous_list_len and not IsKnownFailure():
593 # No known svn error was found and no progress, bail out.
594 raise
maruel@chromium.orgbec588d2010-10-26 13:50:25 +0000595 if retries == 10:
maruel@chromium.org03507062010-10-26 00:58:27 +0000596 raise
cbentzel@chromium.org2aee2292010-09-03 14:15:25 +0000597 print "Sleeping %.1f seconds and retrying...." % backoff_time
598 time.sleep(backoff_time)
599 backoff_time *= 1.3
maruel@chromium.org953586a2010-06-15 14:22:24 +0000600 continue
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000601 break
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000602
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000603 @staticmethod
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000604 def CaptureRemoteInfo(url):
605 """Returns a dictionary from the svn info output for the given url.
606
607 Throws an exception if svn info fails.
608 """
609 assert isinstance(url, str)
610 return SVN._CaptureInfo([url], None)
611
612 @staticmethod
613 def CaptureLocalInfo(files, cwd):
614 """Returns a dictionary from the svn info output for the given files.
615
616 Throws an exception if svn info fails.
617 """
618 assert isinstance(files, (list, tuple))
619 return SVN._CaptureInfo(files, cwd)
620
621 @staticmethod
622 def _CaptureInfo(files, cwd):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000623 """Returns a dictionary from the svn info output for the given file.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000624
maruel@chromium.org54019f32010-09-09 13:50:11 +0000625 Throws an exception if svn info fails."""
maruel@chromium.orgd25fb8f2011-04-07 13:40:15 +0000626 result = {}
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000627 info = ElementTree.XML(SVN.Capture(['info', '--xml'] + files, cwd))
maruel@chromium.orgade9c592011-04-07 15:59:11 +0000628 if info is None:
629 return result
630 entry = info.find('entry')
maruel@chromium.org6f323bb2011-04-26 15:42:53 +0000631 if entry is None:
632 return result
maruel@chromium.orgade9c592011-04-07 15:59:11 +0000633
634 # Use .text when the item is not optional.
635 result['Path'] = entry.attrib['path']
maruel@chromium.org7d654672012-01-05 19:07:23 +0000636 rev = entry.attrib['revision']
637 try:
638 result['Revision'] = int(rev)
639 except ValueError:
640 result['Revision'] = None
maruel@chromium.orgade9c592011-04-07 15:59:11 +0000641 result['Node Kind'] = entry.attrib['kind']
642 # Differs across versions.
643 if result['Node Kind'] == 'dir':
644 result['Node Kind'] = 'directory'
645 result['URL'] = entry.find('url').text
646 repository = entry.find('repository')
647 result['Repository Root'] = repository.find('root').text
648 result['UUID'] = repository.find('uuid')
649 wc_info = entry.find('wc-info')
650 if wc_info is not None:
651 result['Schedule'] = wc_info.find('schedule').text
652 result['Copied From URL'] = wc_info.find('copy-from-url')
653 result['Copied From Rev'] = wc_info.find('copy-from-rev')
654 else:
655 result['Schedule'] = None
656 result['Copied From URL'] = None
657 result['Copied From Rev'] = None
658 for key in result.keys():
659 if isinstance(result[key], unicode):
660 # Unicode results interferes with the higher layers matching up things
661 # in the deps dictionary.
662 result[key] = result[key].encode()
663 # Automatic conversion of optional parameters.
664 result[key] = getattr(result[key], 'text', result[key])
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000665 return result
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000666
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000667 @staticmethod
maruel@chromium.org54019f32010-09-09 13:50:11 +0000668 def CaptureRevision(cwd):
nasser@codeaurora.org5d63eb82010-03-24 23:22:09 +0000669 """Get the base revision of a SVN repository.
670
671 Returns:
672 Int base revision
673 """
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000674 return SVN.CaptureLocalInfo([], cwd).get('Revision')
nasser@codeaurora.org5d63eb82010-03-24 23:22:09 +0000675
676 @staticmethod
maruel@chromium.orgea15cb72012-05-04 14:16:31 +0000677 def CaptureStatus(files, cwd, no_ignore=False):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000678 """Returns the svn 1.5 svn status emulated output.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000679
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000680 @files can be a string (one file) or a list of files.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000681
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000682 Returns an array of (status, file) tuples."""
683 command = ["status", "--xml"]
maruel@chromium.orgea15cb72012-05-04 14:16:31 +0000684 if no_ignore:
685 command.append('--no-ignore')
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000686 if not files:
687 pass
688 elif isinstance(files, basestring):
689 command.append(files)
690 else:
691 command.extend(files)
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000692
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000693 status_letter = {
694 None: ' ',
695 '': ' ',
696 'added': 'A',
697 'conflicted': 'C',
698 'deleted': 'D',
699 'external': 'X',
700 'ignored': 'I',
701 'incomplete': '!',
702 'merged': 'G',
703 'missing': '!',
704 'modified': 'M',
705 'none': ' ',
706 'normal': ' ',
707 'obstructed': '~',
708 'replaced': 'R',
709 'unversioned': '?',
710 }
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000711 dom = ElementTree.XML(SVN.Capture(command, cwd))
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000712 results = []
maruel@chromium.orgade9c592011-04-07 15:59:11 +0000713 if dom is None:
714 return results
715 # /status/target/entry/(wc-status|commit|author|date)
716 for target in dom.findall('target'):
717 for entry in target.findall('entry'):
718 file_path = entry.attrib['path']
719 wc_status = entry.find('wc-status')
720 # Emulate svn 1.5 status ouput...
721 statuses = [' '] * 7
722 # Col 0
723 xml_item_status = wc_status.attrib['item']
724 if xml_item_status in status_letter:
725 statuses[0] = status_letter[xml_item_status]
726 else:
727 raise gclient_utils.Error(
728 'Unknown item status "%s"; please implement me!' %
729 xml_item_status)
730 # Col 1
731 xml_props_status = wc_status.attrib['props']
732 if xml_props_status == 'modified':
733 statuses[1] = 'M'
734 elif xml_props_status == 'conflicted':
735 statuses[1] = 'C'
736 elif (not xml_props_status or xml_props_status == 'none' or
737 xml_props_status == 'normal'):
738 pass
739 else:
740 raise gclient_utils.Error(
741 'Unknown props status "%s"; please implement me!' %
742 xml_props_status)
743 # Col 2
744 if wc_status.attrib.get('wc-locked') == 'true':
745 statuses[2] = 'L'
746 # Col 3
747 if wc_status.attrib.get('copied') == 'true':
748 statuses[3] = '+'
749 # Col 4
750 if wc_status.attrib.get('switched') == 'true':
751 statuses[4] = 'S'
752 # TODO(maruel): Col 5 and 6
753 item = (''.join(statuses), file_path)
754 results.append(item)
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000755 return results
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000756
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000757 @staticmethod
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000758 def IsMoved(filename, cwd):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000759 """Determine if a file has been added through svn mv"""
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000760 assert isinstance(filename, basestring)
761 return SVN.IsMovedInfo(SVN.CaptureLocalInfo([filename], cwd))
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000762
763 @staticmethod
764 def IsMovedInfo(info):
765 """Determine if a file has been added through svn mv"""
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000766 return (info.get('Copied From URL') and
767 info.get('Copied From Rev') and
768 info.get('Schedule') == 'add')
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000769
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000770 @staticmethod
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000771 def GetFileProperty(filename, property_name, cwd):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000772 """Returns the value of an SVN property for the given file.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000773
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000774 Args:
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000775 filename: The file to check
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000776 property_name: The name of the SVN property, e.g. "svn:mime-type"
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000777
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000778 Returns:
779 The value of the property, which will be the empty string if the property
780 is not set on the file. If the file is not under version control, the
781 empty string is also returned.
782 """
maruel@chromium.org54019f32010-09-09 13:50:11 +0000783 try:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000784 return SVN.Capture(['propget', property_name, filename], cwd)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000785 except subprocess2.CalledProcessError:
maruel@chromium.org54019f32010-09-09 13:50:11 +0000786 return ''
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000787
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000788 @staticmethod
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000789 def GenerateDiff(filenames, cwd, full_move, revision):
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000790 """Returns a string containing the diff for the given file list.
791
792 The files in the list should either be absolute paths or relative to the
793 given root. If no root directory is provided, the repository root will be
794 used.
795 The diff will always use relative paths.
796 """
maruel@chromium.org00fdcb32011-02-24 01:41:02 +0000797 assert isinstance(filenames, (list, tuple))
pkasting@chromium.org0db557c2013-04-24 23:44:23 +0000798 # If the user specified a custom diff command in their svn config file,
799 # then it'll be used when we do svn diff, which we don't want to happen
800 # since we want the unified diff.
801 if SVN.AssertVersion("1.7")[0]:
802 # On svn >= 1.7, the "--internal-diff" flag will solve this.
803 return SVN._GenerateDiffInternal(filenames, cwd, full_move, revision,
804 ["diff", "--internal-diff"],
805 ["diff", "--internal-diff"])
806 else:
807 # On svn < 1.7, the "--internal-diff" flag doesn't exist. Using
808 # --diff-cmd=diff doesn't always work, since e.g. Windows cmd users may
809 # not have a "diff" executable in their path at all. So we use an empty
810 # temporary directory as the config directory, which bypasses any user
811 # settings for the diff-cmd. However, we don't pass this for the
812 # remote_safe_diff_command parameter, since when a new config-dir is
813 # specified for an svn diff against a remote URL, it triggers
814 # authentication prompts. In this case there isn't really a good
815 # alternative to svn 1.7's --internal-diff flag.
816 bogus_dir = tempfile.mkdtemp()
817 try:
818 return SVN._GenerateDiffInternal(filenames, cwd, full_move, revision,
819 ["diff", "--config-dir", bogus_dir],
820 ["diff"])
821 finally:
822 gclient_utils.rmtree(bogus_dir)
823
824 @staticmethod
825 def _GenerateDiffInternal(filenames, cwd, full_move, revision, diff_command,
826 remote_safe_diff_command):
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000827 root = os.path.normcase(os.path.join(cwd, ''))
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000828 def RelativePath(path, root):
829 """We must use relative paths."""
maruel@chromium.orgfd9cbbb2010-01-08 23:04:03 +0000830 if os.path.normcase(path).startswith(root):
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000831 return path[len(root):]
832 return path
pkasting@chromium.org0db557c2013-04-24 23:44:23 +0000833 # Cleanup filenames
834 filenames = [RelativePath(f, root) for f in filenames]
835 # Get information about the modified items (files and directories)
836 data = dict((f, SVN.CaptureLocalInfo([f], root)) for f in filenames)
837 diffs = []
838 if full_move:
839 # Eliminate modified files inside moved/copied directory.
840 for (filename, info) in data.iteritems():
841 if SVN.IsMovedInfo(info) and info.get("Node Kind") == "directory":
842 # Remove files inside the directory.
843 filenames = [f for f in filenames
844 if not f.startswith(filename + os.path.sep)]
845 for filename in data.keys():
846 if not filename in filenames:
847 # Remove filtered out items.
848 del data[filename]
849 else:
850 metaheaders = []
851 for (filename, info) in data.iteritems():
852 if SVN.IsMovedInfo(info):
853 # for now, the most common case is a head copy,
854 # so let's just encode that as a straight up cp.
855 srcurl = info.get('Copied From URL')
856 file_root = info.get('Repository Root')
857 rev = int(info.get('Copied From Rev'))
858 assert srcurl.startswith(file_root)
859 src = srcurl[len(file_root)+1:]
860 try:
861 srcinfo = SVN.CaptureRemoteInfo(srcurl)
862 except subprocess2.CalledProcessError, e:
863 if not 'Not a valid URL' in e.stderr:
864 raise
865 # Assume the file was deleted. No idea how to figure out at which
866 # revision the file was deleted.
867 srcinfo = {'Revision': rev}
868 if (srcinfo.get('Revision') != rev and
869 SVN.Capture(remote_safe_diff_command + ['-r', '%d:head' % rev,
870 srcurl], cwd)):
871 metaheaders.append("#$ svn cp -r %d %s %s "
872 "### WARNING: note non-trunk copy\n" %
873 (rev, src, filename))
874 else:
875 metaheaders.append("#$ cp %s %s\n" % (src,
876 filename))
877 if metaheaders:
878 diffs.append("### BEGIN SVN COPY METADATA\n")
879 diffs.extend(metaheaders)
880 diffs.append("### END SVN COPY METADATA\n")
881 # Now ready to do the actual diff.
882 for filename in sorted(data):
883 diffs.append(SVN._DiffItemInternal(
884 filename, cwd, data[filename], diff_command, full_move, revision))
885 # Use StringIO since it can be messy when diffing a directory move with
886 # full_move=True.
887 buf = cStringIO.StringIO()
888 for d in filter(None, diffs):
889 buf.write(d)
890 result = buf.getvalue()
891 buf.close()
892 return result
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000893
894 @staticmethod
pkasting@chromium.org0db557c2013-04-24 23:44:23 +0000895 def _DiffItemInternal(filename, cwd, info, diff_command, full_move, revision):
pkasting@chromium.org917ea7f2013-04-19 20:10:03 +0000896 """Grabs the diff data."""
pkasting@chromium.org0db557c2013-04-24 23:44:23 +0000897 command = diff_command + [filename]
pkasting@chromium.org917ea7f2013-04-19 20:10:03 +0000898 if revision:
899 command.extend(['--revision', revision])
900 data = None
901 if SVN.IsMovedInfo(info):
902 if full_move:
903 if info.get("Node Kind") == "directory":
904 # Things become tricky here. It's a directory copy/move. We need to
905 # diff all the files inside it.
906 # This will put a lot of pressure on the heap. This is why StringIO
907 # is used and converted back into a string at the end. The reason to
908 # return a string instead of a StringIO is that StringIO.write()
909 # doesn't accept a StringIO object. *sigh*.
910 for (dirpath, dirnames, filenames) in os.walk(filename):
911 # Cleanup all files starting with a '.'.
912 for d in dirnames:
913 if d.startswith('.'):
914 dirnames.remove(d)
915 for f in filenames:
916 if f.startswith('.'):
917 filenames.remove(f)
918 for f in filenames:
919 if data is None:
920 data = cStringIO.StringIO()
921 data.write(GenFakeDiff(os.path.join(dirpath, f)))
922 if data:
923 tmp = data.getvalue()
924 data.close()
925 data = tmp
926 else:
927 data = GenFakeDiff(filename)
928 else:
929 if info.get("Node Kind") != "directory":
930 # svn diff on a mv/cp'd file outputs nothing if there was no change.
931 data = SVN.Capture(command, cwd)
932 if not data:
933 # We put in an empty Index entry so upload.py knows about them.
934 data = "Index: %s\n" % filename.replace(os.sep, '/')
935 # Otherwise silently ignore directories.
936 else:
937 if info.get("Node Kind") != "directory":
938 # Normal simple case.
939 try:
940 data = SVN.Capture(command, cwd)
941 except subprocess2.CalledProcessError:
942 if revision:
943 data = GenFakeDiff(filename)
944 else:
945 raise
946 # Otherwise silently ignore directories.
947 return data
948
949 @staticmethod
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000950 def GetEmail(cwd):
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000951 """Retrieves the svn account which we assume is an email address."""
maruel@chromium.org54019f32010-09-09 13:50:11 +0000952 try:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000953 infos = SVN.CaptureLocalInfo([], cwd)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000954 except subprocess2.CalledProcessError:
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000955 return None
956
957 # Should check for uuid but it is incorrectly saved for https creds.
maruel@chromium.org54019f32010-09-09 13:50:11 +0000958 root = infos['Repository Root']
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000959 realm = root.rsplit('/', 1)[0]
maruel@chromium.org54019f32010-09-09 13:50:11 +0000960 uuid = infos['UUID']
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000961 if root.startswith('https') or not uuid:
962 regexp = re.compile(r'<%s:\d+>.*' % realm)
963 else:
964 regexp = re.compile(r'<%s:\d+> %s' % (realm, uuid))
965 if regexp is None:
966 return None
967 if sys.platform.startswith('win'):
968 if not 'APPDATA' in os.environ:
969 return None
maruel@chromium.org720d9f32009-11-21 17:38:57 +0000970 auth_dir = os.path.join(os.environ['APPDATA'], 'Subversion', 'auth',
971 'svn.simple')
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000972 else:
973 if not 'HOME' in os.environ:
974 return None
975 auth_dir = os.path.join(os.environ['HOME'], '.subversion', 'auth',
976 'svn.simple')
977 for credfile in os.listdir(auth_dir):
978 cred_info = SVN.ReadSimpleAuth(os.path.join(auth_dir, credfile))
979 if regexp.match(cred_info.get('svn:realmstring')):
980 return cred_info.get('username')
981
982 @staticmethod
983 def ReadSimpleAuth(filename):
984 f = open(filename, 'r')
985 values = {}
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000986 def ReadOneItem(item_type):
987 m = re.match(r'%s (\d+)' % item_type, f.readline())
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000988 if not m:
989 return None
990 data = f.read(int(m.group(1)))
991 if f.read(1) != '\n':
992 return None
993 return data
994
995 while True:
996 key = ReadOneItem('K')
997 if not key:
998 break
999 value = ReadOneItem('V')
1000 if not value:
1001 break
1002 values[key] = value
1003 return values
maruel@chromium.org94b1ee92009-12-19 20:27:20 +00001004
1005 @staticmethod
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001006 def GetCheckoutRoot(cwd):
maruel@chromium.org94b1ee92009-12-19 20:27:20 +00001007 """Returns the top level directory of the current repository.
1008
1009 The directory is returned as an absolute path.
1010 """
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001011 cwd = os.path.abspath(cwd)
maruel@chromium.org54019f32010-09-09 13:50:11 +00001012 try:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001013 info = SVN.CaptureLocalInfo([], cwd)
maruel@chromium.org885d6e82011-02-24 20:21:46 +00001014 cur_dir_repo_root = info['Repository Root']
1015 url = info['URL']
maruel@chromium.orgda64d632011-09-08 17:41:15 +00001016 except subprocess2.CalledProcessError:
maruel@chromium.org94b1ee92009-12-19 20:27:20 +00001017 return None
maruel@chromium.org94b1ee92009-12-19 20:27:20 +00001018 while True:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001019 parent = os.path.dirname(cwd)
maruel@chromium.org54019f32010-09-09 13:50:11 +00001020 try:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001021 info = SVN.CaptureLocalInfo([], parent)
maruel@chromium.org885d6e82011-02-24 20:21:46 +00001022 if (info['Repository Root'] != cur_dir_repo_root or
1023 info['URL'] != os.path.dirname(url)):
maruel@chromium.org54019f32010-09-09 13:50:11 +00001024 break
maruel@chromium.org885d6e82011-02-24 20:21:46 +00001025 url = info['URL']
maruel@chromium.orgda64d632011-09-08 17:41:15 +00001026 except subprocess2.CalledProcessError:
maruel@chromium.org94b1ee92009-12-19 20:27:20 +00001027 break
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001028 cwd = parent
1029 return GetCasedPath(cwd)
tony@chromium.org57564662010-04-14 02:35:12 +00001030
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +00001031 @staticmethod
1032 def IsValidRevision(url):
1033 """Verifies the revision looks like an SVN revision."""
1034 try:
1035 SVN.Capture(['info', url], cwd=None)
1036 return True
1037 except subprocess2.CalledProcessError:
1038 return False
1039
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001040 @classmethod
1041 def AssertVersion(cls, min_version):
tony@chromium.org57564662010-04-14 02:35:12 +00001042 """Asserts svn's version is at least min_version."""
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001043 if cls.current_version is None:
shouqun.liu@intel.com13b522c2012-07-20 17:16:51 +00001044 cls.current_version = cls.Capture(['--version', '--quiet'], None)
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001045 current_version_list = map(only_int, cls.current_version.split('.'))
tony@chromium.org57564662010-04-14 02:35:12 +00001046 for min_ver in map(int, min_version.split('.')):
1047 ver = current_version_list.pop(0)
1048 if ver < min_ver:
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001049 return (False, cls.current_version)
tony@chromium.org57564662010-04-14 02:35:12 +00001050 elif ver > min_ver:
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001051 return (True, cls.current_version)
1052 return (True, cls.current_version)
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001053
1054 @staticmethod
maruel@chromium.orgea15cb72012-05-04 14:16:31 +00001055 def Revert(cwd, callback=None, ignore_externals=False, no_ignore=False):
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001056 """Reverts all svn modifications in cwd, including properties.
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001057
1058 Deletes any modified files or directory.
1059
1060 A "svn update --revision BASE" call is required after to revive deleted
1061 files.
1062 """
maruel@chromium.orgea15cb72012-05-04 14:16:31 +00001063 for file_status in SVN.CaptureStatus(None, cwd, no_ignore=no_ignore):
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001064 file_path = os.path.join(cwd, file_status[1])
maruel@chromium.org8c415122011-03-15 17:14:27 +00001065 if (ignore_externals and
1066 file_status[0][0] == 'X' and
1067 file_status[0][1:].isspace()):
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001068 # Ignore externals.
1069 logging.info('Ignoring external %s' % file_status[1])
1070 continue
1071
maruel@chromium.org62087572012-04-24 23:16:28 +00001072 # This is the case where '! L .' is returned by 'svn status'. Just
1073 # strip off the '/.'.
1074 if file_path.endswith(os.path.sep + '.'):
1075 file_path = file_path[:-2]
1076
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001077 if callback:
1078 callback(file_status)
1079
maruel@chromium.org8c415122011-03-15 17:14:27 +00001080 if os.path.exists(file_path):
1081 # svn revert is really stupid. It fails on inconsistent line-endings,
1082 # on switched directories, etc. So take no chance and delete everything!
1083 # In theory, it wouldn't be necessary for property-only change but then
1084 # it'd have to look for switched directories, etc so it's not worth
1085 # optimizing this use case.
1086 if os.path.isfile(file_path) or os.path.islink(file_path):
1087 logging.info('os.remove(%s)' % file_path)
1088 os.remove(file_path)
1089 elif os.path.isdir(file_path):
digit@chromium.orgdc112ac2013-04-24 13:00:19 +00001090 logging.info('rmtree(%s)' % file_path)
1091 gclient_utils.rmtree(file_path)
maruel@chromium.org8c415122011-03-15 17:14:27 +00001092 else:
1093 logging.critical(
1094 ('No idea what is %s.\nYou just found a bug in gclient'
1095 ', please ping maruel@chromium.org ASAP!') % file_path)
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001096
maruel@chromium.org8c415122011-03-15 17:14:27 +00001097 if (file_status[0][0] in ('D', 'A', '!') or
1098 not file_status[0][1:].isspace()):
maruel@chromium.orgaf453492011-03-03 21:04:09 +00001099 # Added, deleted file requires manual intervention and require calling
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001100 # revert, like for properties.
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001101 if not os.path.isdir(cwd):
maruel@chromium.org8b322b32011-11-01 19:05:50 +00001102 # '.' was deleted. It's not worth continuing.
1103 return
maruel@chromium.orgaf453492011-03-03 21:04:09 +00001104 try:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001105 SVN.Capture(['revert', file_status[1]], cwd=cwd)
maruel@chromium.orgda64d632011-09-08 17:41:15 +00001106 except subprocess2.CalledProcessError:
maruel@chromium.orgaf453492011-03-03 21:04:09 +00001107 if not os.path.exists(file_path):
1108 continue
1109 raise