blob: 1d1b98f31a7c7904d2b2338b82cea99f284fbd71 [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
ilevy@chromium.org4380c802013-07-12 23:38:41 +0000100 def Capture(args, cwd, strip_out=True, **kwargs):
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000101 env = os.environ.copy()
102 # 'cat' is a magical git string that disables pagers on all platforms.
103 env['GIT_PAGER'] = 'cat'
ilevy@chromium.org4380c802013-07-12 23:38:41 +0000104 output = subprocess2.check_output(
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000105 ['git'] + args,
ilevy@chromium.org4380c802013-07-12 23:38:41 +0000106 cwd=cwd, stderr=subprocess2.PIPE, env=env, **kwargs)
107 return output.strip() if strip_out else output
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000108
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000109 @staticmethod
maruel@chromium.org80a9ef12011-12-13 20:44:10 +0000110 def CaptureStatus(files, cwd, upstream_branch):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000111 """Returns git status.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000112
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000113 @files can be a string (one file) or a list of files.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000114
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000115 Returns an array of (status, file) tuples."""
msb@chromium.org786fb682010-06-02 15:16:23 +0000116 if upstream_branch is None:
maruel@chromium.org80a9ef12011-12-13 20:44:10 +0000117 upstream_branch = GIT.GetUpstreamBranch(cwd)
msb@chromium.org786fb682010-06-02 15:16:23 +0000118 if upstream_branch is None:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000119 raise gclient_utils.Error('Cannot determine upstream branch')
mcgrathr@chromium.org9249f642013-06-03 21:36:18 +0000120 command = ['diff', '--name-status', '--no-renames',
121 '-r', '%s...' % upstream_branch]
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000122 if not files:
123 pass
124 elif isinstance(files, basestring):
125 command.append(files)
126 else:
127 command.extend(files)
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000128 status = GIT.Capture(command, cwd)
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000129 results = []
130 if status:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000131 for statusline in status.splitlines():
maruel@chromium.orgcc1614b2010-09-20 17:13:17 +0000132 # 3-way merges can cause the status can be 'MMM' instead of 'M'. This
133 # can happen when the user has 2 local branches and he diffs between
134 # these 2 branches instead diffing to upstream.
135 m = re.match('^(\w)+\t(.+)$', statusline)
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000136 if not m:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000137 raise gclient_utils.Error(
138 'status currently unsupported: %s' % statusline)
maruel@chromium.orgcc1614b2010-09-20 17:13:17 +0000139 # Only grab the first letter.
140 results.append(('%s ' % m.group(1)[0], m.group(2)))
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000141 return results
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000142
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000143 @staticmethod
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000144 def GetEmail(cwd):
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000145 """Retrieves the user email address if known."""
146 # We could want to look at the svn cred when it has a svn remote but it
147 # should be fine for now, users should simply configure their git settings.
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000148 try:
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000149 return GIT.Capture(['config', 'user.email'], cwd=cwd)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000150 except subprocess2.CalledProcessError:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000151 return ''
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000152
153 @staticmethod
154 def ShortBranchName(branch):
155 """Converts a name like 'refs/heads/foo' to just 'foo'."""
156 return branch.replace('refs/heads/', '')
157
158 @staticmethod
159 def GetBranchRef(cwd):
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000160 """Returns the full branch reference, e.g. 'refs/heads/master'."""
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000161 return GIT.Capture(['symbolic-ref', 'HEAD'], cwd=cwd)
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000162
163 @staticmethod
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000164 def GetBranch(cwd):
165 """Returns the short branch name, e.g. 'master'."""
maruel@chromium.orgc308a742009-12-22 18:29:33 +0000166 return GIT.ShortBranchName(GIT.GetBranchRef(cwd))
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000167
168 @staticmethod
borenet@google.com6ff54482014-02-26 23:09:33 +0000169 def IsGitSvn(checkout_root):
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000170 """Returns true if this repo looks like it's using git-svn."""
borenet@google.com6ff54482014-02-26 23:09:33 +0000171 # A git-svn checkout has a .git directory.
172 if not os.path.exists(os.path.join(checkout_root, '.git')):
173 return False
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000174 # If you have any "svn-remote.*" config keys, we think you're using svn.
175 try:
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000176 GIT.Capture(['config', '--local', '--get-regexp', r'^svn-remote\.'],
borenet@google.com6ff54482014-02-26 23:09:33 +0000177 cwd=checkout_root)
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000178 return True
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000179 except subprocess2.CalledProcessError:
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000180 return False
181
182 @staticmethod
bauerb@chromium.org866276c2011-03-18 20:09:31 +0000183 def MatchSvnGlob(url, base_url, glob_spec, allow_wildcards):
184 """Return the corresponding git ref if |base_url| together with |glob_spec|
185 matches the full |url|.
186
187 If |allow_wildcards| is true, |glob_spec| can contain wildcards (see below).
188 """
189 fetch_suburl, as_ref = glob_spec.split(':')
190 if allow_wildcards:
191 glob_match = re.match('(.+/)?(\*|{[^/]*})(/.+)?', fetch_suburl)
192 if glob_match:
193 # Parse specs like "branches/*/src:refs/remotes/svn/*" or
194 # "branches/{472,597,648}/src:refs/remotes/svn/*".
195 branch_re = re.escape(base_url)
196 if glob_match.group(1):
197 branch_re += '/' + re.escape(glob_match.group(1))
198 wildcard = glob_match.group(2)
199 if wildcard == '*':
200 branch_re += '([^/]*)'
201 else:
202 # Escape and replace surrounding braces with parentheses and commas
203 # with pipe symbols.
204 wildcard = re.escape(wildcard)
205 wildcard = re.sub('^\\\\{', '(', wildcard)
206 wildcard = re.sub('\\\\,', '|', wildcard)
207 wildcard = re.sub('\\\\}$', ')', wildcard)
208 branch_re += wildcard
209 if glob_match.group(3):
210 branch_re += re.escape(glob_match.group(3))
211 match = re.match(branch_re, url)
212 if match:
213 return re.sub('\*$', match.group(1), as_ref)
214
215 # Parse specs like "trunk/src:refs/remotes/origin/trunk".
216 if fetch_suburl:
217 full_url = base_url + '/' + fetch_suburl
218 else:
219 full_url = base_url
220 if full_url == url:
221 return as_ref
222 return None
223
224 @staticmethod
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000225 def GetSVNBranch(cwd):
226 """Returns the svn branch name if found."""
227 # Try to figure out which remote branch we're based on.
228 # Strategy:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000229 # 1) iterate through our branch history and find the svn URL.
230 # 2) find the svn-remote that fetches from the URL.
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000231
232 # regexp matching the git-svn line that contains the URL.
233 git_svn_re = re.compile(r'^\s*git-svn-id: (\S+)@', re.MULTILINE)
234
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000235 # We don't want to go through all of history, so read a line from the
236 # pipe at a time.
237 # The -100 is an arbitrary limit so we don't search forever.
238 cmd = ['git', 'log', '-100', '--pretty=medium']
maruel@chromium.orgf94e3f12011-12-13 21:03:46 +0000239 proc = subprocess2.Popen(cmd, cwd=cwd, stdout=subprocess2.PIPE)
maruel@chromium.orge8c28622011-04-05 14:41:44 +0000240 url = None
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000241 for line in proc.stdout:
242 match = git_svn_re.match(line)
243 if match:
244 url = match.group(1)
245 proc.stdout.close() # Cut pipe.
246 break
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000247
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000248 if url:
249 svn_remote_re = re.compile(r'^svn-remote\.([^.]+)\.url (.*)$')
maruel@chromium.org80a9ef12011-12-13 20:44:10 +0000250 remotes = GIT.Capture(
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000251 ['config', '--local', '--get-regexp', r'^svn-remote\..*\.url'],
maruel@chromium.org80a9ef12011-12-13 20:44:10 +0000252 cwd=cwd).splitlines()
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000253 for remote in remotes:
254 match = svn_remote_re.match(remote)
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000255 if match:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000256 remote = match.group(1)
257 base_url = match.group(2)
bauerb@chromium.org866276c2011-03-18 20:09:31 +0000258 try:
259 fetch_spec = GIT.Capture(
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000260 ['config', '--local', 'svn-remote.%s.fetch' % remote],
261 cwd=cwd)
bauerb@chromium.org866276c2011-03-18 20:09:31 +0000262 branch = GIT.MatchSvnGlob(url, base_url, fetch_spec, False)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000263 except subprocess2.CalledProcessError:
bauerb@chromium.org866276c2011-03-18 20:09:31 +0000264 branch = None
265 if branch:
266 return branch
267 try:
268 branch_spec = GIT.Capture(
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000269 ['config', '--local', 'svn-remote.%s.branches' % remote],
270 cwd=cwd)
bauerb@chromium.org866276c2011-03-18 20:09:31 +0000271 branch = GIT.MatchSvnGlob(url, base_url, branch_spec, True)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000272 except subprocess2.CalledProcessError:
bauerb@chromium.org866276c2011-03-18 20:09:31 +0000273 branch = None
274 if branch:
275 return branch
276 try:
277 tag_spec = GIT.Capture(
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000278 ['config', '--local', 'svn-remote.%s.tags' % remote],
279 cwd=cwd)
bauerb@chromium.org866276c2011-03-18 20:09:31 +0000280 branch = GIT.MatchSvnGlob(url, base_url, tag_spec, True)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000281 except subprocess2.CalledProcessError:
bauerb@chromium.org866276c2011-03-18 20:09:31 +0000282 branch = None
283 if branch:
284 return branch
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000285
286 @staticmethod
287 def FetchUpstreamTuple(cwd):
288 """Returns a tuple containg remote and remote ref,
289 e.g. 'origin', 'refs/heads/master'
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000290 Tries to be intelligent and understand git-svn.
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000291 """
292 remote = '.'
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000293 branch = GIT.GetBranch(cwd)
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000294 try:
295 upstream_branch = GIT.Capture(
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000296 ['config', '--local', 'branch.%s.merge' % branch], cwd=cwd)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000297 except subprocess2.CalledProcessError:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000298 upstream_branch = None
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000299 if upstream_branch:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000300 try:
301 remote = GIT.Capture(
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000302 ['config', '--local', 'branch.%s.remote' % branch], cwd=cwd)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000303 except subprocess2.CalledProcessError:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000304 pass
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000305 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000306 try:
307 upstream_branch = GIT.Capture(
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000308 ['config', '--local', 'rietveld.upstream-branch'], cwd=cwd)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000309 except subprocess2.CalledProcessError:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000310 upstream_branch = None
311 if upstream_branch:
312 try:
313 remote = GIT.Capture(
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000314 ['config', '--local', 'rietveld.upstream-remote'], cwd=cwd)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000315 except subprocess2.CalledProcessError:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000316 pass
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000317 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000318 # Fall back on trying a git-svn upstream branch.
319 if GIT.IsGitSvn(cwd):
320 upstream_branch = GIT.GetSVNBranch(cwd)
maruel@chromium.orga630bd72010-04-29 23:32:34 +0000321 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000322 # Else, try to guess the origin remote.
323 remote_branches = GIT.Capture(['branch', '-r'], cwd=cwd).split()
324 if 'origin/master' in remote_branches:
325 # Fall back on origin/master if it exits.
326 remote = 'origin'
327 upstream_branch = 'refs/heads/master'
328 elif 'origin/trunk' in remote_branches:
329 # Fall back on origin/trunk if it exists. Generally a shared
330 # git-svn clone
331 remote = 'origin'
332 upstream_branch = 'refs/heads/trunk'
333 else:
334 # Give up.
335 remote = None
336 upstream_branch = None
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000337 return remote, upstream_branch
338
339 @staticmethod
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000340 def GetUpstreamBranch(cwd):
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000341 """Gets the current branch's upstream branch."""
342 remote, upstream_branch = GIT.FetchUpstreamTuple(cwd)
maruel@chromium.orga630bd72010-04-29 23:32:34 +0000343 if remote != '.' and upstream_branch:
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000344 upstream_branch = upstream_branch.replace('heads', 'remotes/' + remote)
345 return upstream_branch
346
347 @staticmethod
maruel@chromium.org8ede00e2010-01-12 14:35:28 +0000348 def GenerateDiff(cwd, branch=None, branch_head='HEAD', full_move=False,
349 files=None):
maruel@chromium.orga9371762009-12-22 18:27:38 +0000350 """Diffs against the upstream branch or optionally another branch.
351
352 full_move means that move or copy operations should completely recreate the
353 files, usually in the prospect to apply the patch for a try job."""
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000354 if not branch:
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000355 branch = GIT.GetUpstreamBranch(cwd)
scottbyer@chromium.org33167332012-02-23 21:15:30 +0000356 command = ['diff', '-p', '--no-color', '--no-prefix', '--no-ext-diff',
evan@chromium.org400f3e72010-05-19 14:23:36 +0000357 branch + "..." + branch_head]
mcgrathr@chromium.org9249f642013-06-03 21:36:18 +0000358 if full_move:
359 command.append('--no-renames')
360 else:
maruel@chromium.orga9371762009-12-22 18:27:38 +0000361 command.append('-C')
maruel@chromium.org8ede00e2010-01-12 14:35:28 +0000362 # TODO(maruel): --binary support.
363 if files:
364 command.append('--')
365 command.extend(files)
ilevy@chromium.org4380c802013-07-12 23:38:41 +0000366 diff = GIT.Capture(command, cwd=cwd, strip_out=False).splitlines(True)
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000367 for i in range(len(diff)):
368 # In the case of added files, replace /dev/null with the path to the
369 # file being added.
370 if diff[i].startswith('--- /dev/null'):
371 diff[i] = '--- %s' % diff[i+1][4:]
372 return ''.join(diff)
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000373
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000374 @staticmethod
maruel@chromium.org8ede00e2010-01-12 14:35:28 +0000375 def GetDifferentFiles(cwd, branch=None, branch_head='HEAD'):
376 """Returns the list of modified files between two branches."""
377 if not branch:
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000378 branch = GIT.GetUpstreamBranch(cwd)
bauerb@chromium.org838f0f22010-04-09 17:02:50 +0000379 command = ['diff', '--name-only', branch + "..." + branch_head]
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000380 return GIT.Capture(command, cwd=cwd).splitlines(False)
maruel@chromium.org8ede00e2010-01-12 14:35:28 +0000381
382 @staticmethod
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000383 def GetPatchName(cwd):
384 """Constructs a name for this patch."""
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000385 short_sha = GIT.Capture(['rev-parse', '--short=4', 'HEAD'], cwd=cwd)
maruel@chromium.org862ff8e2010-08-06 15:29:16 +0000386 return "%s#%s" % (GIT.GetBranch(cwd), short_sha)
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000387
388 @staticmethod
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000389 def GetCheckoutRoot(cwd):
maruel@chromium.org01d8c1d2010-01-07 01:56:59 +0000390 """Returns the top level directory of a git checkout as an absolute path.
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000391 """
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000392 root = GIT.Capture(['rev-parse', '--show-cdup'], cwd=cwd)
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000393 return os.path.abspath(os.path.join(cwd, root))
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000394
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000395 @staticmethod
396 def GetGitSvnHeadRev(cwd):
397 """Gets the most recently pulled git-svn revision."""
398 try:
399 output = GIT.Capture(['svn', 'info'], cwd=cwd)
400 match = re.search(r'^Revision: ([0-9]+)$', output, re.MULTILINE)
401 return int(match.group(1)) if match else None
402 except (subprocess2.CalledProcessError, ValueError):
403 return None
404
405 @staticmethod
wittman@chromium.org492a3682012-08-10 00:28:28 +0000406 def ParseGitSvnSha1(output):
407 """Parses git-svn output for the first sha1."""
408 match = re.search(r'[0-9a-fA-F]{40}', output)
409 return match.group(0) if match else None
410
411 @staticmethod
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000412 def GetSha1ForSvnRev(cwd, rev):
413 """Returns a corresponding git sha1 for a SVN revision."""
borenet@google.com6ff54482014-02-26 23:09:33 +0000414 if not GIT.IsGitSvn(cwd):
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000415 return None
416 try:
szager@chromium.orgc51def32012-10-15 18:50:37 +0000417 output = GIT.Capture(['svn', 'find-rev', 'r' + str(rev)], cwd=cwd)
418 return GIT.ParseGitSvnSha1(output)
419 except subprocess2.CalledProcessError:
420 return None
421
422 @staticmethod
423 def GetBlessedSha1ForSvnRev(cwd, rev):
424 """Returns a git commit hash from the master branch history that has
425 accurate .DEPS.git and git submodules. To understand why this is more
426 complicated than a simple call to `git svn find-rev`, refer to:
427
428 http://www.chromium.org/developers/how-tos/git-repo
429 """
430 git_svn_rev = GIT.GetSha1ForSvnRev(cwd, rev)
431 if not git_svn_rev:
432 return None
433 try:
szager@google.com312a6a42012-10-11 21:19:42 +0000434 output = GIT.Capture(
435 ['rev-list', '--ancestry-path', '--reverse',
436 '--grep', 'SVN changes up to revision [0-9]*',
437 '%s..refs/remotes/origin/master' % git_svn_rev], cwd=cwd)
438 if not output:
439 return None
440 sha1 = output.splitlines()[0]
441 if not sha1:
442 return None
443 output = GIT.Capture(['rev-list', '-n', '1', '%s^1' % sha1], cwd=cwd)
444 if git_svn_rev != output.rstrip():
445 raise gclient_utils.Error(sha1)
446 return sha1
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000447 except subprocess2.CalledProcessError:
448 return None
449
450 @staticmethod
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000451 def IsValidRevision(cwd, rev, sha_only=False):
452 """Verifies the revision is a proper git revision.
453
454 sha_only: Fail unless rev is a sha hash.
455 """
maruel@chromium.org81473862012-06-27 17:30:56 +0000456 # 'git rev-parse foo' where foo is *any* 40 character hex string will return
457 # the string and return code 0. So strip one character to force 'git
458 # rev-parse' to do a hash table look-up and returns 128 if the hash is not
459 # present.
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000460 lookup_rev = rev
maruel@chromium.org81473862012-06-27 17:30:56 +0000461 if re.match(r'^[0-9a-fA-F]{40}$', rev):
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000462 lookup_rev = rev[:-1]
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000463 try:
ilevy@chromium.org224ba242013-07-08 22:02:31 +0000464 sha = GIT.Capture(['rev-parse', lookup_rev], cwd=cwd).lower()
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000465 if lookup_rev != rev:
466 # Make sure we get the original 40 chars back.
ilevy@chromium.org224ba242013-07-08 22:02:31 +0000467 return rev.lower() == sha
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000468 if sha_only:
ilevy@chromium.org224ba242013-07-08 22:02:31 +0000469 return sha.startswith(rev.lower())
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000470 return True
471 except subprocess2.CalledProcessError:
472 return False
473
maruel@chromium.org36ac2392011-10-12 16:36:11 +0000474 @classmethod
475 def AssertVersion(cls, min_version):
maruel@chromium.orgd0f854a2010-03-11 19:35:53 +0000476 """Asserts git's version is at least min_version."""
maruel@chromium.org36ac2392011-10-12 16:36:11 +0000477 if cls.current_version is None:
bashi@chromium.orgfcffd482012-02-24 01:47:00 +0000478 current_version = cls.Capture(['--version'], '.')
479 matched = re.search(r'version ([0-9\.]+)', current_version)
480 cls.current_version = matched.group(1)
maruel@chromium.org36ac2392011-10-12 16:36:11 +0000481 current_version_list = map(only_int, cls.current_version.split('.'))
maruel@chromium.orgd0f854a2010-03-11 19:35:53 +0000482 for min_ver in map(int, min_version.split('.')):
483 ver = current_version_list.pop(0)
484 if ver < min_ver:
maruel@chromium.org36ac2392011-10-12 16:36:11 +0000485 return (False, cls.current_version)
maruel@chromium.orgd0f854a2010-03-11 19:35:53 +0000486 elif ver > min_ver:
maruel@chromium.org36ac2392011-10-12 16:36:11 +0000487 return (True, cls.current_version)
488 return (True, cls.current_version)
maruel@chromium.orgd0f854a2010-03-11 19:35:53 +0000489
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000490
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000491class SVN(object):
tony@chromium.org57564662010-04-14 02:35:12 +0000492 current_version = None
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000493
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000494 @staticmethod
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000495 def Capture(args, cwd, **kwargs):
maruel@chromium.org54019f32010-09-09 13:50:11 +0000496 """Always redirect stderr.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000497
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000498 Throws an exception if non-0 is returned.
499 """
maruel@chromium.org904af082011-09-08 22:06:09 +0000500 return subprocess2.check_output(
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000501 ['svn'] + args, stderr=subprocess2.PIPE, cwd=cwd, **kwargs)
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000502
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000503 @staticmethod
maruel@chromium.org2b9aa8e2010-08-25 20:01:42 +0000504 def RunAndGetFileList(verbose, args, cwd, file_list, stdout=None):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000505 """Runs svn checkout, update, or status, output to stdout.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000506
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000507 The first item in args must be either "checkout", "update", or "status".
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000508
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000509 svn's stdout is parsed to collect a list of files checked out or updated.
510 These files are appended to file_list. svn's stdout is also printed to
511 sys.stdout as in Run.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000512
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000513 Args:
maruel@chromium.org03807072010-08-16 17:18:44 +0000514 verbose: If True, uses verbose output
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000515 args: A sequence of command line parameters to be passed to svn.
maruel@chromium.org2b9aa8e2010-08-25 20:01:42 +0000516 cwd: The directory where svn is to be run.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000517
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000518 Raises:
519 Error: An error occurred while running the svn command.
520 """
maruel@chromium.org2b9aa8e2010-08-25 20:01:42 +0000521 stdout = stdout or sys.stdout
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000522 if file_list is None:
523 # Even if our caller doesn't care about file_list, we use it internally.
524 file_list = []
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000525
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000526 # svn update and svn checkout use the same pattern: the first three columns
527 # are for file status, property status, and lock status. This is followed
528 # by two spaces, and then the path to the file.
529 update_pattern = '^... (.*)$'
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000530
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000531 # The first three columns of svn status are the same as for svn update and
532 # svn checkout. The next three columns indicate addition-with-history,
533 # switch, and remote lock status. This is followed by one space, and then
534 # the path to the file.
535 status_pattern = '^...... (.*)$'
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000536
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000537 # args[0] must be a supported command. This will blow up if it's something
538 # else, which is good. Note that the patterns are only effective when
539 # these commands are used in their ordinary forms, the patterns are invalid
540 # for "svn status --show-updates", for example.
541 pattern = {
542 'checkout': update_pattern,
543 'status': status_pattern,
544 'update': update_pattern,
545 }[args[0]]
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000546 compiled_pattern = re.compile(pattern)
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000547 # Place an upper limit.
cbentzel@chromium.org2aee2292010-09-03 14:15:25 +0000548 backoff_time = 5
maruel@chromium.orgbec588d2010-10-26 13:50:25 +0000549 retries = 0
maruel@chromium.org03507062010-10-26 00:58:27 +0000550 while True:
maruel@chromium.orgbec588d2010-10-26 13:50:25 +0000551 retries += 1
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000552 previous_list_len = len(file_list)
553 failure = []
maruel@chromium.org54d1f1a2010-01-08 19:53:47 +0000554
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000555 def CaptureMatchingLines(line):
556 match = compiled_pattern.search(line)
557 if match:
558 file_list.append(match.group(1))
559 if line.startswith('svn: '):
maruel@chromium.org8599aa72010-02-08 20:27:14 +0000560 failure.append(line)
maruel@chromium.org54d1f1a2010-01-08 19:53:47 +0000561
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000562 try:
maruel@chromium.org17d01792010-09-01 18:07:10 +0000563 gclient_utils.CheckCallAndFilterAndHeader(
564 ['svn'] + args,
565 cwd=cwd,
566 always=verbose,
567 filter_fn=CaptureMatchingLines,
568 stdout=stdout)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000569 except subprocess2.CalledProcessError:
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000570 def IsKnownFailure():
571 for x in failure:
572 if (x.startswith('svn: OPTIONS of') or
573 x.startswith('svn: PROPFIND of') or
574 x.startswith('svn: REPORT of') or
maruel@chromium.orgf61fc932010-08-19 13:05:24 +0000575 x.startswith('svn: Unknown hostname') or
maruel@chromium.org7d8b97d2011-10-11 23:32:30 +0000576 x.startswith('svn: Server sent unexpected return value') or
577 x.startswith('svn: Can\'t connect to host')):
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000578 return True
579 return False
580
maruel@chromium.org953586a2010-06-15 14:22:24 +0000581 # Subversion client is really misbehaving with Google Code.
582 if args[0] == 'checkout':
583 # Ensure at least one file was checked out, otherwise *delete* the
584 # directory.
585 if len(file_list) == previous_list_len:
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000586 if not IsKnownFailure():
maruel@chromium.org953586a2010-06-15 14:22:24 +0000587 # No known svn error was found, bail out.
588 raise
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000589 # No file were checked out, so make sure the directory is
590 # deleted in case it's messed up and try again.
591 # Warning: It's bad, it assumes args[2] is the directory
592 # argument.
593 if os.path.isdir(args[2]):
digit@chromium.orgdc112ac2013-04-24 13:00:19 +0000594 gclient_utils.rmtree(args[2])
maruel@chromium.org953586a2010-06-15 14:22:24 +0000595 else:
596 # Progress was made, convert to update since an aborted checkout
597 # is now an update.
maruel@chromium.org2de10252010-02-08 01:10:39 +0000598 args = ['update'] + args[1:]
maruel@chromium.org953586a2010-06-15 14:22:24 +0000599 else:
600 # It was an update or export.
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000601 # We enforce that some progress has been made or a known failure.
602 if len(file_list) == previous_list_len and not IsKnownFailure():
603 # No known svn error was found and no progress, bail out.
604 raise
maruel@chromium.orgbec588d2010-10-26 13:50:25 +0000605 if retries == 10:
maruel@chromium.org03507062010-10-26 00:58:27 +0000606 raise
cbentzel@chromium.org2aee2292010-09-03 14:15:25 +0000607 print "Sleeping %.1f seconds and retrying...." % backoff_time
608 time.sleep(backoff_time)
609 backoff_time *= 1.3
maruel@chromium.org953586a2010-06-15 14:22:24 +0000610 continue
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000611 break
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000612
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000613 @staticmethod
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000614 def CaptureRemoteInfo(url):
615 """Returns a dictionary from the svn info output for the given url.
616
617 Throws an exception if svn info fails.
618 """
619 assert isinstance(url, str)
620 return SVN._CaptureInfo([url], None)
621
622 @staticmethod
623 def CaptureLocalInfo(files, cwd):
624 """Returns a dictionary from the svn info output for the given files.
625
626 Throws an exception if svn info fails.
627 """
628 assert isinstance(files, (list, tuple))
629 return SVN._CaptureInfo(files, cwd)
630
631 @staticmethod
632 def _CaptureInfo(files, cwd):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000633 """Returns a dictionary from the svn info output for the given file.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000634
maruel@chromium.org54019f32010-09-09 13:50:11 +0000635 Throws an exception if svn info fails."""
maruel@chromium.orgd25fb8f2011-04-07 13:40:15 +0000636 result = {}
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000637 info = ElementTree.XML(SVN.Capture(['info', '--xml'] + files, cwd))
maruel@chromium.orgade9c592011-04-07 15:59:11 +0000638 if info is None:
639 return result
640 entry = info.find('entry')
maruel@chromium.org6f323bb2011-04-26 15:42:53 +0000641 if entry is None:
642 return result
maruel@chromium.orgade9c592011-04-07 15:59:11 +0000643
644 # Use .text when the item is not optional.
645 result['Path'] = entry.attrib['path']
maruel@chromium.org7d654672012-01-05 19:07:23 +0000646 rev = entry.attrib['revision']
647 try:
648 result['Revision'] = int(rev)
649 except ValueError:
650 result['Revision'] = None
maruel@chromium.orgade9c592011-04-07 15:59:11 +0000651 result['Node Kind'] = entry.attrib['kind']
652 # Differs across versions.
653 if result['Node Kind'] == 'dir':
654 result['Node Kind'] = 'directory'
655 result['URL'] = entry.find('url').text
656 repository = entry.find('repository')
657 result['Repository Root'] = repository.find('root').text
658 result['UUID'] = repository.find('uuid')
659 wc_info = entry.find('wc-info')
660 if wc_info is not None:
661 result['Schedule'] = wc_info.find('schedule').text
662 result['Copied From URL'] = wc_info.find('copy-from-url')
663 result['Copied From Rev'] = wc_info.find('copy-from-rev')
664 else:
665 result['Schedule'] = None
666 result['Copied From URL'] = None
667 result['Copied From Rev'] = None
668 for key in result.keys():
669 if isinstance(result[key], unicode):
670 # Unicode results interferes with the higher layers matching up things
671 # in the deps dictionary.
672 result[key] = result[key].encode()
673 # Automatic conversion of optional parameters.
674 result[key] = getattr(result[key], 'text', result[key])
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000675 return result
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000676
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000677 @staticmethod
maruel@chromium.org54019f32010-09-09 13:50:11 +0000678 def CaptureRevision(cwd):
nasser@codeaurora.org5d63eb82010-03-24 23:22:09 +0000679 """Get the base revision of a SVN repository.
680
681 Returns:
682 Int base revision
683 """
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000684 return SVN.CaptureLocalInfo([], cwd).get('Revision')
nasser@codeaurora.org5d63eb82010-03-24 23:22:09 +0000685
686 @staticmethod
maruel@chromium.orgea15cb72012-05-04 14:16:31 +0000687 def CaptureStatus(files, cwd, no_ignore=False):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000688 """Returns the svn 1.5 svn status emulated output.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000689
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000690 @files can be a string (one file) or a list of files.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000691
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000692 Returns an array of (status, file) tuples."""
693 command = ["status", "--xml"]
maruel@chromium.orgea15cb72012-05-04 14:16:31 +0000694 if no_ignore:
695 command.append('--no-ignore')
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000696 if not files:
697 pass
698 elif isinstance(files, basestring):
699 command.append(files)
700 else:
701 command.extend(files)
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000702
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000703 status_letter = {
704 None: ' ',
705 '': ' ',
706 'added': 'A',
707 'conflicted': 'C',
708 'deleted': 'D',
709 'external': 'X',
710 'ignored': 'I',
711 'incomplete': '!',
712 'merged': 'G',
713 'missing': '!',
714 'modified': 'M',
715 'none': ' ',
716 'normal': ' ',
717 'obstructed': '~',
718 'replaced': 'R',
719 'unversioned': '?',
720 }
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000721 dom = ElementTree.XML(SVN.Capture(command, cwd))
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000722 results = []
maruel@chromium.orgade9c592011-04-07 15:59:11 +0000723 if dom is None:
724 return results
725 # /status/target/entry/(wc-status|commit|author|date)
726 for target in dom.findall('target'):
727 for entry in target.findall('entry'):
728 file_path = entry.attrib['path']
729 wc_status = entry.find('wc-status')
730 # Emulate svn 1.5 status ouput...
731 statuses = [' '] * 7
732 # Col 0
733 xml_item_status = wc_status.attrib['item']
734 if xml_item_status in status_letter:
735 statuses[0] = status_letter[xml_item_status]
736 else:
737 raise gclient_utils.Error(
738 'Unknown item status "%s"; please implement me!' %
739 xml_item_status)
740 # Col 1
741 xml_props_status = wc_status.attrib['props']
742 if xml_props_status == 'modified':
743 statuses[1] = 'M'
744 elif xml_props_status == 'conflicted':
745 statuses[1] = 'C'
746 elif (not xml_props_status or xml_props_status == 'none' or
747 xml_props_status == 'normal'):
748 pass
749 else:
750 raise gclient_utils.Error(
751 'Unknown props status "%s"; please implement me!' %
752 xml_props_status)
753 # Col 2
754 if wc_status.attrib.get('wc-locked') == 'true':
755 statuses[2] = 'L'
756 # Col 3
757 if wc_status.attrib.get('copied') == 'true':
758 statuses[3] = '+'
759 # Col 4
760 if wc_status.attrib.get('switched') == 'true':
761 statuses[4] = 'S'
762 # TODO(maruel): Col 5 and 6
763 item = (''.join(statuses), file_path)
764 results.append(item)
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000765 return results
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000766
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000767 @staticmethod
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000768 def IsMoved(filename, cwd):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000769 """Determine if a file has been added through svn mv"""
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000770 assert isinstance(filename, basestring)
771 return SVN.IsMovedInfo(SVN.CaptureLocalInfo([filename], cwd))
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000772
773 @staticmethod
774 def IsMovedInfo(info):
775 """Determine if a file has been added through svn mv"""
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000776 return (info.get('Copied From URL') and
777 info.get('Copied From Rev') and
778 info.get('Schedule') == 'add')
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000779
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000780 @staticmethod
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000781 def GetFileProperty(filename, property_name, cwd):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000782 """Returns the value of an SVN property for the given file.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000783
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000784 Args:
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000785 filename: The file to check
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000786 property_name: The name of the SVN property, e.g. "svn:mime-type"
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000787
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000788 Returns:
789 The value of the property, which will be the empty string if the property
790 is not set on the file. If the file is not under version control, the
791 empty string is also returned.
792 """
maruel@chromium.org54019f32010-09-09 13:50:11 +0000793 try:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000794 return SVN.Capture(['propget', property_name, filename], cwd)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000795 except subprocess2.CalledProcessError:
maruel@chromium.org54019f32010-09-09 13:50:11 +0000796 return ''
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000797
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000798 @staticmethod
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000799 def GenerateDiff(filenames, cwd, full_move, revision):
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000800 """Returns a string containing the diff for the given file list.
801
802 The files in the list should either be absolute paths or relative to the
803 given root. If no root directory is provided, the repository root will be
804 used.
805 The diff will always use relative paths.
806 """
maruel@chromium.org00fdcb32011-02-24 01:41:02 +0000807 assert isinstance(filenames, (list, tuple))
pkasting@chromium.org0db557c2013-04-24 23:44:23 +0000808 # If the user specified a custom diff command in their svn config file,
809 # then it'll be used when we do svn diff, which we don't want to happen
810 # since we want the unified diff.
811 if SVN.AssertVersion("1.7")[0]:
812 # On svn >= 1.7, the "--internal-diff" flag will solve this.
813 return SVN._GenerateDiffInternal(filenames, cwd, full_move, revision,
814 ["diff", "--internal-diff"],
815 ["diff", "--internal-diff"])
816 else:
817 # On svn < 1.7, the "--internal-diff" flag doesn't exist. Using
818 # --diff-cmd=diff doesn't always work, since e.g. Windows cmd users may
819 # not have a "diff" executable in their path at all. So we use an empty
820 # temporary directory as the config directory, which bypasses any user
821 # settings for the diff-cmd. However, we don't pass this for the
822 # remote_safe_diff_command parameter, since when a new config-dir is
823 # specified for an svn diff against a remote URL, it triggers
824 # authentication prompts. In this case there isn't really a good
825 # alternative to svn 1.7's --internal-diff flag.
826 bogus_dir = tempfile.mkdtemp()
827 try:
828 return SVN._GenerateDiffInternal(filenames, cwd, full_move, revision,
829 ["diff", "--config-dir", bogus_dir],
830 ["diff"])
831 finally:
832 gclient_utils.rmtree(bogus_dir)
833
834 @staticmethod
835 def _GenerateDiffInternal(filenames, cwd, full_move, revision, diff_command,
836 remote_safe_diff_command):
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000837 root = os.path.normcase(os.path.join(cwd, ''))
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000838 def RelativePath(path, root):
839 """We must use relative paths."""
maruel@chromium.orgfd9cbbb2010-01-08 23:04:03 +0000840 if os.path.normcase(path).startswith(root):
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000841 return path[len(root):]
842 return path
pkasting@chromium.org0db557c2013-04-24 23:44:23 +0000843 # Cleanup filenames
844 filenames = [RelativePath(f, root) for f in filenames]
845 # Get information about the modified items (files and directories)
846 data = dict((f, SVN.CaptureLocalInfo([f], root)) for f in filenames)
847 diffs = []
848 if full_move:
849 # Eliminate modified files inside moved/copied directory.
850 for (filename, info) in data.iteritems():
851 if SVN.IsMovedInfo(info) and info.get("Node Kind") == "directory":
852 # Remove files inside the directory.
853 filenames = [f for f in filenames
854 if not f.startswith(filename + os.path.sep)]
855 for filename in data.keys():
856 if not filename in filenames:
857 # Remove filtered out items.
858 del data[filename]
859 else:
860 metaheaders = []
861 for (filename, info) in data.iteritems():
862 if SVN.IsMovedInfo(info):
863 # for now, the most common case is a head copy,
864 # so let's just encode that as a straight up cp.
865 srcurl = info.get('Copied From URL')
866 file_root = info.get('Repository Root')
867 rev = int(info.get('Copied From Rev'))
868 assert srcurl.startswith(file_root)
869 src = srcurl[len(file_root)+1:]
870 try:
871 srcinfo = SVN.CaptureRemoteInfo(srcurl)
872 except subprocess2.CalledProcessError, e:
873 if not 'Not a valid URL' in e.stderr:
874 raise
875 # Assume the file was deleted. No idea how to figure out at which
876 # revision the file was deleted.
877 srcinfo = {'Revision': rev}
878 if (srcinfo.get('Revision') != rev and
879 SVN.Capture(remote_safe_diff_command + ['-r', '%d:head' % rev,
880 srcurl], cwd)):
881 metaheaders.append("#$ svn cp -r %d %s %s "
882 "### WARNING: note non-trunk copy\n" %
883 (rev, src, filename))
884 else:
885 metaheaders.append("#$ cp %s %s\n" % (src,
886 filename))
887 if metaheaders:
888 diffs.append("### BEGIN SVN COPY METADATA\n")
889 diffs.extend(metaheaders)
890 diffs.append("### END SVN COPY METADATA\n")
891 # Now ready to do the actual diff.
892 for filename in sorted(data):
893 diffs.append(SVN._DiffItemInternal(
894 filename, cwd, data[filename], diff_command, full_move, revision))
895 # Use StringIO since it can be messy when diffing a directory move with
896 # full_move=True.
897 buf = cStringIO.StringIO()
898 for d in filter(None, diffs):
899 buf.write(d)
900 result = buf.getvalue()
901 buf.close()
902 return result
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000903
904 @staticmethod
pkasting@chromium.org0db557c2013-04-24 23:44:23 +0000905 def _DiffItemInternal(filename, cwd, info, diff_command, full_move, revision):
pkasting@chromium.org917ea7f2013-04-19 20:10:03 +0000906 """Grabs the diff data."""
pkasting@chromium.org0db557c2013-04-24 23:44:23 +0000907 command = diff_command + [filename]
pkasting@chromium.org917ea7f2013-04-19 20:10:03 +0000908 if revision:
909 command.extend(['--revision', revision])
910 data = None
911 if SVN.IsMovedInfo(info):
912 if full_move:
913 if info.get("Node Kind") == "directory":
914 # Things become tricky here. It's a directory copy/move. We need to
915 # diff all the files inside it.
916 # This will put a lot of pressure on the heap. This is why StringIO
917 # is used and converted back into a string at the end. The reason to
918 # return a string instead of a StringIO is that StringIO.write()
919 # doesn't accept a StringIO object. *sigh*.
920 for (dirpath, dirnames, filenames) in os.walk(filename):
921 # Cleanup all files starting with a '.'.
922 for d in dirnames:
923 if d.startswith('.'):
924 dirnames.remove(d)
925 for f in filenames:
926 if f.startswith('.'):
927 filenames.remove(f)
928 for f in filenames:
929 if data is None:
930 data = cStringIO.StringIO()
931 data.write(GenFakeDiff(os.path.join(dirpath, f)))
932 if data:
933 tmp = data.getvalue()
934 data.close()
935 data = tmp
936 else:
937 data = GenFakeDiff(filename)
938 else:
939 if info.get("Node Kind") != "directory":
940 # svn diff on a mv/cp'd file outputs nothing if there was no change.
941 data = SVN.Capture(command, cwd)
942 if not data:
943 # We put in an empty Index entry so upload.py knows about them.
944 data = "Index: %s\n" % filename.replace(os.sep, '/')
945 # Otherwise silently ignore directories.
946 else:
947 if info.get("Node Kind") != "directory":
948 # Normal simple case.
949 try:
950 data = SVN.Capture(command, cwd)
951 except subprocess2.CalledProcessError:
952 if revision:
953 data = GenFakeDiff(filename)
954 else:
955 raise
956 # Otherwise silently ignore directories.
957 return data
958
959 @staticmethod
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000960 def GetEmail(cwd):
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000961 """Retrieves the svn account which we assume is an email address."""
maruel@chromium.org54019f32010-09-09 13:50:11 +0000962 try:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000963 infos = SVN.CaptureLocalInfo([], cwd)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000964 except subprocess2.CalledProcessError:
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000965 return None
966
967 # Should check for uuid but it is incorrectly saved for https creds.
maruel@chromium.org54019f32010-09-09 13:50:11 +0000968 root = infos['Repository Root']
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000969 realm = root.rsplit('/', 1)[0]
maruel@chromium.org54019f32010-09-09 13:50:11 +0000970 uuid = infos['UUID']
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000971 if root.startswith('https') or not uuid:
972 regexp = re.compile(r'<%s:\d+>.*' % realm)
973 else:
974 regexp = re.compile(r'<%s:\d+> %s' % (realm, uuid))
975 if regexp is None:
976 return None
977 if sys.platform.startswith('win'):
978 if not 'APPDATA' in os.environ:
979 return None
maruel@chromium.org720d9f32009-11-21 17:38:57 +0000980 auth_dir = os.path.join(os.environ['APPDATA'], 'Subversion', 'auth',
981 'svn.simple')
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000982 else:
983 if not 'HOME' in os.environ:
984 return None
985 auth_dir = os.path.join(os.environ['HOME'], '.subversion', 'auth',
986 'svn.simple')
987 for credfile in os.listdir(auth_dir):
988 cred_info = SVN.ReadSimpleAuth(os.path.join(auth_dir, credfile))
989 if regexp.match(cred_info.get('svn:realmstring')):
990 return cred_info.get('username')
991
992 @staticmethod
993 def ReadSimpleAuth(filename):
994 f = open(filename, 'r')
995 values = {}
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000996 def ReadOneItem(item_type):
997 m = re.match(r'%s (\d+)' % item_type, f.readline())
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000998 if not m:
999 return None
1000 data = f.read(int(m.group(1)))
1001 if f.read(1) != '\n':
1002 return None
1003 return data
1004
1005 while True:
1006 key = ReadOneItem('K')
1007 if not key:
1008 break
1009 value = ReadOneItem('V')
1010 if not value:
1011 break
1012 values[key] = value
1013 return values
maruel@chromium.org94b1ee92009-12-19 20:27:20 +00001014
1015 @staticmethod
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001016 def GetCheckoutRoot(cwd):
maruel@chromium.org94b1ee92009-12-19 20:27:20 +00001017 """Returns the top level directory of the current repository.
1018
1019 The directory is returned as an absolute path.
1020 """
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001021 cwd = os.path.abspath(cwd)
maruel@chromium.org54019f32010-09-09 13:50:11 +00001022 try:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001023 info = SVN.CaptureLocalInfo([], cwd)
maruel@chromium.org885d6e82011-02-24 20:21:46 +00001024 cur_dir_repo_root = info['Repository Root']
1025 url = info['URL']
maruel@chromium.orgda64d632011-09-08 17:41:15 +00001026 except subprocess2.CalledProcessError:
maruel@chromium.org94b1ee92009-12-19 20:27:20 +00001027 return None
maruel@chromium.org94b1ee92009-12-19 20:27:20 +00001028 while True:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001029 parent = os.path.dirname(cwd)
maruel@chromium.org54019f32010-09-09 13:50:11 +00001030 try:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001031 info = SVN.CaptureLocalInfo([], parent)
maruel@chromium.org885d6e82011-02-24 20:21:46 +00001032 if (info['Repository Root'] != cur_dir_repo_root or
1033 info['URL'] != os.path.dirname(url)):
maruel@chromium.org54019f32010-09-09 13:50:11 +00001034 break
maruel@chromium.org885d6e82011-02-24 20:21:46 +00001035 url = info['URL']
maruel@chromium.orgda64d632011-09-08 17:41:15 +00001036 except subprocess2.CalledProcessError:
maruel@chromium.org94b1ee92009-12-19 20:27:20 +00001037 break
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001038 cwd = parent
1039 return GetCasedPath(cwd)
tony@chromium.org57564662010-04-14 02:35:12 +00001040
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +00001041 @staticmethod
1042 def IsValidRevision(url):
1043 """Verifies the revision looks like an SVN revision."""
1044 try:
1045 SVN.Capture(['info', url], cwd=None)
1046 return True
1047 except subprocess2.CalledProcessError:
1048 return False
1049
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001050 @classmethod
1051 def AssertVersion(cls, min_version):
tony@chromium.org57564662010-04-14 02:35:12 +00001052 """Asserts svn's version is at least min_version."""
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001053 if cls.current_version is None:
shouqun.liu@intel.com13b522c2012-07-20 17:16:51 +00001054 cls.current_version = cls.Capture(['--version', '--quiet'], None)
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001055 current_version_list = map(only_int, cls.current_version.split('.'))
tony@chromium.org57564662010-04-14 02:35:12 +00001056 for min_ver in map(int, min_version.split('.')):
1057 ver = current_version_list.pop(0)
1058 if ver < min_ver:
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001059 return (False, cls.current_version)
tony@chromium.org57564662010-04-14 02:35:12 +00001060 elif ver > min_ver:
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001061 return (True, cls.current_version)
1062 return (True, cls.current_version)
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001063
1064 @staticmethod
maruel@chromium.orgea15cb72012-05-04 14:16:31 +00001065 def Revert(cwd, callback=None, ignore_externals=False, no_ignore=False):
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001066 """Reverts all svn modifications in cwd, including properties.
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001067
1068 Deletes any modified files or directory.
1069
1070 A "svn update --revision BASE" call is required after to revive deleted
1071 files.
1072 """
maruel@chromium.orgea15cb72012-05-04 14:16:31 +00001073 for file_status in SVN.CaptureStatus(None, cwd, no_ignore=no_ignore):
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001074 file_path = os.path.join(cwd, file_status[1])
maruel@chromium.org8c415122011-03-15 17:14:27 +00001075 if (ignore_externals and
1076 file_status[0][0] == 'X' and
1077 file_status[0][1:].isspace()):
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001078 # Ignore externals.
1079 logging.info('Ignoring external %s' % file_status[1])
1080 continue
1081
maruel@chromium.org62087572012-04-24 23:16:28 +00001082 # This is the case where '! L .' is returned by 'svn status'. Just
1083 # strip off the '/.'.
1084 if file_path.endswith(os.path.sep + '.'):
1085 file_path = file_path[:-2]
1086
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001087 if callback:
1088 callback(file_status)
1089
maruel@chromium.org8c415122011-03-15 17:14:27 +00001090 if os.path.exists(file_path):
1091 # svn revert is really stupid. It fails on inconsistent line-endings,
1092 # on switched directories, etc. So take no chance and delete everything!
1093 # In theory, it wouldn't be necessary for property-only change but then
1094 # it'd have to look for switched directories, etc so it's not worth
1095 # optimizing this use case.
1096 if os.path.isfile(file_path) or os.path.islink(file_path):
1097 logging.info('os.remove(%s)' % file_path)
1098 os.remove(file_path)
1099 elif os.path.isdir(file_path):
digit@chromium.orgdc112ac2013-04-24 13:00:19 +00001100 logging.info('rmtree(%s)' % file_path)
1101 gclient_utils.rmtree(file_path)
maruel@chromium.org8c415122011-03-15 17:14:27 +00001102 else:
1103 logging.critical(
1104 ('No idea what is %s.\nYou just found a bug in gclient'
1105 ', please ping maruel@chromium.org ASAP!') % file_path)
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001106
maruel@chromium.org8c415122011-03-15 17:14:27 +00001107 if (file_status[0][0] in ('D', 'A', '!') or
1108 not file_status[0][1:].isspace()):
maruel@chromium.orgaf453492011-03-03 21:04:09 +00001109 # Added, deleted file requires manual intervention and require calling
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001110 # revert, like for properties.
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001111 if not os.path.isdir(cwd):
maruel@chromium.org8b322b32011-11-01 19:05:50 +00001112 # '.' was deleted. It's not worth continuing.
1113 return
maruel@chromium.orgaf453492011-03-03 21:04:09 +00001114 try:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001115 SVN.Capture(['revert', file_status[1]], cwd=cwd)
maruel@chromium.orgda64d632011-09-08 17:41:15 +00001116 except subprocess2.CalledProcessError:
maruel@chromium.orgaf453492011-03-03 21:04:09 +00001117 if not os.path.exists(file_path):
1118 continue
1119 raise