blob: e58286cb733171d1a570212637633f2d302f8c9f [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
394 def GetSha1ForSvnRev(cwd, rev):
395 """Returns a corresponding git sha1 for a SVN revision."""
396 if not GIT.IsGitSvn(cwd=cwd):
397 return None
398 try:
399 lines = GIT.Capture(
400 ['svn', 'find-rev', 'r' + str(rev)], cwd=cwd).splitlines()
401 return lines[-1].strip() if lines else None
402 except subprocess2.CalledProcessError:
403 return None
404
405 @staticmethod
406 def IsValidRevision(cwd, rev):
407 """Verifies the revision is a proper git revision."""
408 try:
409 GIT.Capture(['rev-parse', rev], cwd=cwd)
410 return True
411 except subprocess2.CalledProcessError:
412 return False
413
maruel@chromium.org36ac2392011-10-12 16:36:11 +0000414 @classmethod
415 def AssertVersion(cls, min_version):
maruel@chromium.orgd0f854a2010-03-11 19:35:53 +0000416 """Asserts git's version is at least min_version."""
maruel@chromium.org36ac2392011-10-12 16:36:11 +0000417 if cls.current_version is None:
maruel@chromium.org80a9ef12011-12-13 20:44:10 +0000418 cls.current_version = cls.Capture(['--version'], '.').split()[-1]
maruel@chromium.org36ac2392011-10-12 16:36:11 +0000419 current_version_list = map(only_int, cls.current_version.split('.'))
maruel@chromium.orgd0f854a2010-03-11 19:35:53 +0000420 for min_ver in map(int, min_version.split('.')):
421 ver = current_version_list.pop(0)
422 if ver < min_ver:
maruel@chromium.org36ac2392011-10-12 16:36:11 +0000423 return (False, cls.current_version)
maruel@chromium.orgd0f854a2010-03-11 19:35:53 +0000424 elif ver > min_ver:
maruel@chromium.org36ac2392011-10-12 16:36:11 +0000425 return (True, cls.current_version)
426 return (True, cls.current_version)
maruel@chromium.orgd0f854a2010-03-11 19:35:53 +0000427
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000428
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000429class SVN(object):
tony@chromium.org57564662010-04-14 02:35:12 +0000430 current_version = None
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000431
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000432 @staticmethod
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000433 def Capture(args, cwd, **kwargs):
maruel@chromium.org54019f32010-09-09 13:50:11 +0000434 """Always redirect stderr.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000435
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000436 Throws an exception if non-0 is returned.
437 """
maruel@chromium.org904af082011-09-08 22:06:09 +0000438 return subprocess2.check_output(
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000439 ['svn'] + args, stderr=subprocess2.PIPE, cwd=cwd, **kwargs)
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000440
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000441 @staticmethod
maruel@chromium.org2b9aa8e2010-08-25 20:01:42 +0000442 def RunAndGetFileList(verbose, args, cwd, file_list, stdout=None):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000443 """Runs svn checkout, update, or status, output to stdout.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000444
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000445 The first item in args must be either "checkout", "update", or "status".
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000446
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000447 svn's stdout is parsed to collect a list of files checked out or updated.
448 These files are appended to file_list. svn's stdout is also printed to
449 sys.stdout as in Run.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000450
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000451 Args:
maruel@chromium.org03807072010-08-16 17:18:44 +0000452 verbose: If True, uses verbose output
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000453 args: A sequence of command line parameters to be passed to svn.
maruel@chromium.org2b9aa8e2010-08-25 20:01:42 +0000454 cwd: The directory where svn is to be run.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000455
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000456 Raises:
457 Error: An error occurred while running the svn command.
458 """
maruel@chromium.org2b9aa8e2010-08-25 20:01:42 +0000459 stdout = stdout or sys.stdout
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000460
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000461 # svn update and svn checkout use the same pattern: the first three columns
462 # are for file status, property status, and lock status. This is followed
463 # by two spaces, and then the path to the file.
464 update_pattern = '^... (.*)$'
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000465
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000466 # The first three columns of svn status are the same as for svn update and
467 # svn checkout. The next three columns indicate addition-with-history,
468 # switch, and remote lock status. This is followed by one space, and then
469 # the path to the file.
470 status_pattern = '^...... (.*)$'
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000471
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000472 # args[0] must be a supported command. This will blow up if it's something
473 # else, which is good. Note that the patterns are only effective when
474 # these commands are used in their ordinary forms, the patterns are invalid
475 # for "svn status --show-updates", for example.
476 pattern = {
477 'checkout': update_pattern,
478 'status': status_pattern,
479 'update': update_pattern,
480 }[args[0]]
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000481 compiled_pattern = re.compile(pattern)
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000482 # Place an upper limit.
cbentzel@chromium.org2aee2292010-09-03 14:15:25 +0000483 backoff_time = 5
maruel@chromium.orgbec588d2010-10-26 13:50:25 +0000484 retries = 0
maruel@chromium.org03507062010-10-26 00:58:27 +0000485 while True:
maruel@chromium.orgbec588d2010-10-26 13:50:25 +0000486 retries += 1
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000487 previous_list_len = len(file_list)
488 failure = []
maruel@chromium.org54d1f1a2010-01-08 19:53:47 +0000489
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000490 def CaptureMatchingLines(line):
491 match = compiled_pattern.search(line)
492 if match:
493 file_list.append(match.group(1))
494 if line.startswith('svn: '):
maruel@chromium.org8599aa72010-02-08 20:27:14 +0000495 failure.append(line)
maruel@chromium.org54d1f1a2010-01-08 19:53:47 +0000496
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000497 try:
maruel@chromium.org17d01792010-09-01 18:07:10 +0000498 gclient_utils.CheckCallAndFilterAndHeader(
499 ['svn'] + args,
500 cwd=cwd,
501 always=verbose,
502 filter_fn=CaptureMatchingLines,
503 stdout=stdout)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000504 except subprocess2.CalledProcessError:
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000505 def IsKnownFailure():
506 for x in failure:
507 if (x.startswith('svn: OPTIONS of') or
508 x.startswith('svn: PROPFIND of') or
509 x.startswith('svn: REPORT of') or
maruel@chromium.orgf61fc932010-08-19 13:05:24 +0000510 x.startswith('svn: Unknown hostname') or
maruel@chromium.org7d8b97d2011-10-11 23:32:30 +0000511 x.startswith('svn: Server sent unexpected return value') or
512 x.startswith('svn: Can\'t connect to host')):
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000513 return True
514 return False
515
maruel@chromium.org953586a2010-06-15 14:22:24 +0000516 # Subversion client is really misbehaving with Google Code.
517 if args[0] == 'checkout':
518 # Ensure at least one file was checked out, otherwise *delete* the
519 # directory.
520 if len(file_list) == previous_list_len:
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000521 if not IsKnownFailure():
maruel@chromium.org953586a2010-06-15 14:22:24 +0000522 # No known svn error was found, bail out.
523 raise
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000524 # No file were checked out, so make sure the directory is
525 # deleted in case it's messed up and try again.
526 # Warning: It's bad, it assumes args[2] is the directory
527 # argument.
528 if os.path.isdir(args[2]):
529 gclient_utils.RemoveDirectory(args[2])
maruel@chromium.org953586a2010-06-15 14:22:24 +0000530 else:
531 # Progress was made, convert to update since an aborted checkout
532 # is now an update.
maruel@chromium.org2de10252010-02-08 01:10:39 +0000533 args = ['update'] + args[1:]
maruel@chromium.org953586a2010-06-15 14:22:24 +0000534 else:
535 # It was an update or export.
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000536 # We enforce that some progress has been made or a known failure.
537 if len(file_list) == previous_list_len and not IsKnownFailure():
538 # No known svn error was found and no progress, bail out.
539 raise
maruel@chromium.orgbec588d2010-10-26 13:50:25 +0000540 if retries == 10:
maruel@chromium.org03507062010-10-26 00:58:27 +0000541 raise
cbentzel@chromium.org2aee2292010-09-03 14:15:25 +0000542 print "Sleeping %.1f seconds and retrying...." % backoff_time
543 time.sleep(backoff_time)
544 backoff_time *= 1.3
maruel@chromium.org953586a2010-06-15 14:22:24 +0000545 continue
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000546 break
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000547
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000548 @staticmethod
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000549 def CaptureRemoteInfo(url):
550 """Returns a dictionary from the svn info output for the given url.
551
552 Throws an exception if svn info fails.
553 """
554 assert isinstance(url, str)
555 return SVN._CaptureInfo([url], None)
556
557 @staticmethod
558 def CaptureLocalInfo(files, cwd):
559 """Returns a dictionary from the svn info output for the given files.
560
561 Throws an exception if svn info fails.
562 """
563 assert isinstance(files, (list, tuple))
564 return SVN._CaptureInfo(files, cwd)
565
566 @staticmethod
567 def _CaptureInfo(files, cwd):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000568 """Returns a dictionary from the svn info output for the given file.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000569
maruel@chromium.org54019f32010-09-09 13:50:11 +0000570 Throws an exception if svn info fails."""
maruel@chromium.orgd25fb8f2011-04-07 13:40:15 +0000571 result = {}
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000572 info = ElementTree.XML(SVN.Capture(['info', '--xml'] + files, cwd))
maruel@chromium.orgade9c592011-04-07 15:59:11 +0000573 if info is None:
574 return result
575 entry = info.find('entry')
maruel@chromium.org6f323bb2011-04-26 15:42:53 +0000576 if entry is None:
577 return result
maruel@chromium.orgade9c592011-04-07 15:59:11 +0000578
579 # Use .text when the item is not optional.
580 result['Path'] = entry.attrib['path']
maruel@chromium.org7d654672012-01-05 19:07:23 +0000581 rev = entry.attrib['revision']
582 try:
583 result['Revision'] = int(rev)
584 except ValueError:
585 result['Revision'] = None
maruel@chromium.orgade9c592011-04-07 15:59:11 +0000586 result['Node Kind'] = entry.attrib['kind']
587 # Differs across versions.
588 if result['Node Kind'] == 'dir':
589 result['Node Kind'] = 'directory'
590 result['URL'] = entry.find('url').text
591 repository = entry.find('repository')
592 result['Repository Root'] = repository.find('root').text
593 result['UUID'] = repository.find('uuid')
594 wc_info = entry.find('wc-info')
595 if wc_info is not None:
596 result['Schedule'] = wc_info.find('schedule').text
597 result['Copied From URL'] = wc_info.find('copy-from-url')
598 result['Copied From Rev'] = wc_info.find('copy-from-rev')
599 else:
600 result['Schedule'] = None
601 result['Copied From URL'] = None
602 result['Copied From Rev'] = None
603 for key in result.keys():
604 if isinstance(result[key], unicode):
605 # Unicode results interferes with the higher layers matching up things
606 # in the deps dictionary.
607 result[key] = result[key].encode()
608 # Automatic conversion of optional parameters.
609 result[key] = getattr(result[key], 'text', result[key])
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000610 return result
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000611
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000612 @staticmethod
maruel@chromium.org54019f32010-09-09 13:50:11 +0000613 def CaptureRevision(cwd):
nasser@codeaurora.org5d63eb82010-03-24 23:22:09 +0000614 """Get the base revision of a SVN repository.
615
616 Returns:
617 Int base revision
618 """
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000619 return SVN.CaptureLocalInfo([], cwd).get('Revision')
nasser@codeaurora.org5d63eb82010-03-24 23:22:09 +0000620
621 @staticmethod
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000622 def CaptureStatus(files, cwd):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000623 """Returns the svn 1.5 svn status emulated output.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000624
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000625 @files can be a string (one file) or a list of files.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000626
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000627 Returns an array of (status, file) tuples."""
628 command = ["status", "--xml"]
629 if not files:
630 pass
631 elif isinstance(files, basestring):
632 command.append(files)
633 else:
634 command.extend(files)
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000635
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000636 status_letter = {
637 None: ' ',
638 '': ' ',
639 'added': 'A',
640 'conflicted': 'C',
641 'deleted': 'D',
642 'external': 'X',
643 'ignored': 'I',
644 'incomplete': '!',
645 'merged': 'G',
646 'missing': '!',
647 'modified': 'M',
648 'none': ' ',
649 'normal': ' ',
650 'obstructed': '~',
651 'replaced': 'R',
652 'unversioned': '?',
653 }
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000654 dom = ElementTree.XML(SVN.Capture(command, cwd))
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000655 results = []
maruel@chromium.orgade9c592011-04-07 15:59:11 +0000656 if dom is None:
657 return results
658 # /status/target/entry/(wc-status|commit|author|date)
659 for target in dom.findall('target'):
660 for entry in target.findall('entry'):
661 file_path = entry.attrib['path']
662 wc_status = entry.find('wc-status')
663 # Emulate svn 1.5 status ouput...
664 statuses = [' '] * 7
665 # Col 0
666 xml_item_status = wc_status.attrib['item']
667 if xml_item_status in status_letter:
668 statuses[0] = status_letter[xml_item_status]
669 else:
670 raise gclient_utils.Error(
671 'Unknown item status "%s"; please implement me!' %
672 xml_item_status)
673 # Col 1
674 xml_props_status = wc_status.attrib['props']
675 if xml_props_status == 'modified':
676 statuses[1] = 'M'
677 elif xml_props_status == 'conflicted':
678 statuses[1] = 'C'
679 elif (not xml_props_status or xml_props_status == 'none' or
680 xml_props_status == 'normal'):
681 pass
682 else:
683 raise gclient_utils.Error(
684 'Unknown props status "%s"; please implement me!' %
685 xml_props_status)
686 # Col 2
687 if wc_status.attrib.get('wc-locked') == 'true':
688 statuses[2] = 'L'
689 # Col 3
690 if wc_status.attrib.get('copied') == 'true':
691 statuses[3] = '+'
692 # Col 4
693 if wc_status.attrib.get('switched') == 'true':
694 statuses[4] = 'S'
695 # TODO(maruel): Col 5 and 6
696 item = (''.join(statuses), file_path)
697 results.append(item)
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000698 return results
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000699
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000700 @staticmethod
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000701 def IsMoved(filename, cwd):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000702 """Determine if a file has been added through svn mv"""
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000703 assert isinstance(filename, basestring)
704 return SVN.IsMovedInfo(SVN.CaptureLocalInfo([filename], cwd))
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000705
706 @staticmethod
707 def IsMovedInfo(info):
708 """Determine if a file has been added through svn mv"""
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000709 return (info.get('Copied From URL') and
710 info.get('Copied From Rev') and
711 info.get('Schedule') == 'add')
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000712
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000713 @staticmethod
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000714 def GetFileProperty(filename, property_name, cwd):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000715 """Returns the value of an SVN property for the given file.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000716
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000717 Args:
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000718 filename: The file to check
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000719 property_name: The name of the SVN property, e.g. "svn:mime-type"
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000720
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000721 Returns:
722 The value of the property, which will be the empty string if the property
723 is not set on the file. If the file is not under version control, the
724 empty string is also returned.
725 """
maruel@chromium.org54019f32010-09-09 13:50:11 +0000726 try:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000727 return SVN.Capture(['propget', property_name, filename], cwd)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000728 except subprocess2.CalledProcessError:
maruel@chromium.org54019f32010-09-09 13:50:11 +0000729 return ''
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000730
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000731 @staticmethod
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000732 def DiffItem(filename, cwd, full_move, revision):
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000733 """Diffs a single file.
734
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000735 Should be simple, eh? No it isn't.
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000736 Be sure to be in the appropriate directory before calling to have the
maruel@chromium.orga9371762009-12-22 18:27:38 +0000737 expected relative path.
738 full_move means that move or copy operations should completely recreate the
739 files, usually in the prospect to apply the patch for a try job."""
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000740 # If the user specified a custom diff command in their svn config file,
741 # then it'll be used when we do svn diff, which we don't want to happen
742 # since we want the unified diff. Using --diff-cmd=diff doesn't always
743 # work, since they can have another diff executable in their path that
744 # gives different line endings. So we use a bogus temp directory as the
745 # config directory, which gets around these problems.
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000746 bogus_dir = tempfile.mkdtemp()
747 try:
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000748 # Use "svn info" output instead of os.path.isdir because the latter fails
749 # when the file is deleted.
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000750 return SVN._DiffItemInternal(
751 filename,
752 cwd,
753 SVN.CaptureLocalInfo([filename], cwd),
754 bogus_dir,
755 full_move,
756 revision)
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000757 finally:
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000758 gclient_utils.RemoveDirectory(bogus_dir)
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000759
760 @staticmethod
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000761 def _DiffItemInternal(filename, cwd, info, bogus_dir, full_move, revision):
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000762 """Grabs the diff data."""
763 command = ["diff", "--config-dir", bogus_dir, filename]
764 if revision:
765 command.extend(['--revision', revision])
766 data = None
767 if SVN.IsMovedInfo(info):
768 if full_move:
769 if info.get("Node Kind") == "directory":
770 # Things become tricky here. It's a directory copy/move. We need to
771 # diff all the files inside it.
772 # This will put a lot of pressure on the heap. This is why StringIO
773 # is used and converted back into a string at the end. The reason to
774 # return a string instead of a StringIO is that StringIO.write()
775 # doesn't accept a StringIO object. *sigh*.
776 for (dirpath, dirnames, filenames) in os.walk(filename):
777 # Cleanup all files starting with a '.'.
778 for d in dirnames:
779 if d.startswith('.'):
780 dirnames.remove(d)
781 for f in filenames:
782 if f.startswith('.'):
783 filenames.remove(f)
784 for f in filenames:
785 if data is None:
786 data = cStringIO.StringIO()
787 data.write(GenFakeDiff(os.path.join(dirpath, f)))
788 if data:
789 tmp = data.getvalue()
790 data.close()
791 data = tmp
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000792 else:
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000793 data = GenFakeDiff(filename)
794 else:
795 if info.get("Node Kind") != "directory":
maruel@chromium.org0836c562010-01-22 01:10:06 +0000796 # svn diff on a mv/cp'd file outputs nothing if there was no change.
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000797 data = SVN.Capture(command, cwd)
maruel@chromium.org0836c562010-01-22 01:10:06 +0000798 if not data:
799 # We put in an empty Index entry so upload.py knows about them.
maruel@chromium.orgc6d170e2010-06-03 00:06:00 +0000800 data = "Index: %s\n" % filename.replace(os.sep, '/')
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000801 # Otherwise silently ignore directories.
802 else:
803 if info.get("Node Kind") != "directory":
804 # Normal simple case.
maruel@chromium.orgf8b3f942011-03-24 17:33:50 +0000805 try:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000806 data = SVN.Capture(command, cwd)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000807 except subprocess2.CalledProcessError:
maruel@chromium.orgf8b3f942011-03-24 17:33:50 +0000808 if revision:
809 data = GenFakeDiff(filename)
810 else:
811 raise
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000812 # Otherwise silently ignore directories.
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000813 return data
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000814
815 @staticmethod
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000816 def GenerateDiff(filenames, cwd, full_move, revision):
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000817 """Returns a string containing the diff for the given file list.
818
819 The files in the list should either be absolute paths or relative to the
820 given root. If no root directory is provided, the repository root will be
821 used.
822 The diff will always use relative paths.
823 """
maruel@chromium.org00fdcb32011-02-24 01:41:02 +0000824 assert isinstance(filenames, (list, tuple))
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000825 root = os.path.normcase(os.path.join(cwd, ''))
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000826 def RelativePath(path, root):
827 """We must use relative paths."""
maruel@chromium.orgfd9cbbb2010-01-08 23:04:03 +0000828 if os.path.normcase(path).startswith(root):
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000829 return path[len(root):]
830 return path
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000831 # If the user specified a custom diff command in their svn config file,
832 # then it'll be used when we do svn diff, which we don't want to happen
833 # since we want the unified diff. Using --diff-cmd=diff doesn't always
834 # work, since they can have another diff executable in their path that
835 # gives different line endings. So we use a bogus temp directory as the
836 # config directory, which gets around these problems.
837 bogus_dir = tempfile.mkdtemp()
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000838 try:
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000839 # Cleanup filenames
840 filenames = [RelativePath(f, root) for f in filenames]
841 # Get information about the modified items (files and directories)
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000842 data = dict([(f, SVN.CaptureLocalInfo([f], root)) for f in filenames])
gavinp@google.com3fda4cc2010-06-29 13:29:27 +0000843 diffs = []
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000844 if full_move:
845 # Eliminate modified files inside moved/copied directory.
846 for (filename, info) in data.iteritems():
847 if SVN.IsMovedInfo(info) and info.get("Node Kind") == "directory":
848 # Remove files inside the directory.
849 filenames = [f for f in filenames
850 if not f.startswith(filename + os.path.sep)]
851 for filename in data.keys():
852 if not filename in filenames:
853 # Remove filtered out items.
854 del data[filename]
gavinp@google.com3fda4cc2010-06-29 13:29:27 +0000855 else:
856 metaheaders = []
857 for (filename, info) in data.iteritems():
858 if SVN.IsMovedInfo(info):
859 # for now, the most common case is a head copy,
860 # so let's just encode that as a straight up cp.
861 srcurl = info.get('Copied From URL')
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000862 file_root = info.get('Repository Root')
gavinp@google.com3fda4cc2010-06-29 13:29:27 +0000863 rev = int(info.get('Copied From Rev'))
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000864 assert srcurl.startswith(file_root)
865 src = srcurl[len(file_root)+1:]
maruel@chromium.org00fdcb32011-02-24 01:41:02 +0000866 try:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000867 srcinfo = SVN.CaptureRemoteInfo(srcurl)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000868 except subprocess2.CalledProcessError, e:
maruel@chromium.org00fdcb32011-02-24 01:41:02 +0000869 if not 'Not a valid URL' in e.stderr:
870 raise
871 # Assume the file was deleted. No idea how to figure out at which
872 # revision the file was deleted.
873 srcinfo = {'Revision': rev}
gavinp@google.com3fda4cc2010-06-29 13:29:27 +0000874 if (srcinfo.get('Revision') != rev and
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000875 SVN.Capture(['diff', '-r', '%d:head' % rev, srcurl], cwd)):
gavinp@google.com3fda4cc2010-06-29 13:29:27 +0000876 metaheaders.append("#$ svn cp -r %d %s %s "
877 "### WARNING: note non-trunk copy\n" %
878 (rev, src, filename))
879 else:
880 metaheaders.append("#$ cp %s %s\n" % (src,
881 filename))
882
883 if metaheaders:
884 diffs.append("### BEGIN SVN COPY METADATA\n")
885 diffs.extend(metaheaders)
886 diffs.append("### END SVN COPY METADATA\n")
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000887 # Now ready to do the actual diff.
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000888 for filename in sorted(data.iterkeys()):
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000889 diffs.append(SVN._DiffItemInternal(
890 filename, cwd, data[filename], bogus_dir, full_move, revision))
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000891 # Use StringIO since it can be messy when diffing a directory move with
892 # full_move=True.
893 buf = cStringIO.StringIO()
894 for d in filter(None, diffs):
895 buf.write(d)
896 result = buf.getvalue()
897 buf.close()
898 return result
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000899 finally:
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000900 gclient_utils.RemoveDirectory(bogus_dir)
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000901
902 @staticmethod
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000903 def GetEmail(cwd):
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000904 """Retrieves the svn account which we assume is an email address."""
maruel@chromium.org54019f32010-09-09 13:50:11 +0000905 try:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000906 infos = SVN.CaptureLocalInfo([], cwd)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000907 except subprocess2.CalledProcessError:
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000908 return None
909
910 # Should check for uuid but it is incorrectly saved for https creds.
maruel@chromium.org54019f32010-09-09 13:50:11 +0000911 root = infos['Repository Root']
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000912 realm = root.rsplit('/', 1)[0]
maruel@chromium.org54019f32010-09-09 13:50:11 +0000913 uuid = infos['UUID']
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000914 if root.startswith('https') or not uuid:
915 regexp = re.compile(r'<%s:\d+>.*' % realm)
916 else:
917 regexp = re.compile(r'<%s:\d+> %s' % (realm, uuid))
918 if regexp is None:
919 return None
920 if sys.platform.startswith('win'):
921 if not 'APPDATA' in os.environ:
922 return None
maruel@chromium.org720d9f32009-11-21 17:38:57 +0000923 auth_dir = os.path.join(os.environ['APPDATA'], 'Subversion', 'auth',
924 'svn.simple')
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000925 else:
926 if not 'HOME' in os.environ:
927 return None
928 auth_dir = os.path.join(os.environ['HOME'], '.subversion', 'auth',
929 'svn.simple')
930 for credfile in os.listdir(auth_dir):
931 cred_info = SVN.ReadSimpleAuth(os.path.join(auth_dir, credfile))
932 if regexp.match(cred_info.get('svn:realmstring')):
933 return cred_info.get('username')
934
935 @staticmethod
936 def ReadSimpleAuth(filename):
937 f = open(filename, 'r')
938 values = {}
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000939 def ReadOneItem(item_type):
940 m = re.match(r'%s (\d+)' % item_type, f.readline())
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000941 if not m:
942 return None
943 data = f.read(int(m.group(1)))
944 if f.read(1) != '\n':
945 return None
946 return data
947
948 while True:
949 key = ReadOneItem('K')
950 if not key:
951 break
952 value = ReadOneItem('V')
953 if not value:
954 break
955 values[key] = value
956 return values
maruel@chromium.org94b1ee92009-12-19 20:27:20 +0000957
958 @staticmethod
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000959 def GetCheckoutRoot(cwd):
maruel@chromium.org94b1ee92009-12-19 20:27:20 +0000960 """Returns the top level directory of the current repository.
961
962 The directory is returned as an absolute path.
963 """
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000964 cwd = os.path.abspath(cwd)
maruel@chromium.org54019f32010-09-09 13:50:11 +0000965 try:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000966 info = SVN.CaptureLocalInfo([], cwd)
maruel@chromium.org885d6e82011-02-24 20:21:46 +0000967 cur_dir_repo_root = info['Repository Root']
968 url = info['URL']
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000969 except subprocess2.CalledProcessError:
maruel@chromium.org94b1ee92009-12-19 20:27:20 +0000970 return None
maruel@chromium.org94b1ee92009-12-19 20:27:20 +0000971 while True:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000972 parent = os.path.dirname(cwd)
maruel@chromium.org54019f32010-09-09 13:50:11 +0000973 try:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000974 info = SVN.CaptureLocalInfo([], parent)
maruel@chromium.org885d6e82011-02-24 20:21:46 +0000975 if (info['Repository Root'] != cur_dir_repo_root or
976 info['URL'] != os.path.dirname(url)):
maruel@chromium.org54019f32010-09-09 13:50:11 +0000977 break
maruel@chromium.org885d6e82011-02-24 20:21:46 +0000978 url = info['URL']
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000979 except subprocess2.CalledProcessError:
maruel@chromium.org94b1ee92009-12-19 20:27:20 +0000980 break
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000981 cwd = parent
982 return GetCasedPath(cwd)
tony@chromium.org57564662010-04-14 02:35:12 +0000983
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000984 @staticmethod
985 def IsValidRevision(url):
986 """Verifies the revision looks like an SVN revision."""
987 try:
988 SVN.Capture(['info', url], cwd=None)
989 return True
990 except subprocess2.CalledProcessError:
991 return False
992
maruel@chromium.org36ac2392011-10-12 16:36:11 +0000993 @classmethod
994 def AssertVersion(cls, min_version):
tony@chromium.org57564662010-04-14 02:35:12 +0000995 """Asserts svn's version is at least min_version."""
maruel@chromium.org36ac2392011-10-12 16:36:11 +0000996 if cls.current_version is None:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000997 cls.current_version = cls.Capture(['--version'], None).split()[2]
maruel@chromium.org36ac2392011-10-12 16:36:11 +0000998 current_version_list = map(only_int, cls.current_version.split('.'))
tony@chromium.org57564662010-04-14 02:35:12 +0000999 for min_ver in map(int, min_version.split('.')):
1000 ver = current_version_list.pop(0)
1001 if ver < min_ver:
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001002 return (False, cls.current_version)
tony@chromium.org57564662010-04-14 02:35:12 +00001003 elif ver > min_ver:
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001004 return (True, cls.current_version)
1005 return (True, cls.current_version)
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001006
1007 @staticmethod
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001008 def Revert(cwd, callback=None, ignore_externals=False):
1009 """Reverts all svn modifications in cwd, including properties.
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001010
1011 Deletes any modified files or directory.
1012
1013 A "svn update --revision BASE" call is required after to revive deleted
1014 files.
1015 """
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001016 for file_status in SVN.CaptureStatus(None, cwd):
1017 file_path = os.path.join(cwd, file_status[1])
maruel@chromium.org8c415122011-03-15 17:14:27 +00001018 if (ignore_externals and
1019 file_status[0][0] == 'X' and
1020 file_status[0][1:].isspace()):
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001021 # Ignore externals.
1022 logging.info('Ignoring external %s' % file_status[1])
1023 continue
1024
1025 if callback:
1026 callback(file_status)
1027
maruel@chromium.org8c415122011-03-15 17:14:27 +00001028 if os.path.exists(file_path):
1029 # svn revert is really stupid. It fails on inconsistent line-endings,
1030 # on switched directories, etc. So take no chance and delete everything!
1031 # In theory, it wouldn't be necessary for property-only change but then
1032 # it'd have to look for switched directories, etc so it's not worth
1033 # optimizing this use case.
1034 if os.path.isfile(file_path) or os.path.islink(file_path):
1035 logging.info('os.remove(%s)' % file_path)
1036 os.remove(file_path)
1037 elif os.path.isdir(file_path):
maruel@chromium.orgda64d632011-09-08 17:41:15 +00001038 logging.info('RemoveDirectory(%s)' % file_path)
maruel@chromium.org8c415122011-03-15 17:14:27 +00001039 gclient_utils.RemoveDirectory(file_path)
1040 else:
1041 logging.critical(
1042 ('No idea what is %s.\nYou just found a bug in gclient'
1043 ', please ping maruel@chromium.org ASAP!') % file_path)
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001044
maruel@chromium.org8c415122011-03-15 17:14:27 +00001045 if (file_status[0][0] in ('D', 'A', '!') or
1046 not file_status[0][1:].isspace()):
maruel@chromium.orgaf453492011-03-03 21:04:09 +00001047 # Added, deleted file requires manual intervention and require calling
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001048 # revert, like for properties.
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001049 if not os.path.isdir(cwd):
maruel@chromium.org8b322b32011-11-01 19:05:50 +00001050 # '.' was deleted. It's not worth continuing.
1051 return
maruel@chromium.orgaf453492011-03-03 21:04:09 +00001052 try:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001053 SVN.Capture(['revert', file_status[1]], cwd=cwd)
maruel@chromium.orgda64d632011-09-08 17:41:15 +00001054 except subprocess2.CalledProcessError:
maruel@chromium.orgaf453492011-03-03 21:04:09 +00001055 if not os.path.exists(file_path):
1056 continue
1057 raise