blob: 7293f83348c2ffd7902492aa5e815c386f897e78 [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,
103 cwd=cwd, stderr=subprocess2.PIPE, **kwargs)
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)
maruel@chromium.org80a9ef12011-12-13 20:44:10 +0000124 status = GIT.Capture(command, cwd).rstrip()
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:
145 return GIT.Capture(['config', 'user.email'], cwd=cwd).strip()
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'."""
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000157 return GIT.Capture(['symbolic-ref', 'HEAD'], cwd=cwd).strip()
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:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000169 GIT.Capture(['config', '--get-regexp', r'^svn-remote\.'], cwd=cwd)
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000170 return True
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000171 except subprocess2.CalledProcessError:
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000172 return False
173
174 @staticmethod
bauerb@chromium.org866276c2011-03-18 20:09:31 +0000175 def MatchSvnGlob(url, base_url, glob_spec, allow_wildcards):
176 """Return the corresponding git ref if |base_url| together with |glob_spec|
177 matches the full |url|.
178
179 If |allow_wildcards| is true, |glob_spec| can contain wildcards (see below).
180 """
181 fetch_suburl, as_ref = glob_spec.split(':')
182 if allow_wildcards:
183 glob_match = re.match('(.+/)?(\*|{[^/]*})(/.+)?', fetch_suburl)
184 if glob_match:
185 # Parse specs like "branches/*/src:refs/remotes/svn/*" or
186 # "branches/{472,597,648}/src:refs/remotes/svn/*".
187 branch_re = re.escape(base_url)
188 if glob_match.group(1):
189 branch_re += '/' + re.escape(glob_match.group(1))
190 wildcard = glob_match.group(2)
191 if wildcard == '*':
192 branch_re += '([^/]*)'
193 else:
194 # Escape and replace surrounding braces with parentheses and commas
195 # with pipe symbols.
196 wildcard = re.escape(wildcard)
197 wildcard = re.sub('^\\\\{', '(', wildcard)
198 wildcard = re.sub('\\\\,', '|', wildcard)
199 wildcard = re.sub('\\\\}$', ')', wildcard)
200 branch_re += wildcard
201 if glob_match.group(3):
202 branch_re += re.escape(glob_match.group(3))
203 match = re.match(branch_re, url)
204 if match:
205 return re.sub('\*$', match.group(1), as_ref)
206
207 # Parse specs like "trunk/src:refs/remotes/origin/trunk".
208 if fetch_suburl:
209 full_url = base_url + '/' + fetch_suburl
210 else:
211 full_url = base_url
212 if full_url == url:
213 return as_ref
214 return None
215
216 @staticmethod
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000217 def GetSVNBranch(cwd):
218 """Returns the svn branch name if found."""
219 # Try to figure out which remote branch we're based on.
220 # Strategy:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000221 # 1) iterate through our branch history and find the svn URL.
222 # 2) find the svn-remote that fetches from the URL.
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000223
224 # regexp matching the git-svn line that contains the URL.
225 git_svn_re = re.compile(r'^\s*git-svn-id: (\S+)@', re.MULTILINE)
226
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000227 # We don't want to go through all of history, so read a line from the
228 # pipe at a time.
229 # The -100 is an arbitrary limit so we don't search forever.
230 cmd = ['git', 'log', '-100', '--pretty=medium']
maruel@chromium.orgf94e3f12011-12-13 21:03:46 +0000231 proc = subprocess2.Popen(cmd, cwd=cwd, stdout=subprocess2.PIPE)
maruel@chromium.orge8c28622011-04-05 14:41:44 +0000232 url = None
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000233 for line in proc.stdout:
234 match = git_svn_re.match(line)
235 if match:
236 url = match.group(1)
237 proc.stdout.close() # Cut pipe.
238 break
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000239
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000240 if url:
241 svn_remote_re = re.compile(r'^svn-remote\.([^.]+)\.url (.*)$')
maruel@chromium.org80a9ef12011-12-13 20:44:10 +0000242 remotes = GIT.Capture(
243 ['config', '--get-regexp', r'^svn-remote\..*\.url'],
244 cwd=cwd).splitlines()
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000245 for remote in remotes:
246 match = svn_remote_re.match(remote)
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000247 if match:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000248 remote = match.group(1)
249 base_url = match.group(2)
bauerb@chromium.org866276c2011-03-18 20:09:31 +0000250 try:
251 fetch_spec = GIT.Capture(
252 ['config', 'svn-remote.%s.fetch' % remote],
253 cwd=cwd).strip()
254 branch = GIT.MatchSvnGlob(url, base_url, fetch_spec, False)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000255 except subprocess2.CalledProcessError:
bauerb@chromium.org866276c2011-03-18 20:09:31 +0000256 branch = None
257 if branch:
258 return branch
259 try:
260 branch_spec = GIT.Capture(
261 ['config', 'svn-remote.%s.branches' % remote],
262 cwd=cwd).strip()
263 branch = GIT.MatchSvnGlob(url, base_url, branch_spec, True)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000264 except subprocess2.CalledProcessError:
bauerb@chromium.org866276c2011-03-18 20:09:31 +0000265 branch = None
266 if branch:
267 return branch
268 try:
269 tag_spec = GIT.Capture(
270 ['config', 'svn-remote.%s.tags' % remote],
271 cwd=cwd).strip()
272 branch = GIT.MatchSvnGlob(url, base_url, tag_spec, True)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000273 except subprocess2.CalledProcessError:
bauerb@chromium.org866276c2011-03-18 20:09:31 +0000274 branch = None
275 if branch:
276 return branch
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000277
278 @staticmethod
279 def FetchUpstreamTuple(cwd):
280 """Returns a tuple containg remote and remote ref,
281 e.g. 'origin', 'refs/heads/master'
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000282 Tries to be intelligent and understand git-svn.
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000283 """
284 remote = '.'
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000285 branch = GIT.GetBranch(cwd)
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000286 try:
287 upstream_branch = GIT.Capture(
288 ['config', 'branch.%s.merge' % branch], cwd=cwd).strip()
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000289 except subprocess2.CalledProcessError:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000290 upstream_branch = None
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000291 if upstream_branch:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000292 try:
293 remote = GIT.Capture(
294 ['config', 'branch.%s.remote' % branch], cwd=cwd).strip()
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000295 except subprocess2.CalledProcessError:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000296 pass
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000297 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000298 try:
299 upstream_branch = GIT.Capture(
300 ['config', 'rietveld.upstream-branch'], cwd=cwd).strip()
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000301 except subprocess2.CalledProcessError:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000302 upstream_branch = None
303 if upstream_branch:
304 try:
305 remote = GIT.Capture(
306 ['config', 'rietveld.upstream-remote'], cwd=cwd).strip()
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000307 except subprocess2.CalledProcessError:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000308 pass
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000309 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000310 # Fall back on trying a git-svn upstream branch.
311 if GIT.IsGitSvn(cwd):
312 upstream_branch = GIT.GetSVNBranch(cwd)
maruel@chromium.orga630bd72010-04-29 23:32:34 +0000313 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000314 # Else, try to guess the origin remote.
315 remote_branches = GIT.Capture(['branch', '-r'], cwd=cwd).split()
316 if 'origin/master' in remote_branches:
317 # Fall back on origin/master if it exits.
318 remote = 'origin'
319 upstream_branch = 'refs/heads/master'
320 elif 'origin/trunk' in remote_branches:
321 # Fall back on origin/trunk if it exists. Generally a shared
322 # git-svn clone
323 remote = 'origin'
324 upstream_branch = 'refs/heads/trunk'
325 else:
326 # Give up.
327 remote = None
328 upstream_branch = None
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000329 return remote, upstream_branch
330
331 @staticmethod
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000332 def GetUpstreamBranch(cwd):
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000333 """Gets the current branch's upstream branch."""
334 remote, upstream_branch = GIT.FetchUpstreamTuple(cwd)
maruel@chromium.orga630bd72010-04-29 23:32:34 +0000335 if remote != '.' and upstream_branch:
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000336 upstream_branch = upstream_branch.replace('heads', 'remotes/' + remote)
337 return upstream_branch
338
339 @staticmethod
maruel@chromium.org8ede00e2010-01-12 14:35:28 +0000340 def GenerateDiff(cwd, branch=None, branch_head='HEAD', full_move=False,
341 files=None):
maruel@chromium.orga9371762009-12-22 18:27:38 +0000342 """Diffs against the upstream branch or optionally another branch.
343
344 full_move means that move or copy operations should completely recreate the
345 files, usually in the prospect to apply the patch for a try job."""
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000346 if not branch:
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000347 branch = GIT.GetUpstreamBranch(cwd)
scottbyer@chromium.org33167332012-02-23 21:15:30 +0000348 command = ['diff', '-p', '--no-color', '--no-prefix', '--no-ext-diff',
evan@chromium.org400f3e72010-05-19 14:23:36 +0000349 branch + "..." + branch_head]
mcgrathr@chromium.org9249f642013-06-03 21:36:18 +0000350 if full_move:
351 command.append('--no-renames')
352 else:
maruel@chromium.orga9371762009-12-22 18:27:38 +0000353 command.append('-C')
maruel@chromium.org8ede00e2010-01-12 14:35:28 +0000354 # TODO(maruel): --binary support.
355 if files:
356 command.append('--')
357 command.extend(files)
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000358 diff = GIT.Capture(command, cwd=cwd).splitlines(True)
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000359 for i in range(len(diff)):
360 # In the case of added files, replace /dev/null with the path to the
361 # file being added.
362 if diff[i].startswith('--- /dev/null'):
363 diff[i] = '--- %s' % diff[i+1][4:]
364 return ''.join(diff)
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000365
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000366 @staticmethod
maruel@chromium.org8ede00e2010-01-12 14:35:28 +0000367 def GetDifferentFiles(cwd, branch=None, branch_head='HEAD'):
368 """Returns the list of modified files between two branches."""
369 if not branch:
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000370 branch = GIT.GetUpstreamBranch(cwd)
bauerb@chromium.org838f0f22010-04-09 17:02:50 +0000371 command = ['diff', '--name-only', branch + "..." + branch_head]
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000372 return GIT.Capture(command, cwd=cwd).splitlines(False)
maruel@chromium.org8ede00e2010-01-12 14:35:28 +0000373
374 @staticmethod
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000375 def GetPatchName(cwd):
376 """Constructs a name for this patch."""
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000377 short_sha = GIT.Capture(['rev-parse', '--short=4', 'HEAD'], cwd=cwd).strip()
maruel@chromium.org862ff8e2010-08-06 15:29:16 +0000378 return "%s#%s" % (GIT.GetBranch(cwd), short_sha)
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000379
380 @staticmethod
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000381 def GetCheckoutRoot(cwd):
maruel@chromium.org01d8c1d2010-01-07 01:56:59 +0000382 """Returns the top level directory of a git checkout as an absolute path.
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000383 """
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000384 root = GIT.Capture(['rev-parse', '--show-cdup'], cwd=cwd).strip()
385 return os.path.abspath(os.path.join(cwd, root))
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000386
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000387 @staticmethod
388 def GetGitSvnHeadRev(cwd):
389 """Gets the most recently pulled git-svn revision."""
390 try:
391 output = GIT.Capture(['svn', 'info'], cwd=cwd)
392 match = re.search(r'^Revision: ([0-9]+)$', output, re.MULTILINE)
393 return int(match.group(1)) if match else None
394 except (subprocess2.CalledProcessError, ValueError):
395 return None
396
397 @staticmethod
wittman@chromium.org492a3682012-08-10 00:28:28 +0000398 def ParseGitSvnSha1(output):
399 """Parses git-svn output for the first sha1."""
400 match = re.search(r'[0-9a-fA-F]{40}', output)
401 return match.group(0) if match else None
402
403 @staticmethod
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000404 def GetSha1ForSvnRev(cwd, rev):
405 """Returns a corresponding git sha1 for a SVN revision."""
406 if not GIT.IsGitSvn(cwd=cwd):
407 return None
408 try:
szager@chromium.orgc51def32012-10-15 18:50:37 +0000409 output = GIT.Capture(['svn', 'find-rev', 'r' + str(rev)], cwd=cwd)
410 return GIT.ParseGitSvnSha1(output)
411 except subprocess2.CalledProcessError:
412 return None
413
414 @staticmethod
415 def GetBlessedSha1ForSvnRev(cwd, rev):
416 """Returns a git commit hash from the master branch history that has
417 accurate .DEPS.git and git submodules. To understand why this is more
418 complicated than a simple call to `git svn find-rev`, refer to:
419
420 http://www.chromium.org/developers/how-tos/git-repo
421 """
422 git_svn_rev = GIT.GetSha1ForSvnRev(cwd, rev)
423 if not git_svn_rev:
424 return None
425 try:
szager@google.com312a6a42012-10-11 21:19:42 +0000426 output = GIT.Capture(
427 ['rev-list', '--ancestry-path', '--reverse',
428 '--grep', 'SVN changes up to revision [0-9]*',
429 '%s..refs/remotes/origin/master' % git_svn_rev], cwd=cwd)
430 if not output:
431 return None
432 sha1 = output.splitlines()[0]
433 if not sha1:
434 return None
435 output = GIT.Capture(['rev-list', '-n', '1', '%s^1' % sha1], cwd=cwd)
436 if git_svn_rev != output.rstrip():
437 raise gclient_utils.Error(sha1)
438 return sha1
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000439 except subprocess2.CalledProcessError:
440 return None
441
442 @staticmethod
443 def IsValidRevision(cwd, rev):
444 """Verifies the revision is a proper git revision."""
maruel@chromium.org81473862012-06-27 17:30:56 +0000445 # 'git rev-parse foo' where foo is *any* 40 character hex string will return
446 # the string and return code 0. So strip one character to force 'git
447 # rev-parse' to do a hash table look-up and returns 128 if the hash is not
448 # present.
449 if re.match(r'^[0-9a-fA-F]{40}$', rev):
450 rev = rev[:-1]
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000451 try:
452 GIT.Capture(['rev-parse', rev], cwd=cwd)
453 return True
454 except subprocess2.CalledProcessError:
455 return False
456
maruel@chromium.org36ac2392011-10-12 16:36:11 +0000457 @classmethod
458 def AssertVersion(cls, min_version):
maruel@chromium.orgd0f854a2010-03-11 19:35:53 +0000459 """Asserts git's version is at least min_version."""
maruel@chromium.org36ac2392011-10-12 16:36:11 +0000460 if cls.current_version is None:
bashi@chromium.orgfcffd482012-02-24 01:47:00 +0000461 current_version = cls.Capture(['--version'], '.')
462 matched = re.search(r'version ([0-9\.]+)', current_version)
463 cls.current_version = matched.group(1)
maruel@chromium.org36ac2392011-10-12 16:36:11 +0000464 current_version_list = map(only_int, cls.current_version.split('.'))
maruel@chromium.orgd0f854a2010-03-11 19:35:53 +0000465 for min_ver in map(int, min_version.split('.')):
466 ver = current_version_list.pop(0)
467 if ver < min_ver:
maruel@chromium.org36ac2392011-10-12 16:36:11 +0000468 return (False, cls.current_version)
maruel@chromium.orgd0f854a2010-03-11 19:35:53 +0000469 elif ver > min_ver:
maruel@chromium.org36ac2392011-10-12 16:36:11 +0000470 return (True, cls.current_version)
471 return (True, cls.current_version)
maruel@chromium.orgd0f854a2010-03-11 19:35:53 +0000472
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000473
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000474class SVN(object):
tony@chromium.org57564662010-04-14 02:35:12 +0000475 current_version = None
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000476
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000477 @staticmethod
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000478 def Capture(args, cwd, **kwargs):
maruel@chromium.org54019f32010-09-09 13:50:11 +0000479 """Always redirect stderr.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000480
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000481 Throws an exception if non-0 is returned.
482 """
maruel@chromium.org904af082011-09-08 22:06:09 +0000483 return subprocess2.check_output(
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000484 ['svn'] + args, stderr=subprocess2.PIPE, cwd=cwd, **kwargs)
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000485
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000486 @staticmethod
maruel@chromium.org2b9aa8e2010-08-25 20:01:42 +0000487 def RunAndGetFileList(verbose, args, cwd, file_list, stdout=None):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000488 """Runs svn checkout, update, or status, output to stdout.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000489
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000490 The first item in args must be either "checkout", "update", or "status".
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000491
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000492 svn's stdout is parsed to collect a list of files checked out or updated.
493 These files are appended to file_list. svn's stdout is also printed to
494 sys.stdout as in Run.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000495
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000496 Args:
maruel@chromium.org03807072010-08-16 17:18:44 +0000497 verbose: If True, uses verbose output
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000498 args: A sequence of command line parameters to be passed to svn.
maruel@chromium.org2b9aa8e2010-08-25 20:01:42 +0000499 cwd: The directory where svn is to be run.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000500
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000501 Raises:
502 Error: An error occurred while running the svn command.
503 """
maruel@chromium.org2b9aa8e2010-08-25 20:01:42 +0000504 stdout = stdout or sys.stdout
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000505
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000506 # svn update and svn checkout use the same pattern: the first three columns
507 # are for file status, property status, and lock status. This is followed
508 # by two spaces, and then the path to the file.
509 update_pattern = '^... (.*)$'
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000510
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000511 # The first three columns of svn status are the same as for svn update and
512 # svn checkout. The next three columns indicate addition-with-history,
513 # switch, and remote lock status. This is followed by one space, and then
514 # the path to the file.
515 status_pattern = '^...... (.*)$'
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000516
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000517 # args[0] must be a supported command. This will blow up if it's something
518 # else, which is good. Note that the patterns are only effective when
519 # these commands are used in their ordinary forms, the patterns are invalid
520 # for "svn status --show-updates", for example.
521 pattern = {
522 'checkout': update_pattern,
523 'status': status_pattern,
524 'update': update_pattern,
525 }[args[0]]
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000526 compiled_pattern = re.compile(pattern)
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000527 # Place an upper limit.
cbentzel@chromium.org2aee2292010-09-03 14:15:25 +0000528 backoff_time = 5
maruel@chromium.orgbec588d2010-10-26 13:50:25 +0000529 retries = 0
maruel@chromium.org03507062010-10-26 00:58:27 +0000530 while True:
maruel@chromium.orgbec588d2010-10-26 13:50:25 +0000531 retries += 1
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000532 previous_list_len = len(file_list)
533 failure = []
maruel@chromium.org54d1f1a2010-01-08 19:53:47 +0000534
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000535 def CaptureMatchingLines(line):
536 match = compiled_pattern.search(line)
537 if match:
538 file_list.append(match.group(1))
539 if line.startswith('svn: '):
maruel@chromium.org8599aa72010-02-08 20:27:14 +0000540 failure.append(line)
maruel@chromium.org54d1f1a2010-01-08 19:53:47 +0000541
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000542 try:
maruel@chromium.org17d01792010-09-01 18:07:10 +0000543 gclient_utils.CheckCallAndFilterAndHeader(
544 ['svn'] + args,
545 cwd=cwd,
546 always=verbose,
547 filter_fn=CaptureMatchingLines,
548 stdout=stdout)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000549 except subprocess2.CalledProcessError:
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000550 def IsKnownFailure():
551 for x in failure:
552 if (x.startswith('svn: OPTIONS of') or
553 x.startswith('svn: PROPFIND of') or
554 x.startswith('svn: REPORT of') or
maruel@chromium.orgf61fc932010-08-19 13:05:24 +0000555 x.startswith('svn: Unknown hostname') or
maruel@chromium.org7d8b97d2011-10-11 23:32:30 +0000556 x.startswith('svn: Server sent unexpected return value') or
557 x.startswith('svn: Can\'t connect to host')):
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000558 return True
559 return False
560
maruel@chromium.org953586a2010-06-15 14:22:24 +0000561 # Subversion client is really misbehaving with Google Code.
562 if args[0] == 'checkout':
563 # Ensure at least one file was checked out, otherwise *delete* the
564 # directory.
565 if len(file_list) == previous_list_len:
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000566 if not IsKnownFailure():
maruel@chromium.org953586a2010-06-15 14:22:24 +0000567 # No known svn error was found, bail out.
568 raise
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000569 # No file were checked out, so make sure the directory is
570 # deleted in case it's messed up and try again.
571 # Warning: It's bad, it assumes args[2] is the directory
572 # argument.
573 if os.path.isdir(args[2]):
digit@chromium.orgdc112ac2013-04-24 13:00:19 +0000574 gclient_utils.rmtree(args[2])
maruel@chromium.org953586a2010-06-15 14:22:24 +0000575 else:
576 # Progress was made, convert to update since an aborted checkout
577 # is now an update.
maruel@chromium.org2de10252010-02-08 01:10:39 +0000578 args = ['update'] + args[1:]
maruel@chromium.org953586a2010-06-15 14:22:24 +0000579 else:
580 # It was an update or export.
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000581 # We enforce that some progress has been made or a known failure.
582 if len(file_list) == previous_list_len and not IsKnownFailure():
583 # No known svn error was found and no progress, bail out.
584 raise
maruel@chromium.orgbec588d2010-10-26 13:50:25 +0000585 if retries == 10:
maruel@chromium.org03507062010-10-26 00:58:27 +0000586 raise
cbentzel@chromium.org2aee2292010-09-03 14:15:25 +0000587 print "Sleeping %.1f seconds and retrying...." % backoff_time
588 time.sleep(backoff_time)
589 backoff_time *= 1.3
maruel@chromium.org953586a2010-06-15 14:22:24 +0000590 continue
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000591 break
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000592
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000593 @staticmethod
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000594 def CaptureRemoteInfo(url):
595 """Returns a dictionary from the svn info output for the given url.
596
597 Throws an exception if svn info fails.
598 """
599 assert isinstance(url, str)
600 return SVN._CaptureInfo([url], None)
601
602 @staticmethod
603 def CaptureLocalInfo(files, cwd):
604 """Returns a dictionary from the svn info output for the given files.
605
606 Throws an exception if svn info fails.
607 """
608 assert isinstance(files, (list, tuple))
609 return SVN._CaptureInfo(files, cwd)
610
611 @staticmethod
612 def _CaptureInfo(files, cwd):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000613 """Returns a dictionary from the svn info output for the given file.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000614
maruel@chromium.org54019f32010-09-09 13:50:11 +0000615 Throws an exception if svn info fails."""
maruel@chromium.orgd25fb8f2011-04-07 13:40:15 +0000616 result = {}
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000617 info = ElementTree.XML(SVN.Capture(['info', '--xml'] + files, cwd))
maruel@chromium.orgade9c592011-04-07 15:59:11 +0000618 if info is None:
619 return result
620 entry = info.find('entry')
maruel@chromium.org6f323bb2011-04-26 15:42:53 +0000621 if entry is None:
622 return result
maruel@chromium.orgade9c592011-04-07 15:59:11 +0000623
624 # Use .text when the item is not optional.
625 result['Path'] = entry.attrib['path']
maruel@chromium.org7d654672012-01-05 19:07:23 +0000626 rev = entry.attrib['revision']
627 try:
628 result['Revision'] = int(rev)
629 except ValueError:
630 result['Revision'] = None
maruel@chromium.orgade9c592011-04-07 15:59:11 +0000631 result['Node Kind'] = entry.attrib['kind']
632 # Differs across versions.
633 if result['Node Kind'] == 'dir':
634 result['Node Kind'] = 'directory'
635 result['URL'] = entry.find('url').text
636 repository = entry.find('repository')
637 result['Repository Root'] = repository.find('root').text
638 result['UUID'] = repository.find('uuid')
639 wc_info = entry.find('wc-info')
640 if wc_info is not None:
641 result['Schedule'] = wc_info.find('schedule').text
642 result['Copied From URL'] = wc_info.find('copy-from-url')
643 result['Copied From Rev'] = wc_info.find('copy-from-rev')
644 else:
645 result['Schedule'] = None
646 result['Copied From URL'] = None
647 result['Copied From Rev'] = None
648 for key in result.keys():
649 if isinstance(result[key], unicode):
650 # Unicode results interferes with the higher layers matching up things
651 # in the deps dictionary.
652 result[key] = result[key].encode()
653 # Automatic conversion of optional parameters.
654 result[key] = getattr(result[key], 'text', result[key])
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000655 return result
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000656
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000657 @staticmethod
maruel@chromium.org54019f32010-09-09 13:50:11 +0000658 def CaptureRevision(cwd):
nasser@codeaurora.org5d63eb82010-03-24 23:22:09 +0000659 """Get the base revision of a SVN repository.
660
661 Returns:
662 Int base revision
663 """
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000664 return SVN.CaptureLocalInfo([], cwd).get('Revision')
nasser@codeaurora.org5d63eb82010-03-24 23:22:09 +0000665
666 @staticmethod
maruel@chromium.orgea15cb72012-05-04 14:16:31 +0000667 def CaptureStatus(files, cwd, no_ignore=False):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000668 """Returns the svn 1.5 svn status emulated output.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000669
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000670 @files can be a string (one file) or a list of files.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000671
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000672 Returns an array of (status, file) tuples."""
673 command = ["status", "--xml"]
maruel@chromium.orgea15cb72012-05-04 14:16:31 +0000674 if no_ignore:
675 command.append('--no-ignore')
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000676 if not files:
677 pass
678 elif isinstance(files, basestring):
679 command.append(files)
680 else:
681 command.extend(files)
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000682
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000683 status_letter = {
684 None: ' ',
685 '': ' ',
686 'added': 'A',
687 'conflicted': 'C',
688 'deleted': 'D',
689 'external': 'X',
690 'ignored': 'I',
691 'incomplete': '!',
692 'merged': 'G',
693 'missing': '!',
694 'modified': 'M',
695 'none': ' ',
696 'normal': ' ',
697 'obstructed': '~',
698 'replaced': 'R',
699 'unversioned': '?',
700 }
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000701 dom = ElementTree.XML(SVN.Capture(command, cwd))
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000702 results = []
maruel@chromium.orgade9c592011-04-07 15:59:11 +0000703 if dom is None:
704 return results
705 # /status/target/entry/(wc-status|commit|author|date)
706 for target in dom.findall('target'):
707 for entry in target.findall('entry'):
708 file_path = entry.attrib['path']
709 wc_status = entry.find('wc-status')
710 # Emulate svn 1.5 status ouput...
711 statuses = [' '] * 7
712 # Col 0
713 xml_item_status = wc_status.attrib['item']
714 if xml_item_status in status_letter:
715 statuses[0] = status_letter[xml_item_status]
716 else:
717 raise gclient_utils.Error(
718 'Unknown item status "%s"; please implement me!' %
719 xml_item_status)
720 # Col 1
721 xml_props_status = wc_status.attrib['props']
722 if xml_props_status == 'modified':
723 statuses[1] = 'M'
724 elif xml_props_status == 'conflicted':
725 statuses[1] = 'C'
726 elif (not xml_props_status or xml_props_status == 'none' or
727 xml_props_status == 'normal'):
728 pass
729 else:
730 raise gclient_utils.Error(
731 'Unknown props status "%s"; please implement me!' %
732 xml_props_status)
733 # Col 2
734 if wc_status.attrib.get('wc-locked') == 'true':
735 statuses[2] = 'L'
736 # Col 3
737 if wc_status.attrib.get('copied') == 'true':
738 statuses[3] = '+'
739 # Col 4
740 if wc_status.attrib.get('switched') == 'true':
741 statuses[4] = 'S'
742 # TODO(maruel): Col 5 and 6
743 item = (''.join(statuses), file_path)
744 results.append(item)
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000745 return results
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000746
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000747 @staticmethod
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000748 def IsMoved(filename, cwd):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000749 """Determine if a file has been added through svn mv"""
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000750 assert isinstance(filename, basestring)
751 return SVN.IsMovedInfo(SVN.CaptureLocalInfo([filename], cwd))
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000752
753 @staticmethod
754 def IsMovedInfo(info):
755 """Determine if a file has been added through svn mv"""
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000756 return (info.get('Copied From URL') and
757 info.get('Copied From Rev') and
758 info.get('Schedule') == 'add')
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000759
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000760 @staticmethod
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000761 def GetFileProperty(filename, property_name, cwd):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000762 """Returns the value of an SVN property for the given file.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000763
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000764 Args:
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000765 filename: The file to check
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000766 property_name: The name of the SVN property, e.g. "svn:mime-type"
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000767
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000768 Returns:
769 The value of the property, which will be the empty string if the property
770 is not set on the file. If the file is not under version control, the
771 empty string is also returned.
772 """
maruel@chromium.org54019f32010-09-09 13:50:11 +0000773 try:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000774 return SVN.Capture(['propget', property_name, filename], cwd)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000775 except subprocess2.CalledProcessError:
maruel@chromium.org54019f32010-09-09 13:50:11 +0000776 return ''
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000777
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000778 @staticmethod
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000779 def GenerateDiff(filenames, cwd, full_move, revision):
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000780 """Returns a string containing the diff for the given file list.
781
782 The files in the list should either be absolute paths or relative to the
783 given root. If no root directory is provided, the repository root will be
784 used.
785 The diff will always use relative paths.
786 """
maruel@chromium.org00fdcb32011-02-24 01:41:02 +0000787 assert isinstance(filenames, (list, tuple))
pkasting@chromium.org0db557c2013-04-24 23:44:23 +0000788 # If the user specified a custom diff command in their svn config file,
789 # then it'll be used when we do svn diff, which we don't want to happen
790 # since we want the unified diff.
791 if SVN.AssertVersion("1.7")[0]:
792 # On svn >= 1.7, the "--internal-diff" flag will solve this.
793 return SVN._GenerateDiffInternal(filenames, cwd, full_move, revision,
794 ["diff", "--internal-diff"],
795 ["diff", "--internal-diff"])
796 else:
797 # On svn < 1.7, the "--internal-diff" flag doesn't exist. Using
798 # --diff-cmd=diff doesn't always work, since e.g. Windows cmd users may
799 # not have a "diff" executable in their path at all. So we use an empty
800 # temporary directory as the config directory, which bypasses any user
801 # settings for the diff-cmd. However, we don't pass this for the
802 # remote_safe_diff_command parameter, since when a new config-dir is
803 # specified for an svn diff against a remote URL, it triggers
804 # authentication prompts. In this case there isn't really a good
805 # alternative to svn 1.7's --internal-diff flag.
806 bogus_dir = tempfile.mkdtemp()
807 try:
808 return SVN._GenerateDiffInternal(filenames, cwd, full_move, revision,
809 ["diff", "--config-dir", bogus_dir],
810 ["diff"])
811 finally:
812 gclient_utils.rmtree(bogus_dir)
813
814 @staticmethod
815 def _GenerateDiffInternal(filenames, cwd, full_move, revision, diff_command,
816 remote_safe_diff_command):
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000817 root = os.path.normcase(os.path.join(cwd, ''))
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000818 def RelativePath(path, root):
819 """We must use relative paths."""
maruel@chromium.orgfd9cbbb2010-01-08 23:04:03 +0000820 if os.path.normcase(path).startswith(root):
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000821 return path[len(root):]
822 return path
pkasting@chromium.org0db557c2013-04-24 23:44:23 +0000823 # Cleanup filenames
824 filenames = [RelativePath(f, root) for f in filenames]
825 # Get information about the modified items (files and directories)
826 data = dict((f, SVN.CaptureLocalInfo([f], root)) for f in filenames)
827 diffs = []
828 if full_move:
829 # Eliminate modified files inside moved/copied directory.
830 for (filename, info) in data.iteritems():
831 if SVN.IsMovedInfo(info) and info.get("Node Kind") == "directory":
832 # Remove files inside the directory.
833 filenames = [f for f in filenames
834 if not f.startswith(filename + os.path.sep)]
835 for filename in data.keys():
836 if not filename in filenames:
837 # Remove filtered out items.
838 del data[filename]
839 else:
840 metaheaders = []
841 for (filename, info) in data.iteritems():
842 if SVN.IsMovedInfo(info):
843 # for now, the most common case is a head copy,
844 # so let's just encode that as a straight up cp.
845 srcurl = info.get('Copied From URL')
846 file_root = info.get('Repository Root')
847 rev = int(info.get('Copied From Rev'))
848 assert srcurl.startswith(file_root)
849 src = srcurl[len(file_root)+1:]
850 try:
851 srcinfo = SVN.CaptureRemoteInfo(srcurl)
852 except subprocess2.CalledProcessError, e:
853 if not 'Not a valid URL' in e.stderr:
854 raise
855 # Assume the file was deleted. No idea how to figure out at which
856 # revision the file was deleted.
857 srcinfo = {'Revision': rev}
858 if (srcinfo.get('Revision') != rev and
859 SVN.Capture(remote_safe_diff_command + ['-r', '%d:head' % rev,
860 srcurl], cwd)):
861 metaheaders.append("#$ svn cp -r %d %s %s "
862 "### WARNING: note non-trunk copy\n" %
863 (rev, src, filename))
864 else:
865 metaheaders.append("#$ cp %s %s\n" % (src,
866 filename))
867 if metaheaders:
868 diffs.append("### BEGIN SVN COPY METADATA\n")
869 diffs.extend(metaheaders)
870 diffs.append("### END SVN COPY METADATA\n")
871 # Now ready to do the actual diff.
872 for filename in sorted(data):
873 diffs.append(SVN._DiffItemInternal(
874 filename, cwd, data[filename], diff_command, full_move, revision))
875 # Use StringIO since it can be messy when diffing a directory move with
876 # full_move=True.
877 buf = cStringIO.StringIO()
878 for d in filter(None, diffs):
879 buf.write(d)
880 result = buf.getvalue()
881 buf.close()
882 return result
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000883
884 @staticmethod
pkasting@chromium.org0db557c2013-04-24 23:44:23 +0000885 def _DiffItemInternal(filename, cwd, info, diff_command, full_move, revision):
pkasting@chromium.org917ea7f2013-04-19 20:10:03 +0000886 """Grabs the diff data."""
pkasting@chromium.org0db557c2013-04-24 23:44:23 +0000887 command = diff_command + [filename]
pkasting@chromium.org917ea7f2013-04-19 20:10:03 +0000888 if revision:
889 command.extend(['--revision', revision])
890 data = None
891 if SVN.IsMovedInfo(info):
892 if full_move:
893 if info.get("Node Kind") == "directory":
894 # Things become tricky here. It's a directory copy/move. We need to
895 # diff all the files inside it.
896 # This will put a lot of pressure on the heap. This is why StringIO
897 # is used and converted back into a string at the end. The reason to
898 # return a string instead of a StringIO is that StringIO.write()
899 # doesn't accept a StringIO object. *sigh*.
900 for (dirpath, dirnames, filenames) in os.walk(filename):
901 # Cleanup all files starting with a '.'.
902 for d in dirnames:
903 if d.startswith('.'):
904 dirnames.remove(d)
905 for f in filenames:
906 if f.startswith('.'):
907 filenames.remove(f)
908 for f in filenames:
909 if data is None:
910 data = cStringIO.StringIO()
911 data.write(GenFakeDiff(os.path.join(dirpath, f)))
912 if data:
913 tmp = data.getvalue()
914 data.close()
915 data = tmp
916 else:
917 data = GenFakeDiff(filename)
918 else:
919 if info.get("Node Kind") != "directory":
920 # svn diff on a mv/cp'd file outputs nothing if there was no change.
921 data = SVN.Capture(command, cwd)
922 if not data:
923 # We put in an empty Index entry so upload.py knows about them.
924 data = "Index: %s\n" % filename.replace(os.sep, '/')
925 # Otherwise silently ignore directories.
926 else:
927 if info.get("Node Kind") != "directory":
928 # Normal simple case.
929 try:
930 data = SVN.Capture(command, cwd)
931 except subprocess2.CalledProcessError:
932 if revision:
933 data = GenFakeDiff(filename)
934 else:
935 raise
936 # Otherwise silently ignore directories.
937 return data
938
939 @staticmethod
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000940 def GetEmail(cwd):
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000941 """Retrieves the svn account which we assume is an email address."""
maruel@chromium.org54019f32010-09-09 13:50:11 +0000942 try:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000943 infos = SVN.CaptureLocalInfo([], cwd)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000944 except subprocess2.CalledProcessError:
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000945 return None
946
947 # Should check for uuid but it is incorrectly saved for https creds.
maruel@chromium.org54019f32010-09-09 13:50:11 +0000948 root = infos['Repository Root']
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000949 realm = root.rsplit('/', 1)[0]
maruel@chromium.org54019f32010-09-09 13:50:11 +0000950 uuid = infos['UUID']
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000951 if root.startswith('https') or not uuid:
952 regexp = re.compile(r'<%s:\d+>.*' % realm)
953 else:
954 regexp = re.compile(r'<%s:\d+> %s' % (realm, uuid))
955 if regexp is None:
956 return None
957 if sys.platform.startswith('win'):
958 if not 'APPDATA' in os.environ:
959 return None
maruel@chromium.org720d9f32009-11-21 17:38:57 +0000960 auth_dir = os.path.join(os.environ['APPDATA'], 'Subversion', 'auth',
961 'svn.simple')
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000962 else:
963 if not 'HOME' in os.environ:
964 return None
965 auth_dir = os.path.join(os.environ['HOME'], '.subversion', 'auth',
966 'svn.simple')
967 for credfile in os.listdir(auth_dir):
968 cred_info = SVN.ReadSimpleAuth(os.path.join(auth_dir, credfile))
969 if regexp.match(cred_info.get('svn:realmstring')):
970 return cred_info.get('username')
971
972 @staticmethod
973 def ReadSimpleAuth(filename):
974 f = open(filename, 'r')
975 values = {}
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000976 def ReadOneItem(item_type):
977 m = re.match(r'%s (\d+)' % item_type, f.readline())
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000978 if not m:
979 return None
980 data = f.read(int(m.group(1)))
981 if f.read(1) != '\n':
982 return None
983 return data
984
985 while True:
986 key = ReadOneItem('K')
987 if not key:
988 break
989 value = ReadOneItem('V')
990 if not value:
991 break
992 values[key] = value
993 return values
maruel@chromium.org94b1ee92009-12-19 20:27:20 +0000994
995 @staticmethod
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000996 def GetCheckoutRoot(cwd):
maruel@chromium.org94b1ee92009-12-19 20:27:20 +0000997 """Returns the top level directory of the current repository.
998
999 The directory is returned as an absolute path.
1000 """
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001001 cwd = os.path.abspath(cwd)
maruel@chromium.org54019f32010-09-09 13:50:11 +00001002 try:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001003 info = SVN.CaptureLocalInfo([], cwd)
maruel@chromium.org885d6e82011-02-24 20:21:46 +00001004 cur_dir_repo_root = info['Repository Root']
1005 url = info['URL']
maruel@chromium.orgda64d632011-09-08 17:41:15 +00001006 except subprocess2.CalledProcessError:
maruel@chromium.org94b1ee92009-12-19 20:27:20 +00001007 return None
maruel@chromium.org94b1ee92009-12-19 20:27:20 +00001008 while True:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001009 parent = os.path.dirname(cwd)
maruel@chromium.org54019f32010-09-09 13:50:11 +00001010 try:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001011 info = SVN.CaptureLocalInfo([], parent)
maruel@chromium.org885d6e82011-02-24 20:21:46 +00001012 if (info['Repository Root'] != cur_dir_repo_root or
1013 info['URL'] != os.path.dirname(url)):
maruel@chromium.org54019f32010-09-09 13:50:11 +00001014 break
maruel@chromium.org885d6e82011-02-24 20:21:46 +00001015 url = info['URL']
maruel@chromium.orgda64d632011-09-08 17:41:15 +00001016 except subprocess2.CalledProcessError:
maruel@chromium.org94b1ee92009-12-19 20:27:20 +00001017 break
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001018 cwd = parent
1019 return GetCasedPath(cwd)
tony@chromium.org57564662010-04-14 02:35:12 +00001020
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +00001021 @staticmethod
1022 def IsValidRevision(url):
1023 """Verifies the revision looks like an SVN revision."""
1024 try:
1025 SVN.Capture(['info', url], cwd=None)
1026 return True
1027 except subprocess2.CalledProcessError:
1028 return False
1029
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001030 @classmethod
1031 def AssertVersion(cls, min_version):
tony@chromium.org57564662010-04-14 02:35:12 +00001032 """Asserts svn's version is at least min_version."""
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001033 if cls.current_version is None:
shouqun.liu@intel.com13b522c2012-07-20 17:16:51 +00001034 cls.current_version = cls.Capture(['--version', '--quiet'], None)
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001035 current_version_list = map(only_int, cls.current_version.split('.'))
tony@chromium.org57564662010-04-14 02:35:12 +00001036 for min_ver in map(int, min_version.split('.')):
1037 ver = current_version_list.pop(0)
1038 if ver < min_ver:
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001039 return (False, cls.current_version)
tony@chromium.org57564662010-04-14 02:35:12 +00001040 elif ver > min_ver:
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001041 return (True, cls.current_version)
1042 return (True, cls.current_version)
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001043
1044 @staticmethod
maruel@chromium.orgea15cb72012-05-04 14:16:31 +00001045 def Revert(cwd, callback=None, ignore_externals=False, no_ignore=False):
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001046 """Reverts all svn modifications in cwd, including properties.
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001047
1048 Deletes any modified files or directory.
1049
1050 A "svn update --revision BASE" call is required after to revive deleted
1051 files.
1052 """
maruel@chromium.orgea15cb72012-05-04 14:16:31 +00001053 for file_status in SVN.CaptureStatus(None, cwd, no_ignore=no_ignore):
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001054 file_path = os.path.join(cwd, file_status[1])
maruel@chromium.org8c415122011-03-15 17:14:27 +00001055 if (ignore_externals and
1056 file_status[0][0] == 'X' and
1057 file_status[0][1:].isspace()):
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001058 # Ignore externals.
1059 logging.info('Ignoring external %s' % file_status[1])
1060 continue
1061
maruel@chromium.org62087572012-04-24 23:16:28 +00001062 # This is the case where '! L .' is returned by 'svn status'. Just
1063 # strip off the '/.'.
1064 if file_path.endswith(os.path.sep + '.'):
1065 file_path = file_path[:-2]
1066
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001067 if callback:
1068 callback(file_status)
1069
maruel@chromium.org8c415122011-03-15 17:14:27 +00001070 if os.path.exists(file_path):
1071 # svn revert is really stupid. It fails on inconsistent line-endings,
1072 # on switched directories, etc. So take no chance and delete everything!
1073 # In theory, it wouldn't be necessary for property-only change but then
1074 # it'd have to look for switched directories, etc so it's not worth
1075 # optimizing this use case.
1076 if os.path.isfile(file_path) or os.path.islink(file_path):
1077 logging.info('os.remove(%s)' % file_path)
1078 os.remove(file_path)
1079 elif os.path.isdir(file_path):
digit@chromium.orgdc112ac2013-04-24 13:00:19 +00001080 logging.info('rmtree(%s)' % file_path)
1081 gclient_utils.rmtree(file_path)
maruel@chromium.org8c415122011-03-15 17:14:27 +00001082 else:
1083 logging.critical(
1084 ('No idea what is %s.\nYou just found a bug in gclient'
1085 ', please ping maruel@chromium.org ASAP!') % file_path)
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001086
maruel@chromium.org8c415122011-03-15 17:14:27 +00001087 if (file_status[0][0] in ('D', 'A', '!') or
1088 not file_status[0][1:].isspace()):
maruel@chromium.orgaf453492011-03-03 21:04:09 +00001089 # Added, deleted file requires manual intervention and require calling
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001090 # revert, like for properties.
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001091 if not os.path.isdir(cwd):
maruel@chromium.org8b322b32011-11-01 19:05:50 +00001092 # '.' was deleted. It's not worth continuing.
1093 return
maruel@chromium.orgaf453492011-03-03 21:04:09 +00001094 try:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001095 SVN.Capture(['revert', file_status[1]], cwd=cwd)
maruel@chromium.orgda64d632011-09-08 17:41:15 +00001096 except subprocess2.CalledProcessError:
maruel@chromium.orgaf453492011-03-03 21:04:09 +00001097 if not os.path.exists(file_path):
1098 continue
1099 raise