blob: d60453dceff9c1e1362d0be94e368e2112619663 [file] [log] [blame]
maruel@chromium.org7d654672012-01-05 19:07:23 +00001# Copyright (c) 2012 The Chromium Authors. All rights reserved.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +00002# Use of this source code is governed by a BSD-style license that can be
3# found in the LICENSE file.
4
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +00005"""SCM-specific utility classes."""
maruel@chromium.orgd5800f12009-11-12 20:03:43 +00006
maruel@chromium.org3c55d982010-05-06 14:25:44 +00007import cStringIO
maruel@chromium.orgfd9cbbb2010-01-08 23:04:03 +00008import glob
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00009import logging
maruel@chromium.orgd5800f12009-11-12 20:03:43 +000010import os
11import re
maruel@chromium.orgd5800f12009-11-12 20:03:43 +000012import sys
pkasting@chromium.org4755b582013-04-18 21:38:40 +000013import tempfile
maruel@chromium.orgfd876172010-04-30 14:01:05 +000014import time
maruel@chromium.orgade9c592011-04-07 15:59:11 +000015from xml.etree import ElementTree
maruel@chromium.orgd5800f12009-11-12 20:03:43 +000016
17import gclient_utils
maruel@chromium.org31cb48a2011-04-04 18:01:36 +000018import subprocess2
19
maruel@chromium.orgd5800f12009-11-12 20:03:43 +000020
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +000021def ValidateEmail(email):
maruel@chromium.org6e29d572010-06-04 17:32:20 +000022 return (re.match(r"^[a-zA-Z0-9._%-+]+@[a-zA-Z0-9._%-]+.[a-zA-Z]{2,6}$", email)
23 is not None)
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +000024
maruel@chromium.orgd5800f12009-11-12 20:03:43 +000025
maruel@chromium.orgfd9cbbb2010-01-08 23:04:03 +000026def GetCasedPath(path):
27 """Elcheapos way to get the real path case on Windows."""
28 if sys.platform.startswith('win') and os.path.exists(path):
29 # Reconstruct the path.
30 path = os.path.abspath(path)
31 paths = path.split('\\')
32 for i in range(len(paths)):
33 if i == 0:
34 # Skip drive letter.
35 continue
36 subpath = '\\'.join(paths[:i+1])
37 prev = len('\\'.join(paths[:i]))
38 # glob.glob will return the cased path for the last item only. This is why
39 # we are calling it in a loop. Extract the data we want and put it back
40 # into the list.
41 paths[i] = glob.glob(subpath + '*')[0][prev+1:len(subpath)]
42 path = '\\'.join(paths)
43 return path
44
45
maruel@chromium.org3c55d982010-05-06 14:25:44 +000046def GenFakeDiff(filename):
47 """Generates a fake diff from a file."""
48 file_content = gclient_utils.FileRead(filename, 'rb').splitlines(True)
maruel@chromium.orgc6d170e2010-06-03 00:06:00 +000049 filename = filename.replace(os.sep, '/')
maruel@chromium.org3c55d982010-05-06 14:25:44 +000050 nb_lines = len(file_content)
51 # We need to use / since patch on unix will fail otherwise.
52 data = cStringIO.StringIO()
53 data.write("Index: %s\n" % filename)
54 data.write('=' * 67 + '\n')
55 # Note: Should we use /dev/null instead?
56 data.write("--- %s\n" % filename)
57 data.write("+++ %s\n" % filename)
58 data.write("@@ -0,0 +1,%d @@\n" % nb_lines)
59 # Prepend '+' to every lines.
60 for line in file_content:
61 data.write('+')
62 data.write(line)
63 result = data.getvalue()
64 data.close()
65 return result
66
67
maruel@chromium.org5c8c6de2011-03-18 16:20:18 +000068def determine_scm(root):
69 """Similar to upload.py's version but much simpler.
70
71 Returns 'svn', 'git' or None.
72 """
73 if os.path.isdir(os.path.join(root, '.svn')):
74 return 'svn'
maruel@chromium.orgc98c0c52011-04-06 13:39:43 +000075 elif os.path.isdir(os.path.join(root, '.git')):
maruel@chromium.org5c8c6de2011-03-18 16:20:18 +000076 return 'git'
77 else:
maruel@chromium.orgc98c0c52011-04-06 13:39:43 +000078 try:
maruel@chromium.org91def9b2011-09-14 16:28:07 +000079 subprocess2.check_call(
maruel@chromium.org5c8c6de2011-03-18 16:20:18 +000080 ['git', 'rev-parse', '--show-cdup'],
maruel@chromium.orgc98c0c52011-04-06 13:39:43 +000081 stdout=subprocess2.VOID,
maruel@chromium.org87e6d332011-09-09 19:01:28 +000082 stderr=subprocess2.VOID,
maruel@chromium.orgc98c0c52011-04-06 13:39:43 +000083 cwd=root)
maruel@chromium.org5c8c6de2011-03-18 16:20:18 +000084 return 'git'
maruel@chromium.orgc98c0c52011-04-06 13:39:43 +000085 except (OSError, subprocess2.CalledProcessError):
maruel@chromium.org5c8c6de2011-03-18 16:20:18 +000086 return None
87
88
maruel@chromium.org36ac2392011-10-12 16:36:11 +000089def only_int(val):
90 if val.isdigit():
91 return int(val)
92 else:
93 return 0
94
95
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +000096class GIT(object):
maruel@chromium.org36ac2392011-10-12 16:36:11 +000097 current_version = None
98
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +000099 @staticmethod
szager@chromium.org6d8115d2014-04-23 20:59:23 +0000100 def ApplyEnvVars(kwargs):
101 env = kwargs.pop('env', None) or os.environ.copy()
102 # Don't prompt for passwords; just fail quickly and noisily.
103 # By default, git will use an interactive terminal prompt when a username/
104 # password is needed. That shouldn't happen in the chromium workflow,
105 # and if it does, then gclient may hide the prompt in the midst of a flood
106 # of terminal spew. The only indication that something has gone wrong
107 # will be when gclient hangs unresponsively. Instead, we disable the
108 # password prompt and simply allow git to fail noisily. The error
109 # message produced by git will be copied to gclient's output.
110 env.setdefault('GIT_ASKPASS', 'true')
111 env.setdefault('SSH_ASKPASS', 'true')
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000112 # 'cat' is a magical git string that disables pagers on all platforms.
szager@chromium.org6d8115d2014-04-23 20:59:23 +0000113 env.setdefault('GIT_PAGER', 'cat')
114 return env
115
116 @staticmethod
117 def Capture(args, cwd, strip_out=True, **kwargs):
118 env = GIT.ApplyEnvVars(kwargs)
ilevy@chromium.org4380c802013-07-12 23:38:41 +0000119 output = subprocess2.check_output(
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000120 ['git'] + args,
ilevy@chromium.org4380c802013-07-12 23:38:41 +0000121 cwd=cwd, stderr=subprocess2.PIPE, env=env, **kwargs)
122 return output.strip() if strip_out else output
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000123
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000124 @staticmethod
maruel@chromium.org80a9ef12011-12-13 20:44:10 +0000125 def CaptureStatus(files, cwd, upstream_branch):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000126 """Returns git status.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000127
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000128 @files can be a string (one file) or a list of files.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000129
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000130 Returns an array of (status, file) tuples."""
msb@chromium.org786fb682010-06-02 15:16:23 +0000131 if upstream_branch is None:
maruel@chromium.org80a9ef12011-12-13 20:44:10 +0000132 upstream_branch = GIT.GetUpstreamBranch(cwd)
msb@chromium.org786fb682010-06-02 15:16:23 +0000133 if upstream_branch is None:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000134 raise gclient_utils.Error('Cannot determine upstream branch')
mcgrathr@chromium.org9249f642013-06-03 21:36:18 +0000135 command = ['diff', '--name-status', '--no-renames',
136 '-r', '%s...' % upstream_branch]
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000137 if not files:
138 pass
139 elif isinstance(files, basestring):
140 command.append(files)
141 else:
142 command.extend(files)
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000143 status = GIT.Capture(command, cwd)
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000144 results = []
145 if status:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000146 for statusline in status.splitlines():
maruel@chromium.orgcc1614b2010-09-20 17:13:17 +0000147 # 3-way merges can cause the status can be 'MMM' instead of 'M'. This
148 # can happen when the user has 2 local branches and he diffs between
149 # these 2 branches instead diffing to upstream.
150 m = re.match('^(\w)+\t(.+)$', statusline)
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000151 if not m:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000152 raise gclient_utils.Error(
153 'status currently unsupported: %s' % statusline)
maruel@chromium.orgcc1614b2010-09-20 17:13:17 +0000154 # Only grab the first letter.
155 results.append(('%s ' % m.group(1)[0], m.group(2)))
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000156 return results
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000157
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000158 @staticmethod
nodir@chromium.orgead4c7e2014-04-03 01:01:06 +0000159 def IsWorkTreeDirty(cwd):
160 return GIT.Capture(['status', '-s'], cwd=cwd) != ''
161
162 @staticmethod
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000163 def GetEmail(cwd):
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000164 """Retrieves the user email address if known."""
165 # We could want to look at the svn cred when it has a svn remote but it
166 # should be fine for now, users should simply configure their git settings.
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000167 try:
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000168 return GIT.Capture(['config', 'user.email'], cwd=cwd)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000169 except subprocess2.CalledProcessError:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000170 return ''
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000171
172 @staticmethod
173 def ShortBranchName(branch):
174 """Converts a name like 'refs/heads/foo' to just 'foo'."""
175 return branch.replace('refs/heads/', '')
176
177 @staticmethod
178 def GetBranchRef(cwd):
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000179 """Returns the full branch reference, e.g. 'refs/heads/master'."""
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000180 return GIT.Capture(['symbolic-ref', 'HEAD'], cwd=cwd)
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000181
182 @staticmethod
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000183 def GetBranch(cwd):
184 """Returns the short branch name, e.g. 'master'."""
maruel@chromium.orgc308a742009-12-22 18:29:33 +0000185 return GIT.ShortBranchName(GIT.GetBranchRef(cwd))
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000186
187 @staticmethod
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000188 def IsGitSvn(cwd):
borenet@google.comb09097a2014-04-09 19:09:08 +0000189 """Returns True if this repo looks like it's using git-svn."""
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000190 # If you have any "svn-remote.*" config keys, we think you're using svn.
191 try:
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000192 GIT.Capture(['config', '--local', '--get-regexp', r'^svn-remote\.'],
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000193 cwd=cwd)
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000194 return True
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000195 except subprocess2.CalledProcessError:
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000196 return False
197
198 @staticmethod
bauerb@chromium.org866276c2011-03-18 20:09:31 +0000199 def MatchSvnGlob(url, base_url, glob_spec, allow_wildcards):
200 """Return the corresponding git ref if |base_url| together with |glob_spec|
201 matches the full |url|.
202
203 If |allow_wildcards| is true, |glob_spec| can contain wildcards (see below).
204 """
205 fetch_suburl, as_ref = glob_spec.split(':')
206 if allow_wildcards:
207 glob_match = re.match('(.+/)?(\*|{[^/]*})(/.+)?', fetch_suburl)
208 if glob_match:
209 # Parse specs like "branches/*/src:refs/remotes/svn/*" or
210 # "branches/{472,597,648}/src:refs/remotes/svn/*".
211 branch_re = re.escape(base_url)
212 if glob_match.group(1):
213 branch_re += '/' + re.escape(glob_match.group(1))
214 wildcard = glob_match.group(2)
215 if wildcard == '*':
216 branch_re += '([^/]*)'
217 else:
218 # Escape and replace surrounding braces with parentheses and commas
219 # with pipe symbols.
220 wildcard = re.escape(wildcard)
221 wildcard = re.sub('^\\\\{', '(', wildcard)
222 wildcard = re.sub('\\\\,', '|', wildcard)
223 wildcard = re.sub('\\\\}$', ')', wildcard)
224 branch_re += wildcard
225 if glob_match.group(3):
226 branch_re += re.escape(glob_match.group(3))
227 match = re.match(branch_re, url)
228 if match:
229 return re.sub('\*$', match.group(1), as_ref)
230
231 # Parse specs like "trunk/src:refs/remotes/origin/trunk".
232 if fetch_suburl:
233 full_url = base_url + '/' + fetch_suburl
234 else:
235 full_url = base_url
236 if full_url == url:
237 return as_ref
238 return None
239
240 @staticmethod
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000241 def GetSVNBranch(cwd):
242 """Returns the svn branch name if found."""
243 # Try to figure out which remote branch we're based on.
244 # Strategy:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000245 # 1) iterate through our branch history and find the svn URL.
246 # 2) find the svn-remote that fetches from the URL.
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000247
248 # regexp matching the git-svn line that contains the URL.
249 git_svn_re = re.compile(r'^\s*git-svn-id: (\S+)@', re.MULTILINE)
250
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000251 # We don't want to go through all of history, so read a line from the
252 # pipe at a time.
253 # The -100 is an arbitrary limit so we don't search forever.
254 cmd = ['git', 'log', '-100', '--pretty=medium']
maruel@chromium.orgf94e3f12011-12-13 21:03:46 +0000255 proc = subprocess2.Popen(cmd, cwd=cwd, stdout=subprocess2.PIPE)
maruel@chromium.orge8c28622011-04-05 14:41:44 +0000256 url = None
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000257 for line in proc.stdout:
258 match = git_svn_re.match(line)
259 if match:
260 url = match.group(1)
261 proc.stdout.close() # Cut pipe.
262 break
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000263
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000264 if url:
265 svn_remote_re = re.compile(r'^svn-remote\.([^.]+)\.url (.*)$')
maruel@chromium.org80a9ef12011-12-13 20:44:10 +0000266 remotes = GIT.Capture(
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000267 ['config', '--local', '--get-regexp', r'^svn-remote\..*\.url'],
maruel@chromium.org80a9ef12011-12-13 20:44:10 +0000268 cwd=cwd).splitlines()
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000269 for remote in remotes:
270 match = svn_remote_re.match(remote)
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000271 if match:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000272 remote = match.group(1)
273 base_url = match.group(2)
bauerb@chromium.org866276c2011-03-18 20:09:31 +0000274 try:
275 fetch_spec = GIT.Capture(
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000276 ['config', '--local', 'svn-remote.%s.fetch' % remote],
277 cwd=cwd)
bauerb@chromium.org866276c2011-03-18 20:09:31 +0000278 branch = GIT.MatchSvnGlob(url, base_url, fetch_spec, False)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000279 except subprocess2.CalledProcessError:
bauerb@chromium.org866276c2011-03-18 20:09:31 +0000280 branch = None
281 if branch:
282 return branch
283 try:
284 branch_spec = GIT.Capture(
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000285 ['config', '--local', 'svn-remote.%s.branches' % remote],
286 cwd=cwd)
bauerb@chromium.org866276c2011-03-18 20:09:31 +0000287 branch = GIT.MatchSvnGlob(url, base_url, branch_spec, True)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000288 except subprocess2.CalledProcessError:
bauerb@chromium.org866276c2011-03-18 20:09:31 +0000289 branch = None
290 if branch:
291 return branch
292 try:
293 tag_spec = GIT.Capture(
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000294 ['config', '--local', 'svn-remote.%s.tags' % remote],
295 cwd=cwd)
bauerb@chromium.org866276c2011-03-18 20:09:31 +0000296 branch = GIT.MatchSvnGlob(url, base_url, tag_spec, True)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000297 except subprocess2.CalledProcessError:
bauerb@chromium.org866276c2011-03-18 20:09:31 +0000298 branch = None
299 if branch:
300 return branch
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000301
302 @staticmethod
303 def FetchUpstreamTuple(cwd):
304 """Returns a tuple containg remote and remote ref,
305 e.g. 'origin', 'refs/heads/master'
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000306 Tries to be intelligent and understand git-svn.
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000307 """
308 remote = '.'
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000309 branch = GIT.GetBranch(cwd)
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000310 try:
311 upstream_branch = GIT.Capture(
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000312 ['config', '--local', 'branch.%s.merge' % branch], cwd=cwd)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000313 except subprocess2.CalledProcessError:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000314 upstream_branch = None
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000315 if upstream_branch:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000316 try:
317 remote = GIT.Capture(
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000318 ['config', '--local', 'branch.%s.remote' % branch], cwd=cwd)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000319 except subprocess2.CalledProcessError:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000320 pass
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000321 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000322 try:
323 upstream_branch = GIT.Capture(
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000324 ['config', '--local', 'rietveld.upstream-branch'], cwd=cwd)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000325 except subprocess2.CalledProcessError:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000326 upstream_branch = None
327 if upstream_branch:
328 try:
329 remote = GIT.Capture(
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000330 ['config', '--local', 'rietveld.upstream-remote'], cwd=cwd)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000331 except subprocess2.CalledProcessError:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000332 pass
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000333 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000334 # Fall back on trying a git-svn upstream branch.
335 if GIT.IsGitSvn(cwd):
336 upstream_branch = GIT.GetSVNBranch(cwd)
maruel@chromium.orga630bd72010-04-29 23:32:34 +0000337 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000338 # Else, try to guess the origin remote.
339 remote_branches = GIT.Capture(['branch', '-r'], cwd=cwd).split()
340 if 'origin/master' in remote_branches:
341 # Fall back on origin/master if it exits.
342 remote = 'origin'
343 upstream_branch = 'refs/heads/master'
344 elif 'origin/trunk' in remote_branches:
345 # Fall back on origin/trunk if it exists. Generally a shared
346 # git-svn clone
347 remote = 'origin'
348 upstream_branch = 'refs/heads/trunk'
349 else:
350 # Give up.
351 remote = None
352 upstream_branch = None
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000353 return remote, upstream_branch
354
355 @staticmethod
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000356 def GetUpstreamBranch(cwd):
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000357 """Gets the current branch's upstream branch."""
358 remote, upstream_branch = GIT.FetchUpstreamTuple(cwd)
maruel@chromium.orga630bd72010-04-29 23:32:34 +0000359 if remote != '.' and upstream_branch:
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000360 upstream_branch = upstream_branch.replace('heads', 'remotes/' + remote)
361 return upstream_branch
362
363 @staticmethod
maruel@chromium.org8ede00e2010-01-12 14:35:28 +0000364 def GenerateDiff(cwd, branch=None, branch_head='HEAD', full_move=False,
365 files=None):
maruel@chromium.orga9371762009-12-22 18:27:38 +0000366 """Diffs against the upstream branch or optionally another branch.
367
368 full_move means that move or copy operations should completely recreate the
369 files, usually in the prospect to apply the patch for a try job."""
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000370 if not branch:
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000371 branch = GIT.GetUpstreamBranch(cwd)
scottbyer@chromium.org33167332012-02-23 21:15:30 +0000372 command = ['diff', '-p', '--no-color', '--no-prefix', '--no-ext-diff',
evan@chromium.org400f3e72010-05-19 14:23:36 +0000373 branch + "..." + branch_head]
mcgrathr@chromium.org9249f642013-06-03 21:36:18 +0000374 if full_move:
375 command.append('--no-renames')
376 else:
maruel@chromium.orga9371762009-12-22 18:27:38 +0000377 command.append('-C')
maruel@chromium.org8ede00e2010-01-12 14:35:28 +0000378 # TODO(maruel): --binary support.
379 if files:
380 command.append('--')
381 command.extend(files)
ilevy@chromium.org4380c802013-07-12 23:38:41 +0000382 diff = GIT.Capture(command, cwd=cwd, strip_out=False).splitlines(True)
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000383 for i in range(len(diff)):
384 # In the case of added files, replace /dev/null with the path to the
385 # file being added.
386 if diff[i].startswith('--- /dev/null'):
387 diff[i] = '--- %s' % diff[i+1][4:]
388 return ''.join(diff)
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000389
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000390 @staticmethod
maruel@chromium.org8ede00e2010-01-12 14:35:28 +0000391 def GetDifferentFiles(cwd, branch=None, branch_head='HEAD'):
392 """Returns the list of modified files between two branches."""
393 if not branch:
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000394 branch = GIT.GetUpstreamBranch(cwd)
bauerb@chromium.org838f0f22010-04-09 17:02:50 +0000395 command = ['diff', '--name-only', branch + "..." + branch_head]
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000396 return GIT.Capture(command, cwd=cwd).splitlines(False)
maruel@chromium.org8ede00e2010-01-12 14:35:28 +0000397
398 @staticmethod
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000399 def GetPatchName(cwd):
400 """Constructs a name for this patch."""
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000401 short_sha = GIT.Capture(['rev-parse', '--short=4', 'HEAD'], cwd=cwd)
maruel@chromium.org862ff8e2010-08-06 15:29:16 +0000402 return "%s#%s" % (GIT.GetBranch(cwd), short_sha)
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000403
404 @staticmethod
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000405 def GetCheckoutRoot(cwd):
maruel@chromium.org01d8c1d2010-01-07 01:56:59 +0000406 """Returns the top level directory of a git checkout as an absolute path.
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000407 """
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000408 root = GIT.Capture(['rev-parse', '--show-cdup'], cwd=cwd)
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000409 return os.path.abspath(os.path.join(cwd, root))
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000410
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000411 @staticmethod
nodir@chromium.orgead4c7e2014-04-03 01:01:06 +0000412 def GetGitDir(cwd):
413 return os.path.abspath(GIT.Capture(['rev-parse', '--git-dir'], cwd=cwd))
414
415 @staticmethod
416 def IsInsideWorkTree(cwd):
417 try:
418 return GIT.Capture(['rev-parse', '--is-inside-work-tree'], cwd=cwd)
419 except (OSError, subprocess2.CalledProcessError):
420 return False
421
422 @staticmethod
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000423 def GetGitSvnHeadRev(cwd):
424 """Gets the most recently pulled git-svn revision."""
425 try:
426 output = GIT.Capture(['svn', 'info'], cwd=cwd)
427 match = re.search(r'^Revision: ([0-9]+)$', output, re.MULTILINE)
428 return int(match.group(1)) if match else None
429 except (subprocess2.CalledProcessError, ValueError):
430 return None
431
432 @staticmethod
wittman@chromium.org492a3682012-08-10 00:28:28 +0000433 def ParseGitSvnSha1(output):
434 """Parses git-svn output for the first sha1."""
435 match = re.search(r'[0-9a-fA-F]{40}', output)
436 return match.group(0) if match else None
437
438 @staticmethod
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000439 def GetSha1ForSvnRev(cwd, rev):
440 """Returns a corresponding git sha1 for a SVN revision."""
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000441 if not GIT.IsGitSvn(cwd=cwd):
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000442 return None
443 try:
szager@chromium.orgc51def32012-10-15 18:50:37 +0000444 output = GIT.Capture(['svn', 'find-rev', 'r' + str(rev)], cwd=cwd)
445 return GIT.ParseGitSvnSha1(output)
446 except subprocess2.CalledProcessError:
447 return None
448
449 @staticmethod
450 def GetBlessedSha1ForSvnRev(cwd, rev):
451 """Returns a git commit hash from the master branch history that has
452 accurate .DEPS.git and git submodules. To understand why this is more
453 complicated than a simple call to `git svn find-rev`, refer to:
454
455 http://www.chromium.org/developers/how-tos/git-repo
456 """
457 git_svn_rev = GIT.GetSha1ForSvnRev(cwd, rev)
458 if not git_svn_rev:
459 return None
460 try:
szager@google.com312a6a42012-10-11 21:19:42 +0000461 output = GIT.Capture(
462 ['rev-list', '--ancestry-path', '--reverse',
463 '--grep', 'SVN changes up to revision [0-9]*',
464 '%s..refs/remotes/origin/master' % git_svn_rev], cwd=cwd)
465 if not output:
466 return None
467 sha1 = output.splitlines()[0]
468 if not sha1:
469 return None
470 output = GIT.Capture(['rev-list', '-n', '1', '%s^1' % sha1], cwd=cwd)
471 if git_svn_rev != output.rstrip():
472 raise gclient_utils.Error(sha1)
473 return sha1
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000474 except subprocess2.CalledProcessError:
475 return None
476
477 @staticmethod
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000478 def IsValidRevision(cwd, rev, sha_only=False):
479 """Verifies the revision is a proper git revision.
480
481 sha_only: Fail unless rev is a sha hash.
482 """
maruel@chromium.org81473862012-06-27 17:30:56 +0000483 # 'git rev-parse foo' where foo is *any* 40 character hex string will return
484 # the string and return code 0. So strip one character to force 'git
485 # rev-parse' to do a hash table look-up and returns 128 if the hash is not
486 # present.
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000487 lookup_rev = rev
maruel@chromium.org81473862012-06-27 17:30:56 +0000488 if re.match(r'^[0-9a-fA-F]{40}$', rev):
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000489 lookup_rev = rev[:-1]
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000490 try:
ilevy@chromium.org224ba242013-07-08 22:02:31 +0000491 sha = GIT.Capture(['rev-parse', lookup_rev], cwd=cwd).lower()
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000492 if lookup_rev != rev:
493 # Make sure we get the original 40 chars back.
borenet@google.com565b1782014-06-11 20:37:30 +0000494 if rev.lower() != sha:
495 return False
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000496 if sha_only:
borenet@google.com565b1782014-06-11 20:37:30 +0000497 if not sha.startswith(rev.lower()):
498 return False
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000499 except subprocess2.CalledProcessError:
500 return False
borenet@google.com565b1782014-06-11 20:37:30 +0000501 obj_type = GIT.Capture(['cat-file', '-t', rev], cwd=cwd).strip()
502 return obj_type == 'commit'
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000503
maruel@chromium.org36ac2392011-10-12 16:36:11 +0000504 @classmethod
505 def AssertVersion(cls, min_version):
maruel@chromium.orgd0f854a2010-03-11 19:35:53 +0000506 """Asserts git's version is at least min_version."""
maruel@chromium.org36ac2392011-10-12 16:36:11 +0000507 if cls.current_version is None:
bashi@chromium.orgfcffd482012-02-24 01:47:00 +0000508 current_version = cls.Capture(['--version'], '.')
509 matched = re.search(r'version ([0-9\.]+)', current_version)
510 cls.current_version = matched.group(1)
maruel@chromium.org36ac2392011-10-12 16:36:11 +0000511 current_version_list = map(only_int, cls.current_version.split('.'))
maruel@chromium.orgd0f854a2010-03-11 19:35:53 +0000512 for min_ver in map(int, min_version.split('.')):
513 ver = current_version_list.pop(0)
514 if ver < min_ver:
maruel@chromium.org36ac2392011-10-12 16:36:11 +0000515 return (False, cls.current_version)
maruel@chromium.orgd0f854a2010-03-11 19:35:53 +0000516 elif ver > min_ver:
maruel@chromium.org36ac2392011-10-12 16:36:11 +0000517 return (True, cls.current_version)
518 return (True, cls.current_version)
maruel@chromium.orgd0f854a2010-03-11 19:35:53 +0000519
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000520
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000521class SVN(object):
tony@chromium.org57564662010-04-14 02:35:12 +0000522 current_version = None
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000523
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000524 @staticmethod
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000525 def Capture(args, cwd, **kwargs):
maruel@chromium.org54019f32010-09-09 13:50:11 +0000526 """Always redirect stderr.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000527
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000528 Throws an exception if non-0 is returned.
529 """
maruel@chromium.org904af082011-09-08 22:06:09 +0000530 return subprocess2.check_output(
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000531 ['svn'] + args, stderr=subprocess2.PIPE, cwd=cwd, **kwargs)
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000532
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000533 @staticmethod
maruel@chromium.org2b9aa8e2010-08-25 20:01:42 +0000534 def RunAndGetFileList(verbose, args, cwd, file_list, stdout=None):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000535 """Runs svn checkout, update, or status, output to stdout.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000536
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000537 The first item in args must be either "checkout", "update", or "status".
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000538
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000539 svn's stdout is parsed to collect a list of files checked out or updated.
540 These files are appended to file_list. svn's stdout is also printed to
541 sys.stdout as in Run.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000542
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000543 Args:
maruel@chromium.org03807072010-08-16 17:18:44 +0000544 verbose: If True, uses verbose output
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000545 args: A sequence of command line parameters to be passed to svn.
maruel@chromium.org2b9aa8e2010-08-25 20:01:42 +0000546 cwd: The directory where svn is to be run.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000547
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000548 Raises:
549 Error: An error occurred while running the svn command.
550 """
maruel@chromium.org2b9aa8e2010-08-25 20:01:42 +0000551 stdout = stdout or sys.stdout
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000552 if file_list is None:
553 # Even if our caller doesn't care about file_list, we use it internally.
554 file_list = []
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000555
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000556 # svn update and svn checkout use the same pattern: the first three columns
557 # are for file status, property status, and lock status. This is followed
558 # by two spaces, and then the path to the file.
559 update_pattern = '^... (.*)$'
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000560
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000561 # The first three columns of svn status are the same as for svn update and
562 # svn checkout. The next three columns indicate addition-with-history,
563 # switch, and remote lock status. This is followed by one space, and then
564 # the path to the file.
565 status_pattern = '^...... (.*)$'
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000566
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000567 # args[0] must be a supported command. This will blow up if it's something
568 # else, which is good. Note that the patterns are only effective when
569 # these commands are used in their ordinary forms, the patterns are invalid
570 # for "svn status --show-updates", for example.
571 pattern = {
572 'checkout': update_pattern,
573 'status': status_pattern,
574 'update': update_pattern,
575 }[args[0]]
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000576 compiled_pattern = re.compile(pattern)
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000577 # Place an upper limit.
cbentzel@chromium.org2aee2292010-09-03 14:15:25 +0000578 backoff_time = 5
maruel@chromium.orgbec588d2010-10-26 13:50:25 +0000579 retries = 0
maruel@chromium.org03507062010-10-26 00:58:27 +0000580 while True:
maruel@chromium.orgbec588d2010-10-26 13:50:25 +0000581 retries += 1
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000582 previous_list_len = len(file_list)
583 failure = []
maruel@chromium.org54d1f1a2010-01-08 19:53:47 +0000584
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000585 def CaptureMatchingLines(line):
586 match = compiled_pattern.search(line)
587 if match:
588 file_list.append(match.group(1))
589 if line.startswith('svn: '):
maruel@chromium.org8599aa72010-02-08 20:27:14 +0000590 failure.append(line)
maruel@chromium.org54d1f1a2010-01-08 19:53:47 +0000591
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000592 try:
maruel@chromium.org17d01792010-09-01 18:07:10 +0000593 gclient_utils.CheckCallAndFilterAndHeader(
594 ['svn'] + args,
595 cwd=cwd,
596 always=verbose,
597 filter_fn=CaptureMatchingLines,
598 stdout=stdout)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000599 except subprocess2.CalledProcessError:
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000600 def IsKnownFailure():
601 for x in failure:
602 if (x.startswith('svn: OPTIONS of') or
603 x.startswith('svn: PROPFIND of') or
604 x.startswith('svn: REPORT of') or
maruel@chromium.orgf61fc932010-08-19 13:05:24 +0000605 x.startswith('svn: Unknown hostname') or
maruel@chromium.org7d8b97d2011-10-11 23:32:30 +0000606 x.startswith('svn: Server sent unexpected return value') or
607 x.startswith('svn: Can\'t connect to host')):
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000608 return True
609 return False
610
maruel@chromium.org953586a2010-06-15 14:22:24 +0000611 # Subversion client is really misbehaving with Google Code.
612 if args[0] == 'checkout':
613 # Ensure at least one file was checked out, otherwise *delete* the
614 # directory.
615 if len(file_list) == previous_list_len:
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000616 if not IsKnownFailure():
maruel@chromium.org953586a2010-06-15 14:22:24 +0000617 # No known svn error was found, bail out.
618 raise
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000619 # No file were checked out, so make sure the directory is
620 # deleted in case it's messed up and try again.
621 # Warning: It's bad, it assumes args[2] is the directory
622 # argument.
623 if os.path.isdir(args[2]):
digit@chromium.orgdc112ac2013-04-24 13:00:19 +0000624 gclient_utils.rmtree(args[2])
maruel@chromium.org953586a2010-06-15 14:22:24 +0000625 else:
626 # Progress was made, convert to update since an aborted checkout
627 # is now an update.
maruel@chromium.org2de10252010-02-08 01:10:39 +0000628 args = ['update'] + args[1:]
maruel@chromium.org953586a2010-06-15 14:22:24 +0000629 else:
630 # It was an update or export.
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000631 # We enforce that some progress has been made or a known failure.
632 if len(file_list) == previous_list_len and not IsKnownFailure():
633 # No known svn error was found and no progress, bail out.
634 raise
maruel@chromium.orgbec588d2010-10-26 13:50:25 +0000635 if retries == 10:
maruel@chromium.org03507062010-10-26 00:58:27 +0000636 raise
cbentzel@chromium.org2aee2292010-09-03 14:15:25 +0000637 print "Sleeping %.1f seconds and retrying...." % backoff_time
638 time.sleep(backoff_time)
639 backoff_time *= 1.3
maruel@chromium.org953586a2010-06-15 14:22:24 +0000640 continue
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000641 break
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000642
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000643 @staticmethod
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000644 def CaptureRemoteInfo(url):
645 """Returns a dictionary from the svn info output for the given url.
646
647 Throws an exception if svn info fails.
648 """
649 assert isinstance(url, str)
650 return SVN._CaptureInfo([url], None)
651
652 @staticmethod
653 def CaptureLocalInfo(files, cwd):
654 """Returns a dictionary from the svn info output for the given files.
655
656 Throws an exception if svn info fails.
657 """
658 assert isinstance(files, (list, tuple))
659 return SVN._CaptureInfo(files, cwd)
660
661 @staticmethod
662 def _CaptureInfo(files, cwd):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000663 """Returns a dictionary from the svn info output for the given file.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000664
maruel@chromium.org54019f32010-09-09 13:50:11 +0000665 Throws an exception if svn info fails."""
maruel@chromium.orgd25fb8f2011-04-07 13:40:15 +0000666 result = {}
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000667 info = ElementTree.XML(SVN.Capture(['info', '--xml'] + files, cwd))
maruel@chromium.orgade9c592011-04-07 15:59:11 +0000668 if info is None:
669 return result
670 entry = info.find('entry')
maruel@chromium.org6f323bb2011-04-26 15:42:53 +0000671 if entry is None:
672 return result
maruel@chromium.orgade9c592011-04-07 15:59:11 +0000673
674 # Use .text when the item is not optional.
675 result['Path'] = entry.attrib['path']
maruel@chromium.org7d654672012-01-05 19:07:23 +0000676 rev = entry.attrib['revision']
677 try:
678 result['Revision'] = int(rev)
679 except ValueError:
680 result['Revision'] = None
maruel@chromium.orgade9c592011-04-07 15:59:11 +0000681 result['Node Kind'] = entry.attrib['kind']
682 # Differs across versions.
683 if result['Node Kind'] == 'dir':
684 result['Node Kind'] = 'directory'
685 result['URL'] = entry.find('url').text
686 repository = entry.find('repository')
687 result['Repository Root'] = repository.find('root').text
688 result['UUID'] = repository.find('uuid')
689 wc_info = entry.find('wc-info')
690 if wc_info is not None:
691 result['Schedule'] = wc_info.find('schedule').text
692 result['Copied From URL'] = wc_info.find('copy-from-url')
693 result['Copied From Rev'] = wc_info.find('copy-from-rev')
694 else:
695 result['Schedule'] = None
696 result['Copied From URL'] = None
697 result['Copied From Rev'] = None
698 for key in result.keys():
699 if isinstance(result[key], unicode):
700 # Unicode results interferes with the higher layers matching up things
701 # in the deps dictionary.
702 result[key] = result[key].encode()
703 # Automatic conversion of optional parameters.
704 result[key] = getattr(result[key], 'text', result[key])
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000705 return result
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000706
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000707 @staticmethod
maruel@chromium.org54019f32010-09-09 13:50:11 +0000708 def CaptureRevision(cwd):
nasser@codeaurora.org5d63eb82010-03-24 23:22:09 +0000709 """Get the base revision of a SVN repository.
710
711 Returns:
712 Int base revision
713 """
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000714 return SVN.CaptureLocalInfo([], cwd).get('Revision')
nasser@codeaurora.org5d63eb82010-03-24 23:22:09 +0000715
716 @staticmethod
maruel@chromium.orgea15cb72012-05-04 14:16:31 +0000717 def CaptureStatus(files, cwd, no_ignore=False):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000718 """Returns the svn 1.5 svn status emulated output.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000719
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000720 @files can be a string (one file) or a list of files.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000721
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000722 Returns an array of (status, file) tuples."""
723 command = ["status", "--xml"]
maruel@chromium.orgea15cb72012-05-04 14:16:31 +0000724 if no_ignore:
725 command.append('--no-ignore')
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000726 if not files:
727 pass
728 elif isinstance(files, basestring):
729 command.append(files)
730 else:
731 command.extend(files)
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000732
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000733 status_letter = {
734 None: ' ',
735 '': ' ',
736 'added': 'A',
737 'conflicted': 'C',
738 'deleted': 'D',
739 'external': 'X',
740 'ignored': 'I',
741 'incomplete': '!',
742 'merged': 'G',
743 'missing': '!',
744 'modified': 'M',
745 'none': ' ',
746 'normal': ' ',
747 'obstructed': '~',
748 'replaced': 'R',
749 'unversioned': '?',
750 }
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000751 dom = ElementTree.XML(SVN.Capture(command, cwd))
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000752 results = []
maruel@chromium.orgade9c592011-04-07 15:59:11 +0000753 if dom is None:
754 return results
755 # /status/target/entry/(wc-status|commit|author|date)
756 for target in dom.findall('target'):
757 for entry in target.findall('entry'):
758 file_path = entry.attrib['path']
759 wc_status = entry.find('wc-status')
760 # Emulate svn 1.5 status ouput...
761 statuses = [' '] * 7
762 # Col 0
763 xml_item_status = wc_status.attrib['item']
764 if xml_item_status in status_letter:
765 statuses[0] = status_letter[xml_item_status]
766 else:
767 raise gclient_utils.Error(
768 'Unknown item status "%s"; please implement me!' %
769 xml_item_status)
770 # Col 1
771 xml_props_status = wc_status.attrib['props']
772 if xml_props_status == 'modified':
773 statuses[1] = 'M'
774 elif xml_props_status == 'conflicted':
775 statuses[1] = 'C'
776 elif (not xml_props_status or xml_props_status == 'none' or
777 xml_props_status == 'normal'):
778 pass
779 else:
780 raise gclient_utils.Error(
781 'Unknown props status "%s"; please implement me!' %
782 xml_props_status)
783 # Col 2
784 if wc_status.attrib.get('wc-locked') == 'true':
785 statuses[2] = 'L'
786 # Col 3
787 if wc_status.attrib.get('copied') == 'true':
788 statuses[3] = '+'
789 # Col 4
790 if wc_status.attrib.get('switched') == 'true':
791 statuses[4] = 'S'
792 # TODO(maruel): Col 5 and 6
793 item = (''.join(statuses), file_path)
794 results.append(item)
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000795 return results
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000796
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000797 @staticmethod
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000798 def IsMoved(filename, cwd):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000799 """Determine if a file has been added through svn mv"""
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000800 assert isinstance(filename, basestring)
801 return SVN.IsMovedInfo(SVN.CaptureLocalInfo([filename], cwd))
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000802
803 @staticmethod
804 def IsMovedInfo(info):
805 """Determine if a file has been added through svn mv"""
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000806 return (info.get('Copied From URL') and
807 info.get('Copied From Rev') and
808 info.get('Schedule') == 'add')
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000809
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000810 @staticmethod
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000811 def GetFileProperty(filename, property_name, cwd):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000812 """Returns the value of an SVN property for the given file.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000813
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000814 Args:
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000815 filename: The file to check
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000816 property_name: The name of the SVN property, e.g. "svn:mime-type"
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000817
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000818 Returns:
819 The value of the property, which will be the empty string if the property
820 is not set on the file. If the file is not under version control, the
821 empty string is also returned.
822 """
maruel@chromium.org54019f32010-09-09 13:50:11 +0000823 try:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000824 return SVN.Capture(['propget', property_name, filename], cwd)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000825 except subprocess2.CalledProcessError:
maruel@chromium.org54019f32010-09-09 13:50:11 +0000826 return ''
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000827
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000828 @staticmethod
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000829 def GenerateDiff(filenames, cwd, full_move, revision):
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000830 """Returns a string containing the diff for the given file list.
831
832 The files in the list should either be absolute paths or relative to the
833 given root. If no root directory is provided, the repository root will be
834 used.
835 The diff will always use relative paths.
836 """
maruel@chromium.org00fdcb32011-02-24 01:41:02 +0000837 assert isinstance(filenames, (list, tuple))
pkasting@chromium.org0db557c2013-04-24 23:44:23 +0000838 # If the user specified a custom diff command in their svn config file,
839 # then it'll be used when we do svn diff, which we don't want to happen
840 # since we want the unified diff.
841 if SVN.AssertVersion("1.7")[0]:
842 # On svn >= 1.7, the "--internal-diff" flag will solve this.
843 return SVN._GenerateDiffInternal(filenames, cwd, full_move, revision,
844 ["diff", "--internal-diff"],
845 ["diff", "--internal-diff"])
846 else:
847 # On svn < 1.7, the "--internal-diff" flag doesn't exist. Using
848 # --diff-cmd=diff doesn't always work, since e.g. Windows cmd users may
849 # not have a "diff" executable in their path at all. So we use an empty
850 # temporary directory as the config directory, which bypasses any user
851 # settings for the diff-cmd. However, we don't pass this for the
852 # remote_safe_diff_command parameter, since when a new config-dir is
853 # specified for an svn diff against a remote URL, it triggers
854 # authentication prompts. In this case there isn't really a good
855 # alternative to svn 1.7's --internal-diff flag.
856 bogus_dir = tempfile.mkdtemp()
857 try:
858 return SVN._GenerateDiffInternal(filenames, cwd, full_move, revision,
859 ["diff", "--config-dir", bogus_dir],
860 ["diff"])
861 finally:
862 gclient_utils.rmtree(bogus_dir)
863
864 @staticmethod
865 def _GenerateDiffInternal(filenames, cwd, full_move, revision, diff_command,
866 remote_safe_diff_command):
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000867 root = os.path.normcase(os.path.join(cwd, ''))
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000868 def RelativePath(path, root):
869 """We must use relative paths."""
maruel@chromium.orgfd9cbbb2010-01-08 23:04:03 +0000870 if os.path.normcase(path).startswith(root):
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000871 return path[len(root):]
872 return path
pkasting@chromium.org0db557c2013-04-24 23:44:23 +0000873 # Cleanup filenames
874 filenames = [RelativePath(f, root) for f in filenames]
875 # Get information about the modified items (files and directories)
876 data = dict((f, SVN.CaptureLocalInfo([f], root)) for f in filenames)
877 diffs = []
878 if full_move:
879 # Eliminate modified files inside moved/copied directory.
880 for (filename, info) in data.iteritems():
881 if SVN.IsMovedInfo(info) and info.get("Node Kind") == "directory":
882 # Remove files inside the directory.
883 filenames = [f for f in filenames
884 if not f.startswith(filename + os.path.sep)]
885 for filename in data.keys():
886 if not filename in filenames:
887 # Remove filtered out items.
888 del data[filename]
889 else:
890 metaheaders = []
891 for (filename, info) in data.iteritems():
892 if SVN.IsMovedInfo(info):
893 # for now, the most common case is a head copy,
894 # so let's just encode that as a straight up cp.
895 srcurl = info.get('Copied From URL')
896 file_root = info.get('Repository Root')
897 rev = int(info.get('Copied From Rev'))
898 assert srcurl.startswith(file_root)
899 src = srcurl[len(file_root)+1:]
900 try:
901 srcinfo = SVN.CaptureRemoteInfo(srcurl)
902 except subprocess2.CalledProcessError, e:
903 if not 'Not a valid URL' in e.stderr:
904 raise
905 # Assume the file was deleted. No idea how to figure out at which
906 # revision the file was deleted.
907 srcinfo = {'Revision': rev}
908 if (srcinfo.get('Revision') != rev and
909 SVN.Capture(remote_safe_diff_command + ['-r', '%d:head' % rev,
910 srcurl], cwd)):
911 metaheaders.append("#$ svn cp -r %d %s %s "
912 "### WARNING: note non-trunk copy\n" %
913 (rev, src, filename))
914 else:
915 metaheaders.append("#$ cp %s %s\n" % (src,
916 filename))
917 if metaheaders:
918 diffs.append("### BEGIN SVN COPY METADATA\n")
919 diffs.extend(metaheaders)
920 diffs.append("### END SVN COPY METADATA\n")
921 # Now ready to do the actual diff.
922 for filename in sorted(data):
923 diffs.append(SVN._DiffItemInternal(
924 filename, cwd, data[filename], diff_command, full_move, revision))
925 # Use StringIO since it can be messy when diffing a directory move with
926 # full_move=True.
927 buf = cStringIO.StringIO()
928 for d in filter(None, diffs):
929 buf.write(d)
930 result = buf.getvalue()
931 buf.close()
932 return result
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000933
934 @staticmethod
pkasting@chromium.org0db557c2013-04-24 23:44:23 +0000935 def _DiffItemInternal(filename, cwd, info, diff_command, full_move, revision):
pkasting@chromium.org917ea7f2013-04-19 20:10:03 +0000936 """Grabs the diff data."""
pkasting@chromium.org0db557c2013-04-24 23:44:23 +0000937 command = diff_command + [filename]
pkasting@chromium.org917ea7f2013-04-19 20:10:03 +0000938 if revision:
939 command.extend(['--revision', revision])
940 data = None
941 if SVN.IsMovedInfo(info):
942 if full_move:
943 if info.get("Node Kind") == "directory":
944 # Things become tricky here. It's a directory copy/move. We need to
945 # diff all the files inside it.
946 # This will put a lot of pressure on the heap. This is why StringIO
947 # is used and converted back into a string at the end. The reason to
948 # return a string instead of a StringIO is that StringIO.write()
949 # doesn't accept a StringIO object. *sigh*.
950 for (dirpath, dirnames, filenames) in os.walk(filename):
951 # Cleanup all files starting with a '.'.
952 for d in dirnames:
953 if d.startswith('.'):
954 dirnames.remove(d)
955 for f in filenames:
956 if f.startswith('.'):
957 filenames.remove(f)
958 for f in filenames:
959 if data is None:
960 data = cStringIO.StringIO()
961 data.write(GenFakeDiff(os.path.join(dirpath, f)))
962 if data:
963 tmp = data.getvalue()
964 data.close()
965 data = tmp
966 else:
967 data = GenFakeDiff(filename)
968 else:
969 if info.get("Node Kind") != "directory":
970 # svn diff on a mv/cp'd file outputs nothing if there was no change.
971 data = SVN.Capture(command, cwd)
972 if not data:
973 # We put in an empty Index entry so upload.py knows about them.
974 data = "Index: %s\n" % filename.replace(os.sep, '/')
975 # Otherwise silently ignore directories.
976 else:
977 if info.get("Node Kind") != "directory":
978 # Normal simple case.
979 try:
980 data = SVN.Capture(command, cwd)
981 except subprocess2.CalledProcessError:
982 if revision:
983 data = GenFakeDiff(filename)
984 else:
985 raise
986 # Otherwise silently ignore directories.
987 return data
988
989 @staticmethod
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000990 def GetEmail(cwd):
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000991 """Retrieves the svn account which we assume is an email address."""
maruel@chromium.org54019f32010-09-09 13:50:11 +0000992 try:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000993 infos = SVN.CaptureLocalInfo([], cwd)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000994 except subprocess2.CalledProcessError:
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000995 return None
996
997 # Should check for uuid but it is incorrectly saved for https creds.
maruel@chromium.org54019f32010-09-09 13:50:11 +0000998 root = infos['Repository Root']
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000999 realm = root.rsplit('/', 1)[0]
maruel@chromium.org54019f32010-09-09 13:50:11 +00001000 uuid = infos['UUID']
maruel@chromium.orgc78f2462009-11-21 01:20:57 +00001001 if root.startswith('https') or not uuid:
1002 regexp = re.compile(r'<%s:\d+>.*' % realm)
1003 else:
1004 regexp = re.compile(r'<%s:\d+> %s' % (realm, uuid))
1005 if regexp is None:
1006 return None
1007 if sys.platform.startswith('win'):
1008 if not 'APPDATA' in os.environ:
1009 return None
maruel@chromium.org720d9f32009-11-21 17:38:57 +00001010 auth_dir = os.path.join(os.environ['APPDATA'], 'Subversion', 'auth',
1011 'svn.simple')
maruel@chromium.orgc78f2462009-11-21 01:20:57 +00001012 else:
1013 if not 'HOME' in os.environ:
1014 return None
1015 auth_dir = os.path.join(os.environ['HOME'], '.subversion', 'auth',
1016 'svn.simple')
1017 for credfile in os.listdir(auth_dir):
1018 cred_info = SVN.ReadSimpleAuth(os.path.join(auth_dir, credfile))
1019 if regexp.match(cred_info.get('svn:realmstring')):
1020 return cred_info.get('username')
1021
1022 @staticmethod
1023 def ReadSimpleAuth(filename):
1024 f = open(filename, 'r')
1025 values = {}
maruel@chromium.org6e29d572010-06-04 17:32:20 +00001026 def ReadOneItem(item_type):
1027 m = re.match(r'%s (\d+)' % item_type, f.readline())
maruel@chromium.orgc78f2462009-11-21 01:20:57 +00001028 if not m:
1029 return None
1030 data = f.read(int(m.group(1)))
1031 if f.read(1) != '\n':
1032 return None
1033 return data
1034
1035 while True:
1036 key = ReadOneItem('K')
1037 if not key:
1038 break
1039 value = ReadOneItem('V')
1040 if not value:
1041 break
1042 values[key] = value
1043 return values
maruel@chromium.org94b1ee92009-12-19 20:27:20 +00001044
1045 @staticmethod
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001046 def GetCheckoutRoot(cwd):
maruel@chromium.org94b1ee92009-12-19 20:27:20 +00001047 """Returns the top level directory of the current repository.
1048
1049 The directory is returned as an absolute path.
1050 """
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001051 cwd = os.path.abspath(cwd)
maruel@chromium.org54019f32010-09-09 13:50:11 +00001052 try:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001053 info = SVN.CaptureLocalInfo([], cwd)
maruel@chromium.org885d6e82011-02-24 20:21:46 +00001054 cur_dir_repo_root = info['Repository Root']
1055 url = info['URL']
maruel@chromium.orgda64d632011-09-08 17:41:15 +00001056 except subprocess2.CalledProcessError:
maruel@chromium.org94b1ee92009-12-19 20:27:20 +00001057 return None
maruel@chromium.org94b1ee92009-12-19 20:27:20 +00001058 while True:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001059 parent = os.path.dirname(cwd)
maruel@chromium.org54019f32010-09-09 13:50:11 +00001060 try:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001061 info = SVN.CaptureLocalInfo([], parent)
maruel@chromium.org885d6e82011-02-24 20:21:46 +00001062 if (info['Repository Root'] != cur_dir_repo_root or
1063 info['URL'] != os.path.dirname(url)):
maruel@chromium.org54019f32010-09-09 13:50:11 +00001064 break
maruel@chromium.org885d6e82011-02-24 20:21:46 +00001065 url = info['URL']
maruel@chromium.orgda64d632011-09-08 17:41:15 +00001066 except subprocess2.CalledProcessError:
maruel@chromium.org94b1ee92009-12-19 20:27:20 +00001067 break
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001068 cwd = parent
1069 return GetCasedPath(cwd)
tony@chromium.org57564662010-04-14 02:35:12 +00001070
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +00001071 @staticmethod
1072 def IsValidRevision(url):
1073 """Verifies the revision looks like an SVN revision."""
1074 try:
1075 SVN.Capture(['info', url], cwd=None)
1076 return True
1077 except subprocess2.CalledProcessError:
1078 return False
1079
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001080 @classmethod
1081 def AssertVersion(cls, min_version):
tony@chromium.org57564662010-04-14 02:35:12 +00001082 """Asserts svn's version is at least min_version."""
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001083 if cls.current_version is None:
shouqun.liu@intel.com13b522c2012-07-20 17:16:51 +00001084 cls.current_version = cls.Capture(['--version', '--quiet'], None)
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001085 current_version_list = map(only_int, cls.current_version.split('.'))
tony@chromium.org57564662010-04-14 02:35:12 +00001086 for min_ver in map(int, min_version.split('.')):
1087 ver = current_version_list.pop(0)
1088 if ver < min_ver:
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001089 return (False, cls.current_version)
tony@chromium.org57564662010-04-14 02:35:12 +00001090 elif ver > min_ver:
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001091 return (True, cls.current_version)
1092 return (True, cls.current_version)
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001093
1094 @staticmethod
maruel@chromium.orgea15cb72012-05-04 14:16:31 +00001095 def Revert(cwd, callback=None, ignore_externals=False, no_ignore=False):
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001096 """Reverts all svn modifications in cwd, including properties.
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001097
1098 Deletes any modified files or directory.
1099
1100 A "svn update --revision BASE" call is required after to revive deleted
1101 files.
1102 """
maruel@chromium.orgea15cb72012-05-04 14:16:31 +00001103 for file_status in SVN.CaptureStatus(None, cwd, no_ignore=no_ignore):
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001104 file_path = os.path.join(cwd, file_status[1])
maruel@chromium.org8c415122011-03-15 17:14:27 +00001105 if (ignore_externals and
1106 file_status[0][0] == 'X' and
1107 file_status[0][1:].isspace()):
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001108 # Ignore externals.
1109 logging.info('Ignoring external %s' % file_status[1])
1110 continue
1111
maruel@chromium.org62087572012-04-24 23:16:28 +00001112 # This is the case where '! L .' is returned by 'svn status'. Just
1113 # strip off the '/.'.
1114 if file_path.endswith(os.path.sep + '.'):
1115 file_path = file_path[:-2]
1116
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001117 if callback:
1118 callback(file_status)
1119
maruel@chromium.org8c415122011-03-15 17:14:27 +00001120 if os.path.exists(file_path):
1121 # svn revert is really stupid. It fails on inconsistent line-endings,
1122 # on switched directories, etc. So take no chance and delete everything!
1123 # In theory, it wouldn't be necessary for property-only change but then
1124 # it'd have to look for switched directories, etc so it's not worth
1125 # optimizing this use case.
1126 if os.path.isfile(file_path) or os.path.islink(file_path):
1127 logging.info('os.remove(%s)' % file_path)
1128 os.remove(file_path)
1129 elif os.path.isdir(file_path):
digit@chromium.orgdc112ac2013-04-24 13:00:19 +00001130 logging.info('rmtree(%s)' % file_path)
1131 gclient_utils.rmtree(file_path)
maruel@chromium.org8c415122011-03-15 17:14:27 +00001132 else:
1133 logging.critical(
1134 ('No idea what is %s.\nYou just found a bug in gclient'
1135 ', please ping maruel@chromium.org ASAP!') % file_path)
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001136
maruel@chromium.org8c415122011-03-15 17:14:27 +00001137 if (file_status[0][0] in ('D', 'A', '!') or
1138 not file_status[0][1:].isspace()):
maruel@chromium.orgaf453492011-03-03 21:04:09 +00001139 # Added, deleted file requires manual intervention and require calling
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001140 # revert, like for properties.
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001141 if not os.path.isdir(cwd):
maruel@chromium.org8b322b32011-11-01 19:05:50 +00001142 # '.' was deleted. It's not worth continuing.
1143 return
maruel@chromium.orgaf453492011-03-03 21:04:09 +00001144 try:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001145 SVN.Capture(['revert', file_status[1]], cwd=cwd)
maruel@chromium.orgda64d632011-09-08 17:41:15 +00001146 except subprocess2.CalledProcessError:
maruel@chromium.orgaf453492011-03-03 21:04:09 +00001147 if not os.path.exists(file_path):
1148 continue
1149 raise