blob: 77a62994edc48de59987fd8aeee45bcbc4d02f74 [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
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +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(
maruel@chromium.org80a9ef12011-12-13 20:44:10 +0000102 ['git'] + args, cwd=cwd, stderr=subprocess2.PIPE, **kwargs)
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000103
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000104 @staticmethod
maruel@chromium.org80a9ef12011-12-13 20:44:10 +0000105 def CaptureStatus(files, cwd, upstream_branch):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000106 """Returns git status.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000107
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000108 @files can be a string (one file) or a list of files.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000109
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000110 Returns an array of (status, file) tuples."""
msb@chromium.org786fb682010-06-02 15:16:23 +0000111 if upstream_branch is None:
maruel@chromium.org80a9ef12011-12-13 20:44:10 +0000112 upstream_branch = GIT.GetUpstreamBranch(cwd)
msb@chromium.org786fb682010-06-02 15:16:23 +0000113 if upstream_branch is None:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000114 raise gclient_utils.Error('Cannot determine upstream branch')
115 command = ['diff', '--name-status', '-r', '%s...' % upstream_branch]
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000116 if not files:
117 pass
118 elif isinstance(files, basestring):
119 command.append(files)
120 else:
121 command.extend(files)
maruel@chromium.org80a9ef12011-12-13 20:44:10 +0000122 status = GIT.Capture(command, cwd).rstrip()
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000123 results = []
124 if status:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000125 for statusline in status.splitlines():
maruel@chromium.orgcc1614b2010-09-20 17:13:17 +0000126 # 3-way merges can cause the status can be 'MMM' instead of 'M'. This
127 # can happen when the user has 2 local branches and he diffs between
128 # these 2 branches instead diffing to upstream.
129 m = re.match('^(\w)+\t(.+)$', statusline)
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000130 if not m:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000131 raise gclient_utils.Error(
132 'status currently unsupported: %s' % statusline)
maruel@chromium.orgcc1614b2010-09-20 17:13:17 +0000133 # Only grab the first letter.
134 results.append(('%s ' % m.group(1)[0], m.group(2)))
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000135 return results
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000136
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000137 @staticmethod
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000138 def GetEmail(cwd):
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000139 """Retrieves the user email address if known."""
140 # We could want to look at the svn cred when it has a svn remote but it
141 # should be fine for now, users should simply configure their git settings.
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000142 try:
143 return GIT.Capture(['config', 'user.email'], cwd=cwd).strip()
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000144 except subprocess2.CalledProcessError:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000145 return ''
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000146
147 @staticmethod
148 def ShortBranchName(branch):
149 """Converts a name like 'refs/heads/foo' to just 'foo'."""
150 return branch.replace('refs/heads/', '')
151
152 @staticmethod
153 def GetBranchRef(cwd):
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000154 """Returns the full branch reference, e.g. 'refs/heads/master'."""
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000155 return GIT.Capture(['symbolic-ref', 'HEAD'], cwd=cwd).strip()
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000156
157 @staticmethod
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000158 def GetBranch(cwd):
159 """Returns the short branch name, e.g. 'master'."""
maruel@chromium.orgc308a742009-12-22 18:29:33 +0000160 return GIT.ShortBranchName(GIT.GetBranchRef(cwd))
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000161
162 @staticmethod
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000163 def IsGitSvn(cwd):
164 """Returns true if this repo looks like it's using git-svn."""
165 # If you have any "svn-remote.*" config keys, we think you're using svn.
166 try:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000167 GIT.Capture(['config', '--get-regexp', r'^svn-remote\.'], cwd=cwd)
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000168 return True
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000169 except subprocess2.CalledProcessError:
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000170 return False
171
172 @staticmethod
bauerb@chromium.org866276c2011-03-18 20:09:31 +0000173 def MatchSvnGlob(url, base_url, glob_spec, allow_wildcards):
174 """Return the corresponding git ref if |base_url| together with |glob_spec|
175 matches the full |url|.
176
177 If |allow_wildcards| is true, |glob_spec| can contain wildcards (see below).
178 """
179 fetch_suburl, as_ref = glob_spec.split(':')
180 if allow_wildcards:
181 glob_match = re.match('(.+/)?(\*|{[^/]*})(/.+)?', fetch_suburl)
182 if glob_match:
183 # Parse specs like "branches/*/src:refs/remotes/svn/*" or
184 # "branches/{472,597,648}/src:refs/remotes/svn/*".
185 branch_re = re.escape(base_url)
186 if glob_match.group(1):
187 branch_re += '/' + re.escape(glob_match.group(1))
188 wildcard = glob_match.group(2)
189 if wildcard == '*':
190 branch_re += '([^/]*)'
191 else:
192 # Escape and replace surrounding braces with parentheses and commas
193 # with pipe symbols.
194 wildcard = re.escape(wildcard)
195 wildcard = re.sub('^\\\\{', '(', wildcard)
196 wildcard = re.sub('\\\\,', '|', wildcard)
197 wildcard = re.sub('\\\\}$', ')', wildcard)
198 branch_re += wildcard
199 if glob_match.group(3):
200 branch_re += re.escape(glob_match.group(3))
201 match = re.match(branch_re, url)
202 if match:
203 return re.sub('\*$', match.group(1), as_ref)
204
205 # Parse specs like "trunk/src:refs/remotes/origin/trunk".
206 if fetch_suburl:
207 full_url = base_url + '/' + fetch_suburl
208 else:
209 full_url = base_url
210 if full_url == url:
211 return as_ref
212 return None
213
214 @staticmethod
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000215 def GetSVNBranch(cwd):
216 """Returns the svn branch name if found."""
217 # Try to figure out which remote branch we're based on.
218 # Strategy:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000219 # 1) iterate through our branch history and find the svn URL.
220 # 2) find the svn-remote that fetches from the URL.
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000221
222 # regexp matching the git-svn line that contains the URL.
223 git_svn_re = re.compile(r'^\s*git-svn-id: (\S+)@', re.MULTILINE)
224
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000225 # We don't want to go through all of history, so read a line from the
226 # pipe at a time.
227 # The -100 is an arbitrary limit so we don't search forever.
228 cmd = ['git', 'log', '-100', '--pretty=medium']
maruel@chromium.orgf94e3f12011-12-13 21:03:46 +0000229 proc = subprocess2.Popen(cmd, cwd=cwd, stdout=subprocess2.PIPE)
maruel@chromium.orge8c28622011-04-05 14:41:44 +0000230 url = None
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000231 for line in proc.stdout:
232 match = git_svn_re.match(line)
233 if match:
234 url = match.group(1)
235 proc.stdout.close() # Cut pipe.
236 break
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000237
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000238 if url:
239 svn_remote_re = re.compile(r'^svn-remote\.([^.]+)\.url (.*)$')
maruel@chromium.org80a9ef12011-12-13 20:44:10 +0000240 remotes = GIT.Capture(
241 ['config', '--get-regexp', r'^svn-remote\..*\.url'],
242 cwd=cwd).splitlines()
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000243 for remote in remotes:
244 match = svn_remote_re.match(remote)
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000245 if match:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000246 remote = match.group(1)
247 base_url = match.group(2)
bauerb@chromium.org866276c2011-03-18 20:09:31 +0000248 try:
249 fetch_spec = GIT.Capture(
250 ['config', 'svn-remote.%s.fetch' % remote],
251 cwd=cwd).strip()
252 branch = GIT.MatchSvnGlob(url, base_url, fetch_spec, False)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000253 except subprocess2.CalledProcessError:
bauerb@chromium.org866276c2011-03-18 20:09:31 +0000254 branch = None
255 if branch:
256 return branch
257 try:
258 branch_spec = GIT.Capture(
259 ['config', 'svn-remote.%s.branches' % remote],
260 cwd=cwd).strip()
261 branch = GIT.MatchSvnGlob(url, base_url, branch_spec, True)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000262 except subprocess2.CalledProcessError:
bauerb@chromium.org866276c2011-03-18 20:09:31 +0000263 branch = None
264 if branch:
265 return branch
266 try:
267 tag_spec = GIT.Capture(
268 ['config', 'svn-remote.%s.tags' % remote],
269 cwd=cwd).strip()
270 branch = GIT.MatchSvnGlob(url, base_url, tag_spec, True)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000271 except subprocess2.CalledProcessError:
bauerb@chromium.org866276c2011-03-18 20:09:31 +0000272 branch = None
273 if branch:
274 return branch
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000275
276 @staticmethod
277 def FetchUpstreamTuple(cwd):
278 """Returns a tuple containg remote and remote ref,
279 e.g. 'origin', 'refs/heads/master'
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000280 Tries to be intelligent and understand git-svn.
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000281 """
282 remote = '.'
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000283 branch = GIT.GetBranch(cwd)
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000284 try:
285 upstream_branch = GIT.Capture(
286 ['config', 'branch.%s.merge' % branch], cwd=cwd).strip()
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000287 except subprocess2.CalledProcessError:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000288 upstream_branch = None
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000289 if upstream_branch:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000290 try:
291 remote = GIT.Capture(
292 ['config', 'branch.%s.remote' % branch], cwd=cwd).strip()
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000293 except subprocess2.CalledProcessError:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000294 pass
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000295 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000296 try:
297 upstream_branch = GIT.Capture(
298 ['config', 'rietveld.upstream-branch'], cwd=cwd).strip()
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000299 except subprocess2.CalledProcessError:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000300 upstream_branch = None
301 if upstream_branch:
302 try:
303 remote = GIT.Capture(
304 ['config', 'rietveld.upstream-remote'], cwd=cwd).strip()
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000305 except subprocess2.CalledProcessError:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000306 pass
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000307 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000308 # Fall back on trying a git-svn upstream branch.
309 if GIT.IsGitSvn(cwd):
310 upstream_branch = GIT.GetSVNBranch(cwd)
maruel@chromium.orga630bd72010-04-29 23:32:34 +0000311 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000312 # Else, try to guess the origin remote.
313 remote_branches = GIT.Capture(['branch', '-r'], cwd=cwd).split()
314 if 'origin/master' in remote_branches:
315 # Fall back on origin/master if it exits.
316 remote = 'origin'
317 upstream_branch = 'refs/heads/master'
318 elif 'origin/trunk' in remote_branches:
319 # Fall back on origin/trunk if it exists. Generally a shared
320 # git-svn clone
321 remote = 'origin'
322 upstream_branch = 'refs/heads/trunk'
323 else:
324 # Give up.
325 remote = None
326 upstream_branch = None
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000327 return remote, upstream_branch
328
329 @staticmethod
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000330 def GetUpstreamBranch(cwd):
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000331 """Gets the current branch's upstream branch."""
332 remote, upstream_branch = GIT.FetchUpstreamTuple(cwd)
maruel@chromium.orga630bd72010-04-29 23:32:34 +0000333 if remote != '.' and upstream_branch:
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000334 upstream_branch = upstream_branch.replace('heads', 'remotes/' + remote)
335 return upstream_branch
336
337 @staticmethod
maruel@chromium.org8ede00e2010-01-12 14:35:28 +0000338 def GenerateDiff(cwd, branch=None, branch_head='HEAD', full_move=False,
339 files=None):
maruel@chromium.orga9371762009-12-22 18:27:38 +0000340 """Diffs against the upstream branch or optionally another branch.
341
342 full_move means that move or copy operations should completely recreate the
343 files, usually in the prospect to apply the patch for a try job."""
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000344 if not branch:
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000345 branch = GIT.GetUpstreamBranch(cwd)
scottbyer@chromium.org33167332012-02-23 21:15:30 +0000346 command = ['diff', '-p', '--no-color', '--no-prefix', '--no-ext-diff',
evan@chromium.org400f3e72010-05-19 14:23:36 +0000347 branch + "..." + branch_head]
maruel@chromium.orga9371762009-12-22 18:27:38 +0000348 if not full_move:
349 command.append('-C')
maruel@chromium.org8ede00e2010-01-12 14:35:28 +0000350 # TODO(maruel): --binary support.
351 if files:
352 command.append('--')
353 command.extend(files)
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000354 diff = GIT.Capture(command, cwd=cwd).splitlines(True)
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000355 for i in range(len(diff)):
356 # In the case of added files, replace /dev/null with the path to the
357 # file being added.
358 if diff[i].startswith('--- /dev/null'):
359 diff[i] = '--- %s' % diff[i+1][4:]
360 return ''.join(diff)
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000361
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000362 @staticmethod
maruel@chromium.org8ede00e2010-01-12 14:35:28 +0000363 def GetDifferentFiles(cwd, branch=None, branch_head='HEAD'):
364 """Returns the list of modified files between two branches."""
365 if not branch:
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000366 branch = GIT.GetUpstreamBranch(cwd)
bauerb@chromium.org838f0f22010-04-09 17:02:50 +0000367 command = ['diff', '--name-only', branch + "..." + branch_head]
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000368 return GIT.Capture(command, cwd=cwd).splitlines(False)
maruel@chromium.org8ede00e2010-01-12 14:35:28 +0000369
370 @staticmethod
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000371 def GetPatchName(cwd):
372 """Constructs a name for this patch."""
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000373 short_sha = GIT.Capture(['rev-parse', '--short=4', 'HEAD'], cwd=cwd).strip()
maruel@chromium.org862ff8e2010-08-06 15:29:16 +0000374 return "%s#%s" % (GIT.GetBranch(cwd), short_sha)
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000375
376 @staticmethod
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000377 def GetCheckoutRoot(cwd):
maruel@chromium.org01d8c1d2010-01-07 01:56:59 +0000378 """Returns the top level directory of a git checkout as an absolute path.
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000379 """
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000380 root = GIT.Capture(['rev-parse', '--show-cdup'], cwd=cwd).strip()
381 return os.path.abspath(os.path.join(cwd, root))
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000382
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000383 @staticmethod
384 def GetGitSvnHeadRev(cwd):
385 """Gets the most recently pulled git-svn revision."""
386 try:
387 output = GIT.Capture(['svn', 'info'], cwd=cwd)
388 match = re.search(r'^Revision: ([0-9]+)$', output, re.MULTILINE)
389 return int(match.group(1)) if match else None
390 except (subprocess2.CalledProcessError, ValueError):
391 return None
392
393 @staticmethod
wittman@chromium.org492a3682012-08-10 00:28:28 +0000394 def ParseGitSvnSha1(output):
395 """Parses git-svn output for the first sha1."""
396 match = re.search(r'[0-9a-fA-F]{40}', output)
397 return match.group(0) if match else None
398
399 @staticmethod
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000400 def GetSha1ForSvnRev(cwd, rev):
401 """Returns a corresponding git sha1 for a SVN revision."""
402 if not GIT.IsGitSvn(cwd=cwd):
403 return None
404 try:
szager@google.com312a6a42012-10-11 21:19:42 +0000405 git_svn_rev = GIT.Capture(
406 ['svn', 'find-rev', 'r' + str(rev)], cwd=cwd).rstrip()
407 if not git_svn_rev:
408 return None
409 output = GIT.Capture(
410 ['rev-list', '--ancestry-path', '--reverse',
411 '--grep', 'SVN changes up to revision [0-9]*',
412 '%s..refs/remotes/origin/master' % git_svn_rev], cwd=cwd)
413 if not output:
414 return None
415 sha1 = output.splitlines()[0]
416 if not sha1:
417 return None
418 output = GIT.Capture(['rev-list', '-n', '1', '%s^1' % sha1], cwd=cwd)
419 if git_svn_rev != output.rstrip():
420 raise gclient_utils.Error(sha1)
421 return sha1
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000422 except subprocess2.CalledProcessError:
423 return None
424
425 @staticmethod
426 def IsValidRevision(cwd, rev):
427 """Verifies the revision is a proper git revision."""
maruel@chromium.org81473862012-06-27 17:30:56 +0000428 # 'git rev-parse foo' where foo is *any* 40 character hex string will return
429 # the string and return code 0. So strip one character to force 'git
430 # rev-parse' to do a hash table look-up and returns 128 if the hash is not
431 # present.
432 if re.match(r'^[0-9a-fA-F]{40}$', rev):
433 rev = rev[:-1]
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000434 try:
435 GIT.Capture(['rev-parse', rev], cwd=cwd)
436 return True
437 except subprocess2.CalledProcessError:
438 return False
439
maruel@chromium.org36ac2392011-10-12 16:36:11 +0000440 @classmethod
441 def AssertVersion(cls, min_version):
maruel@chromium.orgd0f854a2010-03-11 19:35:53 +0000442 """Asserts git's version is at least min_version."""
maruel@chromium.org36ac2392011-10-12 16:36:11 +0000443 if cls.current_version is None:
bashi@chromium.orgfcffd482012-02-24 01:47:00 +0000444 current_version = cls.Capture(['--version'], '.')
445 matched = re.search(r'version ([0-9\.]+)', current_version)
446 cls.current_version = matched.group(1)
maruel@chromium.org36ac2392011-10-12 16:36:11 +0000447 current_version_list = map(only_int, cls.current_version.split('.'))
maruel@chromium.orgd0f854a2010-03-11 19:35:53 +0000448 for min_ver in map(int, min_version.split('.')):
449 ver = current_version_list.pop(0)
450 if ver < min_ver:
maruel@chromium.org36ac2392011-10-12 16:36:11 +0000451 return (False, cls.current_version)
maruel@chromium.orgd0f854a2010-03-11 19:35:53 +0000452 elif ver > min_ver:
maruel@chromium.org36ac2392011-10-12 16:36:11 +0000453 return (True, cls.current_version)
454 return (True, cls.current_version)
maruel@chromium.orgd0f854a2010-03-11 19:35:53 +0000455
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000456
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000457class SVN(object):
tony@chromium.org57564662010-04-14 02:35:12 +0000458 current_version = None
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000459
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000460 @staticmethod
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000461 def Capture(args, cwd, **kwargs):
maruel@chromium.org54019f32010-09-09 13:50:11 +0000462 """Always redirect stderr.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000463
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000464 Throws an exception if non-0 is returned.
465 """
maruel@chromium.org904af082011-09-08 22:06:09 +0000466 return subprocess2.check_output(
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000467 ['svn'] + args, stderr=subprocess2.PIPE, cwd=cwd, **kwargs)
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000468
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000469 @staticmethod
maruel@chromium.org2b9aa8e2010-08-25 20:01:42 +0000470 def RunAndGetFileList(verbose, args, cwd, file_list, stdout=None):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000471 """Runs svn checkout, update, or status, output to stdout.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000472
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000473 The first item in args must be either "checkout", "update", or "status".
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000474
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000475 svn's stdout is parsed to collect a list of files checked out or updated.
476 These files are appended to file_list. svn's stdout is also printed to
477 sys.stdout as in Run.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000478
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000479 Args:
maruel@chromium.org03807072010-08-16 17:18:44 +0000480 verbose: If True, uses verbose output
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000481 args: A sequence of command line parameters to be passed to svn.
maruel@chromium.org2b9aa8e2010-08-25 20:01:42 +0000482 cwd: The directory where svn is to be run.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000483
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000484 Raises:
485 Error: An error occurred while running the svn command.
486 """
maruel@chromium.org2b9aa8e2010-08-25 20:01:42 +0000487 stdout = stdout or sys.stdout
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000488
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000489 # svn update and svn checkout use the same pattern: the first three columns
490 # are for file status, property status, and lock status. This is followed
491 # by two spaces, and then the path to the file.
492 update_pattern = '^... (.*)$'
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000493
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000494 # The first three columns of svn status are the same as for svn update and
495 # svn checkout. The next three columns indicate addition-with-history,
496 # switch, and remote lock status. This is followed by one space, and then
497 # the path to the file.
498 status_pattern = '^...... (.*)$'
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000499
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000500 # args[0] must be a supported command. This will blow up if it's something
501 # else, which is good. Note that the patterns are only effective when
502 # these commands are used in their ordinary forms, the patterns are invalid
503 # for "svn status --show-updates", for example.
504 pattern = {
505 'checkout': update_pattern,
506 'status': status_pattern,
507 'update': update_pattern,
508 }[args[0]]
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000509 compiled_pattern = re.compile(pattern)
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000510 # Place an upper limit.
cbentzel@chromium.org2aee2292010-09-03 14:15:25 +0000511 backoff_time = 5
maruel@chromium.orgbec588d2010-10-26 13:50:25 +0000512 retries = 0
maruel@chromium.org03507062010-10-26 00:58:27 +0000513 while True:
maruel@chromium.orgbec588d2010-10-26 13:50:25 +0000514 retries += 1
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000515 previous_list_len = len(file_list)
516 failure = []
maruel@chromium.org54d1f1a2010-01-08 19:53:47 +0000517
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000518 def CaptureMatchingLines(line):
519 match = compiled_pattern.search(line)
520 if match:
521 file_list.append(match.group(1))
522 if line.startswith('svn: '):
maruel@chromium.org8599aa72010-02-08 20:27:14 +0000523 failure.append(line)
maruel@chromium.org54d1f1a2010-01-08 19:53:47 +0000524
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000525 try:
maruel@chromium.org17d01792010-09-01 18:07:10 +0000526 gclient_utils.CheckCallAndFilterAndHeader(
527 ['svn'] + args,
528 cwd=cwd,
529 always=verbose,
530 filter_fn=CaptureMatchingLines,
531 stdout=stdout)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000532 except subprocess2.CalledProcessError:
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000533 def IsKnownFailure():
534 for x in failure:
535 if (x.startswith('svn: OPTIONS of') or
536 x.startswith('svn: PROPFIND of') or
537 x.startswith('svn: REPORT of') or
maruel@chromium.orgf61fc932010-08-19 13:05:24 +0000538 x.startswith('svn: Unknown hostname') or
maruel@chromium.org7d8b97d2011-10-11 23:32:30 +0000539 x.startswith('svn: Server sent unexpected return value') or
540 x.startswith('svn: Can\'t connect to host')):
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000541 return True
542 return False
543
maruel@chromium.org953586a2010-06-15 14:22:24 +0000544 # Subversion client is really misbehaving with Google Code.
545 if args[0] == 'checkout':
546 # Ensure at least one file was checked out, otherwise *delete* the
547 # directory.
548 if len(file_list) == previous_list_len:
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000549 if not IsKnownFailure():
maruel@chromium.org953586a2010-06-15 14:22:24 +0000550 # No known svn error was found, bail out.
551 raise
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000552 # No file were checked out, so make sure the directory is
553 # deleted in case it's messed up and try again.
554 # Warning: It's bad, it assumes args[2] is the directory
555 # argument.
556 if os.path.isdir(args[2]):
557 gclient_utils.RemoveDirectory(args[2])
maruel@chromium.org953586a2010-06-15 14:22:24 +0000558 else:
559 # Progress was made, convert to update since an aborted checkout
560 # is now an update.
maruel@chromium.org2de10252010-02-08 01:10:39 +0000561 args = ['update'] + args[1:]
maruel@chromium.org953586a2010-06-15 14:22:24 +0000562 else:
563 # It was an update or export.
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000564 # We enforce that some progress has been made or a known failure.
565 if len(file_list) == previous_list_len and not IsKnownFailure():
566 # No known svn error was found and no progress, bail out.
567 raise
maruel@chromium.orgbec588d2010-10-26 13:50:25 +0000568 if retries == 10:
maruel@chromium.org03507062010-10-26 00:58:27 +0000569 raise
cbentzel@chromium.org2aee2292010-09-03 14:15:25 +0000570 print "Sleeping %.1f seconds and retrying...." % backoff_time
571 time.sleep(backoff_time)
572 backoff_time *= 1.3
maruel@chromium.org953586a2010-06-15 14:22:24 +0000573 continue
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000574 break
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000575
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000576 @staticmethod
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000577 def CaptureRemoteInfo(url):
578 """Returns a dictionary from the svn info output for the given url.
579
580 Throws an exception if svn info fails.
581 """
582 assert isinstance(url, str)
583 return SVN._CaptureInfo([url], None)
584
585 @staticmethod
586 def CaptureLocalInfo(files, cwd):
587 """Returns a dictionary from the svn info output for the given files.
588
589 Throws an exception if svn info fails.
590 """
591 assert isinstance(files, (list, tuple))
592 return SVN._CaptureInfo(files, cwd)
593
594 @staticmethod
595 def _CaptureInfo(files, cwd):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000596 """Returns a dictionary from the svn info output for the given file.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000597
maruel@chromium.org54019f32010-09-09 13:50:11 +0000598 Throws an exception if svn info fails."""
maruel@chromium.orgd25fb8f2011-04-07 13:40:15 +0000599 result = {}
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000600 info = ElementTree.XML(SVN.Capture(['info', '--xml'] + files, cwd))
maruel@chromium.orgade9c592011-04-07 15:59:11 +0000601 if info is None:
602 return result
603 entry = info.find('entry')
maruel@chromium.org6f323bb2011-04-26 15:42:53 +0000604 if entry is None:
605 return result
maruel@chromium.orgade9c592011-04-07 15:59:11 +0000606
607 # Use .text when the item is not optional.
608 result['Path'] = entry.attrib['path']
maruel@chromium.org7d654672012-01-05 19:07:23 +0000609 rev = entry.attrib['revision']
610 try:
611 result['Revision'] = int(rev)
612 except ValueError:
613 result['Revision'] = None
maruel@chromium.orgade9c592011-04-07 15:59:11 +0000614 result['Node Kind'] = entry.attrib['kind']
615 # Differs across versions.
616 if result['Node Kind'] == 'dir':
617 result['Node Kind'] = 'directory'
618 result['URL'] = entry.find('url').text
619 repository = entry.find('repository')
620 result['Repository Root'] = repository.find('root').text
621 result['UUID'] = repository.find('uuid')
622 wc_info = entry.find('wc-info')
623 if wc_info is not None:
624 result['Schedule'] = wc_info.find('schedule').text
625 result['Copied From URL'] = wc_info.find('copy-from-url')
626 result['Copied From Rev'] = wc_info.find('copy-from-rev')
627 else:
628 result['Schedule'] = None
629 result['Copied From URL'] = None
630 result['Copied From Rev'] = None
631 for key in result.keys():
632 if isinstance(result[key], unicode):
633 # Unicode results interferes with the higher layers matching up things
634 # in the deps dictionary.
635 result[key] = result[key].encode()
636 # Automatic conversion of optional parameters.
637 result[key] = getattr(result[key], 'text', result[key])
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000638 return result
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000639
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000640 @staticmethod
maruel@chromium.org54019f32010-09-09 13:50:11 +0000641 def CaptureRevision(cwd):
nasser@codeaurora.org5d63eb82010-03-24 23:22:09 +0000642 """Get the base revision of a SVN repository.
643
644 Returns:
645 Int base revision
646 """
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000647 return SVN.CaptureLocalInfo([], cwd).get('Revision')
nasser@codeaurora.org5d63eb82010-03-24 23:22:09 +0000648
649 @staticmethod
maruel@chromium.orgea15cb72012-05-04 14:16:31 +0000650 def CaptureStatus(files, cwd, no_ignore=False):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000651 """Returns the svn 1.5 svn status emulated output.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000652
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000653 @files can be a string (one file) or a list of files.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000654
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000655 Returns an array of (status, file) tuples."""
656 command = ["status", "--xml"]
maruel@chromium.orgea15cb72012-05-04 14:16:31 +0000657 if no_ignore:
658 command.append('--no-ignore')
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000659 if not files:
660 pass
661 elif isinstance(files, basestring):
662 command.append(files)
663 else:
664 command.extend(files)
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000665
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000666 status_letter = {
667 None: ' ',
668 '': ' ',
669 'added': 'A',
670 'conflicted': 'C',
671 'deleted': 'D',
672 'external': 'X',
673 'ignored': 'I',
674 'incomplete': '!',
675 'merged': 'G',
676 'missing': '!',
677 'modified': 'M',
678 'none': ' ',
679 'normal': ' ',
680 'obstructed': '~',
681 'replaced': 'R',
682 'unversioned': '?',
683 }
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000684 dom = ElementTree.XML(SVN.Capture(command, cwd))
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000685 results = []
maruel@chromium.orgade9c592011-04-07 15:59:11 +0000686 if dom is None:
687 return results
688 # /status/target/entry/(wc-status|commit|author|date)
689 for target in dom.findall('target'):
690 for entry in target.findall('entry'):
691 file_path = entry.attrib['path']
692 wc_status = entry.find('wc-status')
693 # Emulate svn 1.5 status ouput...
694 statuses = [' '] * 7
695 # Col 0
696 xml_item_status = wc_status.attrib['item']
697 if xml_item_status in status_letter:
698 statuses[0] = status_letter[xml_item_status]
699 else:
700 raise gclient_utils.Error(
701 'Unknown item status "%s"; please implement me!' %
702 xml_item_status)
703 # Col 1
704 xml_props_status = wc_status.attrib['props']
705 if xml_props_status == 'modified':
706 statuses[1] = 'M'
707 elif xml_props_status == 'conflicted':
708 statuses[1] = 'C'
709 elif (not xml_props_status or xml_props_status == 'none' or
710 xml_props_status == 'normal'):
711 pass
712 else:
713 raise gclient_utils.Error(
714 'Unknown props status "%s"; please implement me!' %
715 xml_props_status)
716 # Col 2
717 if wc_status.attrib.get('wc-locked') == 'true':
718 statuses[2] = 'L'
719 # Col 3
720 if wc_status.attrib.get('copied') == 'true':
721 statuses[3] = '+'
722 # Col 4
723 if wc_status.attrib.get('switched') == 'true':
724 statuses[4] = 'S'
725 # TODO(maruel): Col 5 and 6
726 item = (''.join(statuses), file_path)
727 results.append(item)
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000728 return results
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000729
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000730 @staticmethod
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000731 def IsMoved(filename, cwd):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000732 """Determine if a file has been added through svn mv"""
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000733 assert isinstance(filename, basestring)
734 return SVN.IsMovedInfo(SVN.CaptureLocalInfo([filename], cwd))
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000735
736 @staticmethod
737 def IsMovedInfo(info):
738 """Determine if a file has been added through svn mv"""
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000739 return (info.get('Copied From URL') and
740 info.get('Copied From Rev') and
741 info.get('Schedule') == 'add')
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000742
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000743 @staticmethod
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000744 def GetFileProperty(filename, property_name, cwd):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000745 """Returns the value of an SVN property for the given file.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000746
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000747 Args:
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000748 filename: The file to check
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000749 property_name: The name of the SVN property, e.g. "svn:mime-type"
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000750
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000751 Returns:
752 The value of the property, which will be the empty string if the property
753 is not set on the file. If the file is not under version control, the
754 empty string is also returned.
755 """
maruel@chromium.org54019f32010-09-09 13:50:11 +0000756 try:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000757 return SVN.Capture(['propget', property_name, filename], cwd)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000758 except subprocess2.CalledProcessError:
maruel@chromium.org54019f32010-09-09 13:50:11 +0000759 return ''
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000760
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000761 @staticmethod
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000762 def DiffItem(filename, cwd, full_move, revision):
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000763 """Diffs a single file.
764
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000765 Should be simple, eh? No it isn't.
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000766 Be sure to be in the appropriate directory before calling to have the
maruel@chromium.orga9371762009-12-22 18:27:38 +0000767 expected relative path.
768 full_move means that move or copy operations should completely recreate the
769 files, usually in the prospect to apply the patch for a try job."""
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000770 # If the user specified a custom diff command in their svn config file,
771 # then it'll be used when we do svn diff, which we don't want to happen
772 # since we want the unified diff. Using --diff-cmd=diff doesn't always
773 # work, since they can have another diff executable in their path that
774 # gives different line endings. So we use a bogus temp directory as the
775 # config directory, which gets around these problems.
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000776 bogus_dir = tempfile.mkdtemp()
777 try:
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000778 # Use "svn info" output instead of os.path.isdir because the latter fails
779 # when the file is deleted.
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000780 return SVN._DiffItemInternal(
781 filename,
782 cwd,
783 SVN.CaptureLocalInfo([filename], cwd),
784 bogus_dir,
785 full_move,
786 revision)
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000787 finally:
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000788 gclient_utils.RemoveDirectory(bogus_dir)
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000789
790 @staticmethod
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000791 def _DiffItemInternal(filename, cwd, info, bogus_dir, full_move, revision):
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000792 """Grabs the diff data."""
793 command = ["diff", "--config-dir", bogus_dir, filename]
794 if revision:
795 command.extend(['--revision', revision])
796 data = None
797 if SVN.IsMovedInfo(info):
798 if full_move:
799 if info.get("Node Kind") == "directory":
800 # Things become tricky here. It's a directory copy/move. We need to
801 # diff all the files inside it.
802 # This will put a lot of pressure on the heap. This is why StringIO
803 # is used and converted back into a string at the end. The reason to
804 # return a string instead of a StringIO is that StringIO.write()
805 # doesn't accept a StringIO object. *sigh*.
806 for (dirpath, dirnames, filenames) in os.walk(filename):
807 # Cleanup all files starting with a '.'.
808 for d in dirnames:
809 if d.startswith('.'):
810 dirnames.remove(d)
811 for f in filenames:
812 if f.startswith('.'):
813 filenames.remove(f)
814 for f in filenames:
815 if data is None:
816 data = cStringIO.StringIO()
817 data.write(GenFakeDiff(os.path.join(dirpath, f)))
818 if data:
819 tmp = data.getvalue()
820 data.close()
821 data = tmp
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000822 else:
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000823 data = GenFakeDiff(filename)
824 else:
825 if info.get("Node Kind") != "directory":
maruel@chromium.org0836c562010-01-22 01:10:06 +0000826 # svn diff on a mv/cp'd file outputs nothing if there was no change.
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000827 data = SVN.Capture(command, cwd)
maruel@chromium.org0836c562010-01-22 01:10:06 +0000828 if not data:
829 # We put in an empty Index entry so upload.py knows about them.
maruel@chromium.orgc6d170e2010-06-03 00:06:00 +0000830 data = "Index: %s\n" % filename.replace(os.sep, '/')
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000831 # Otherwise silently ignore directories.
832 else:
833 if info.get("Node Kind") != "directory":
834 # Normal simple case.
maruel@chromium.orgf8b3f942011-03-24 17:33:50 +0000835 try:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000836 data = SVN.Capture(command, cwd)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000837 except subprocess2.CalledProcessError:
maruel@chromium.orgf8b3f942011-03-24 17:33:50 +0000838 if revision:
839 data = GenFakeDiff(filename)
840 else:
841 raise
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000842 # Otherwise silently ignore directories.
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000843 return data
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000844
845 @staticmethod
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000846 def GenerateDiff(filenames, cwd, full_move, revision):
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000847 """Returns a string containing the diff for the given file list.
848
849 The files in the list should either be absolute paths or relative to the
850 given root. If no root directory is provided, the repository root will be
851 used.
852 The diff will always use relative paths.
853 """
maruel@chromium.org00fdcb32011-02-24 01:41:02 +0000854 assert isinstance(filenames, (list, tuple))
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000855 root = os.path.normcase(os.path.join(cwd, ''))
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000856 def RelativePath(path, root):
857 """We must use relative paths."""
maruel@chromium.orgfd9cbbb2010-01-08 23:04:03 +0000858 if os.path.normcase(path).startswith(root):
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000859 return path[len(root):]
860 return path
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000861 # If the user specified a custom diff command in their svn config file,
862 # then it'll be used when we do svn diff, which we don't want to happen
863 # since we want the unified diff. Using --diff-cmd=diff doesn't always
864 # work, since they can have another diff executable in their path that
865 # gives different line endings. So we use a bogus temp directory as the
866 # config directory, which gets around these problems.
867 bogus_dir = tempfile.mkdtemp()
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000868 try:
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000869 # Cleanup filenames
870 filenames = [RelativePath(f, root) for f in filenames]
871 # Get information about the modified items (files and directories)
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000872 data = dict([(f, SVN.CaptureLocalInfo([f], root)) for f in filenames])
gavinp@google.com3fda4cc2010-06-29 13:29:27 +0000873 diffs = []
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000874 if full_move:
875 # Eliminate modified files inside moved/copied directory.
876 for (filename, info) in data.iteritems():
877 if SVN.IsMovedInfo(info) and info.get("Node Kind") == "directory":
878 # Remove files inside the directory.
879 filenames = [f for f in filenames
880 if not f.startswith(filename + os.path.sep)]
881 for filename in data.keys():
882 if not filename in filenames:
883 # Remove filtered out items.
884 del data[filename]
gavinp@google.com3fda4cc2010-06-29 13:29:27 +0000885 else:
886 metaheaders = []
887 for (filename, info) in data.iteritems():
888 if SVN.IsMovedInfo(info):
889 # for now, the most common case is a head copy,
890 # so let's just encode that as a straight up cp.
891 srcurl = info.get('Copied From URL')
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000892 file_root = info.get('Repository Root')
gavinp@google.com3fda4cc2010-06-29 13:29:27 +0000893 rev = int(info.get('Copied From Rev'))
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000894 assert srcurl.startswith(file_root)
895 src = srcurl[len(file_root)+1:]
maruel@chromium.org00fdcb32011-02-24 01:41:02 +0000896 try:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000897 srcinfo = SVN.CaptureRemoteInfo(srcurl)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000898 except subprocess2.CalledProcessError, e:
maruel@chromium.org00fdcb32011-02-24 01:41:02 +0000899 if not 'Not a valid URL' in e.stderr:
900 raise
901 # Assume the file was deleted. No idea how to figure out at which
902 # revision the file was deleted.
903 srcinfo = {'Revision': rev}
gavinp@google.com3fda4cc2010-06-29 13:29:27 +0000904 if (srcinfo.get('Revision') != rev and
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000905 SVN.Capture(['diff', '-r', '%d:head' % rev, srcurl], cwd)):
gavinp@google.com3fda4cc2010-06-29 13:29:27 +0000906 metaheaders.append("#$ svn cp -r %d %s %s "
907 "### WARNING: note non-trunk copy\n" %
908 (rev, src, filename))
909 else:
910 metaheaders.append("#$ cp %s %s\n" % (src,
911 filename))
912
913 if metaheaders:
914 diffs.append("### BEGIN SVN COPY METADATA\n")
915 diffs.extend(metaheaders)
916 diffs.append("### END SVN COPY METADATA\n")
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000917 # Now ready to do the actual diff.
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000918 for filename in sorted(data.iterkeys()):
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000919 diffs.append(SVN._DiffItemInternal(
920 filename, cwd, data[filename], bogus_dir, full_move, revision))
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000921 # Use StringIO since it can be messy when diffing a directory move with
922 # full_move=True.
923 buf = cStringIO.StringIO()
924 for d in filter(None, diffs):
925 buf.write(d)
926 result = buf.getvalue()
927 buf.close()
928 return result
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000929 finally:
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000930 gclient_utils.RemoveDirectory(bogus_dir)
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000931
932 @staticmethod
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000933 def GetEmail(cwd):
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000934 """Retrieves the svn account which we assume is an email address."""
maruel@chromium.org54019f32010-09-09 13:50:11 +0000935 try:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000936 infos = SVN.CaptureLocalInfo([], cwd)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000937 except subprocess2.CalledProcessError:
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000938 return None
939
940 # Should check for uuid but it is incorrectly saved for https creds.
maruel@chromium.org54019f32010-09-09 13:50:11 +0000941 root = infos['Repository Root']
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000942 realm = root.rsplit('/', 1)[0]
maruel@chromium.org54019f32010-09-09 13:50:11 +0000943 uuid = infos['UUID']
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000944 if root.startswith('https') or not uuid:
945 regexp = re.compile(r'<%s:\d+>.*' % realm)
946 else:
947 regexp = re.compile(r'<%s:\d+> %s' % (realm, uuid))
948 if regexp is None:
949 return None
950 if sys.platform.startswith('win'):
951 if not 'APPDATA' in os.environ:
952 return None
maruel@chromium.org720d9f32009-11-21 17:38:57 +0000953 auth_dir = os.path.join(os.environ['APPDATA'], 'Subversion', 'auth',
954 'svn.simple')
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000955 else:
956 if not 'HOME' in os.environ:
957 return None
958 auth_dir = os.path.join(os.environ['HOME'], '.subversion', 'auth',
959 'svn.simple')
960 for credfile in os.listdir(auth_dir):
961 cred_info = SVN.ReadSimpleAuth(os.path.join(auth_dir, credfile))
962 if regexp.match(cred_info.get('svn:realmstring')):
963 return cred_info.get('username')
964
965 @staticmethod
966 def ReadSimpleAuth(filename):
967 f = open(filename, 'r')
968 values = {}
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000969 def ReadOneItem(item_type):
970 m = re.match(r'%s (\d+)' % item_type, f.readline())
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000971 if not m:
972 return None
973 data = f.read(int(m.group(1)))
974 if f.read(1) != '\n':
975 return None
976 return data
977
978 while True:
979 key = ReadOneItem('K')
980 if not key:
981 break
982 value = ReadOneItem('V')
983 if not value:
984 break
985 values[key] = value
986 return values
maruel@chromium.org94b1ee92009-12-19 20:27:20 +0000987
988 @staticmethod
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000989 def GetCheckoutRoot(cwd):
maruel@chromium.org94b1ee92009-12-19 20:27:20 +0000990 """Returns the top level directory of the current repository.
991
992 The directory is returned as an absolute path.
993 """
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000994 cwd = os.path.abspath(cwd)
maruel@chromium.org54019f32010-09-09 13:50:11 +0000995 try:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000996 info = SVN.CaptureLocalInfo([], cwd)
maruel@chromium.org885d6e82011-02-24 20:21:46 +0000997 cur_dir_repo_root = info['Repository Root']
998 url = info['URL']
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000999 except subprocess2.CalledProcessError:
maruel@chromium.org94b1ee92009-12-19 20:27:20 +00001000 return None
maruel@chromium.org94b1ee92009-12-19 20:27:20 +00001001 while True:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001002 parent = os.path.dirname(cwd)
maruel@chromium.org54019f32010-09-09 13:50:11 +00001003 try:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001004 info = SVN.CaptureLocalInfo([], parent)
maruel@chromium.org885d6e82011-02-24 20:21:46 +00001005 if (info['Repository Root'] != cur_dir_repo_root or
1006 info['URL'] != os.path.dirname(url)):
maruel@chromium.org54019f32010-09-09 13:50:11 +00001007 break
maruel@chromium.org885d6e82011-02-24 20:21:46 +00001008 url = info['URL']
maruel@chromium.orgda64d632011-09-08 17:41:15 +00001009 except subprocess2.CalledProcessError:
maruel@chromium.org94b1ee92009-12-19 20:27:20 +00001010 break
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001011 cwd = parent
1012 return GetCasedPath(cwd)
tony@chromium.org57564662010-04-14 02:35:12 +00001013
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +00001014 @staticmethod
1015 def IsValidRevision(url):
1016 """Verifies the revision looks like an SVN revision."""
1017 try:
1018 SVN.Capture(['info', url], cwd=None)
1019 return True
1020 except subprocess2.CalledProcessError:
1021 return False
1022
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001023 @classmethod
1024 def AssertVersion(cls, min_version):
tony@chromium.org57564662010-04-14 02:35:12 +00001025 """Asserts svn's version is at least min_version."""
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001026 if cls.current_version is None:
shouqun.liu@intel.com13b522c2012-07-20 17:16:51 +00001027 cls.current_version = cls.Capture(['--version', '--quiet'], None)
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001028 current_version_list = map(only_int, cls.current_version.split('.'))
tony@chromium.org57564662010-04-14 02:35:12 +00001029 for min_ver in map(int, min_version.split('.')):
1030 ver = current_version_list.pop(0)
1031 if ver < min_ver:
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001032 return (False, cls.current_version)
tony@chromium.org57564662010-04-14 02:35:12 +00001033 elif ver > min_ver:
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001034 return (True, cls.current_version)
1035 return (True, cls.current_version)
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001036
1037 @staticmethod
maruel@chromium.orgea15cb72012-05-04 14:16:31 +00001038 def Revert(cwd, callback=None, ignore_externals=False, no_ignore=False):
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001039 """Reverts all svn modifications in cwd, including properties.
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001040
1041 Deletes any modified files or directory.
1042
1043 A "svn update --revision BASE" call is required after to revive deleted
1044 files.
1045 """
maruel@chromium.orgea15cb72012-05-04 14:16:31 +00001046 for file_status in SVN.CaptureStatus(None, cwd, no_ignore=no_ignore):
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001047 file_path = os.path.join(cwd, file_status[1])
maruel@chromium.org8c415122011-03-15 17:14:27 +00001048 if (ignore_externals and
1049 file_status[0][0] == 'X' and
1050 file_status[0][1:].isspace()):
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001051 # Ignore externals.
1052 logging.info('Ignoring external %s' % file_status[1])
1053 continue
1054
maruel@chromium.org62087572012-04-24 23:16:28 +00001055 # This is the case where '! L .' is returned by 'svn status'. Just
1056 # strip off the '/.'.
1057 if file_path.endswith(os.path.sep + '.'):
1058 file_path = file_path[:-2]
1059
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001060 if callback:
1061 callback(file_status)
1062
maruel@chromium.org8c415122011-03-15 17:14:27 +00001063 if os.path.exists(file_path):
1064 # svn revert is really stupid. It fails on inconsistent line-endings,
1065 # on switched directories, etc. So take no chance and delete everything!
1066 # In theory, it wouldn't be necessary for property-only change but then
1067 # it'd have to look for switched directories, etc so it's not worth
1068 # optimizing this use case.
1069 if os.path.isfile(file_path) or os.path.islink(file_path):
1070 logging.info('os.remove(%s)' % file_path)
1071 os.remove(file_path)
1072 elif os.path.isdir(file_path):
maruel@chromium.orgda64d632011-09-08 17:41:15 +00001073 logging.info('RemoveDirectory(%s)' % file_path)
maruel@chromium.org8c415122011-03-15 17:14:27 +00001074 gclient_utils.RemoveDirectory(file_path)
1075 else:
1076 logging.critical(
1077 ('No idea what is %s.\nYou just found a bug in gclient'
1078 ', please ping maruel@chromium.org ASAP!') % file_path)
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001079
maruel@chromium.org8c415122011-03-15 17:14:27 +00001080 if (file_status[0][0] in ('D', 'A', '!') or
1081 not file_status[0][1:].isspace()):
maruel@chromium.orgaf453492011-03-03 21:04:09 +00001082 # Added, deleted file requires manual intervention and require calling
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001083 # revert, like for properties.
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001084 if not os.path.isdir(cwd):
maruel@chromium.org8b322b32011-11-01 19:05:50 +00001085 # '.' was deleted. It's not worth continuing.
1086 return
maruel@chromium.orgaf453492011-03-03 21:04:09 +00001087 try:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001088 SVN.Capture(['revert', file_status[1]], cwd=cwd)
maruel@chromium.orgda64d632011-09-08 17:41:15 +00001089 except subprocess2.CalledProcessError:
maruel@chromium.orgaf453492011-03-03 21:04:09 +00001090 if not os.path.exists(file_path):
1091 continue
1092 raise