blob: 9bc96bc8055832707a749d3b9d256766b5a43956 [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
mmoss@chromium.org6e7202b2014-09-09 18:23:39 +0000356 def RefToRemoteRef(ref, remote=None):
357 """Convert a checkout ref to the equivalent remote ref.
358
359 Returns:
360 A tuple of the remote ref's (common prefix, unique suffix), or None if it
361 doesn't appear to refer to a remote ref (e.g. it's a commit hash).
362 """
363 # TODO(mmoss): This is just a brute-force mapping based of the expected git
364 # config. It's a bit better than the even more brute-force replace('heads',
365 # ...), but could still be smarter (like maybe actually using values gleaned
366 # from the git config).
367 m = re.match('^(refs/(remotes/)?)?branch-heads/', ref or '')
368 if m:
369 return ('refs/remotes/branch-heads/', ref.replace(m.group(0), ''))
370 if remote:
371 m = re.match('^((refs/)?remotes/)?%s/|(refs/)?heads/' % remote, ref or '')
372 if m:
373 return ('refs/remotes/%s/' % remote, ref.replace(m.group(0), ''))
374 return None
375
376 @staticmethod
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000377 def GetUpstreamBranch(cwd):
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000378 """Gets the current branch's upstream branch."""
379 remote, upstream_branch = GIT.FetchUpstreamTuple(cwd)
maruel@chromium.orga630bd72010-04-29 23:32:34 +0000380 if remote != '.' and upstream_branch:
mmoss@chromium.org6e7202b2014-09-09 18:23:39 +0000381 remote_ref = GIT.RefToRemoteRef(upstream_branch, remote)
382 if remote_ref:
383 upstream_branch = ''.join(remote_ref)
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000384 return upstream_branch
385
386 @staticmethod
maruel@chromium.org8ede00e2010-01-12 14:35:28 +0000387 def GenerateDiff(cwd, branch=None, branch_head='HEAD', full_move=False,
388 files=None):
maruel@chromium.orga9371762009-12-22 18:27:38 +0000389 """Diffs against the upstream branch or optionally another branch.
390
391 full_move means that move or copy operations should completely recreate the
392 files, usually in the prospect to apply the patch for a try job."""
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000393 if not branch:
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000394 branch = GIT.GetUpstreamBranch(cwd)
scottbyer@chromium.org33167332012-02-23 21:15:30 +0000395 command = ['diff', '-p', '--no-color', '--no-prefix', '--no-ext-diff',
evan@chromium.org400f3e72010-05-19 14:23:36 +0000396 branch + "..." + branch_head]
mcgrathr@chromium.org9249f642013-06-03 21:36:18 +0000397 if full_move:
398 command.append('--no-renames')
399 else:
maruel@chromium.orga9371762009-12-22 18:27:38 +0000400 command.append('-C')
maruel@chromium.org8ede00e2010-01-12 14:35:28 +0000401 # TODO(maruel): --binary support.
402 if files:
403 command.append('--')
404 command.extend(files)
ilevy@chromium.org4380c802013-07-12 23:38:41 +0000405 diff = GIT.Capture(command, cwd=cwd, strip_out=False).splitlines(True)
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000406 for i in range(len(diff)):
407 # In the case of added files, replace /dev/null with the path to the
408 # file being added.
409 if diff[i].startswith('--- /dev/null'):
410 diff[i] = '--- %s' % diff[i+1][4:]
411 return ''.join(diff)
maruel@chromium.orgc78f2462009-11-21 01:20:57 +0000412
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000413 @staticmethod
maruel@chromium.org8ede00e2010-01-12 14:35:28 +0000414 def GetDifferentFiles(cwd, branch=None, branch_head='HEAD'):
415 """Returns the list of modified files between two branches."""
416 if not branch:
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000417 branch = GIT.GetUpstreamBranch(cwd)
bauerb@chromium.org838f0f22010-04-09 17:02:50 +0000418 command = ['diff', '--name-only', branch + "..." + branch_head]
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000419 return GIT.Capture(command, cwd=cwd).splitlines(False)
maruel@chromium.org8ede00e2010-01-12 14:35:28 +0000420
421 @staticmethod
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000422 def GetPatchName(cwd):
423 """Constructs a name for this patch."""
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000424 short_sha = GIT.Capture(['rev-parse', '--short=4', 'HEAD'], cwd=cwd)
maruel@chromium.org862ff8e2010-08-06 15:29:16 +0000425 return "%s#%s" % (GIT.GetBranch(cwd), short_sha)
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000426
427 @staticmethod
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000428 def GetCheckoutRoot(cwd):
maruel@chromium.org01d8c1d2010-01-07 01:56:59 +0000429 """Returns the top level directory of a git checkout as an absolute path.
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000430 """
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000431 root = GIT.Capture(['rev-parse', '--show-cdup'], cwd=cwd)
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000432 return os.path.abspath(os.path.join(cwd, root))
maruel@chromium.orgb24a8e12009-12-22 13:45:48 +0000433
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000434 @staticmethod
nodir@chromium.orgead4c7e2014-04-03 01:01:06 +0000435 def GetGitDir(cwd):
436 return os.path.abspath(GIT.Capture(['rev-parse', '--git-dir'], cwd=cwd))
437
438 @staticmethod
439 def IsInsideWorkTree(cwd):
440 try:
441 return GIT.Capture(['rev-parse', '--is-inside-work-tree'], cwd=cwd)
442 except (OSError, subprocess2.CalledProcessError):
443 return False
444
445 @staticmethod
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000446 def GetGitSvnHeadRev(cwd):
447 """Gets the most recently pulled git-svn revision."""
448 try:
449 output = GIT.Capture(['svn', 'info'], cwd=cwd)
450 match = re.search(r'^Revision: ([0-9]+)$', output, re.MULTILINE)
451 return int(match.group(1)) if match else None
452 except (subprocess2.CalledProcessError, ValueError):
453 return None
454
455 @staticmethod
wittman@chromium.org492a3682012-08-10 00:28:28 +0000456 def ParseGitSvnSha1(output):
457 """Parses git-svn output for the first sha1."""
458 match = re.search(r'[0-9a-fA-F]{40}', output)
459 return match.group(0) if match else None
460
461 @staticmethod
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000462 def GetSha1ForSvnRev(cwd, rev):
463 """Returns a corresponding git sha1 for a SVN revision."""
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000464 if not GIT.IsGitSvn(cwd=cwd):
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000465 return None
466 try:
szager@chromium.orgc51def32012-10-15 18:50:37 +0000467 output = GIT.Capture(['svn', 'find-rev', 'r' + str(rev)], cwd=cwd)
468 return GIT.ParseGitSvnSha1(output)
469 except subprocess2.CalledProcessError:
470 return None
471
472 @staticmethod
473 def GetBlessedSha1ForSvnRev(cwd, rev):
474 """Returns a git commit hash from the master branch history that has
475 accurate .DEPS.git and git submodules. To understand why this is more
476 complicated than a simple call to `git svn find-rev`, refer to:
477
478 http://www.chromium.org/developers/how-tos/git-repo
479 """
480 git_svn_rev = GIT.GetSha1ForSvnRev(cwd, rev)
481 if not git_svn_rev:
482 return None
483 try:
szager@google.com312a6a42012-10-11 21:19:42 +0000484 output = GIT.Capture(
485 ['rev-list', '--ancestry-path', '--reverse',
486 '--grep', 'SVN changes up to revision [0-9]*',
487 '%s..refs/remotes/origin/master' % git_svn_rev], cwd=cwd)
488 if not output:
489 return None
490 sha1 = output.splitlines()[0]
491 if not sha1:
492 return None
493 output = GIT.Capture(['rev-list', '-n', '1', '%s^1' % sha1], cwd=cwd)
494 if git_svn_rev != output.rstrip():
495 raise gclient_utils.Error(sha1)
496 return sha1
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000497 except subprocess2.CalledProcessError:
498 return None
499
500 @staticmethod
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000501 def IsValidRevision(cwd, rev, sha_only=False):
502 """Verifies the revision is a proper git revision.
503
504 sha_only: Fail unless rev is a sha hash.
505 """
maruel@chromium.org81473862012-06-27 17:30:56 +0000506 # 'git rev-parse foo' where foo is *any* 40 character hex string will return
507 # the string and return code 0. So strip one character to force 'git
508 # rev-parse' to do a hash table look-up and returns 128 if the hash is not
509 # present.
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000510 lookup_rev = rev
maruel@chromium.org81473862012-06-27 17:30:56 +0000511 if re.match(r'^[0-9a-fA-F]{40}$', rev):
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000512 lookup_rev = rev[:-1]
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000513 try:
ilevy@chromium.org224ba242013-07-08 22:02:31 +0000514 sha = GIT.Capture(['rev-parse', lookup_rev], cwd=cwd).lower()
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000515 if lookup_rev != rev:
516 # Make sure we get the original 40 chars back.
hinoka@google.com68953172014-06-11 22:14:35 +0000517 return rev.lower() == sha
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000518 if sha_only:
hinoka@google.com68953172014-06-11 22:14:35 +0000519 return sha.startswith(rev.lower())
520 return True
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000521 except subprocess2.CalledProcessError:
522 return False
523
maruel@chromium.org36ac2392011-10-12 16:36:11 +0000524 @classmethod
525 def AssertVersion(cls, min_version):
maruel@chromium.orgd0f854a2010-03-11 19:35:53 +0000526 """Asserts git's version is at least min_version."""
maruel@chromium.org36ac2392011-10-12 16:36:11 +0000527 if cls.current_version is None:
bashi@chromium.orgfcffd482012-02-24 01:47:00 +0000528 current_version = cls.Capture(['--version'], '.')
529 matched = re.search(r'version ([0-9\.]+)', current_version)
530 cls.current_version = matched.group(1)
maruel@chromium.org36ac2392011-10-12 16:36:11 +0000531 current_version_list = map(only_int, cls.current_version.split('.'))
maruel@chromium.orgd0f854a2010-03-11 19:35:53 +0000532 for min_ver in map(int, min_version.split('.')):
533 ver = current_version_list.pop(0)
534 if ver < min_ver:
maruel@chromium.org36ac2392011-10-12 16:36:11 +0000535 return (False, cls.current_version)
maruel@chromium.orgd0f854a2010-03-11 19:35:53 +0000536 elif ver > min_ver:
maruel@chromium.org36ac2392011-10-12 16:36:11 +0000537 return (True, cls.current_version)
538 return (True, cls.current_version)
maruel@chromium.orgd0f854a2010-03-11 19:35:53 +0000539
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000540
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000541class SVN(object):
tony@chromium.org57564662010-04-14 02:35:12 +0000542 current_version = None
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000543
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000544 @staticmethod
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000545 def Capture(args, cwd, **kwargs):
maruel@chromium.org54019f32010-09-09 13:50:11 +0000546 """Always redirect stderr.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000547
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000548 Throws an exception if non-0 is returned.
549 """
maruel@chromium.org904af082011-09-08 22:06:09 +0000550 return subprocess2.check_output(
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000551 ['svn'] + args, stderr=subprocess2.PIPE, cwd=cwd, **kwargs)
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000552
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000553 @staticmethod
maruel@chromium.org2b9aa8e2010-08-25 20:01:42 +0000554 def RunAndGetFileList(verbose, args, cwd, file_list, stdout=None):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000555 """Runs svn checkout, update, or status, output to stdout.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000556
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000557 The first item in args must be either "checkout", "update", or "status".
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000558
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000559 svn's stdout is parsed to collect a list of files checked out or updated.
560 These files are appended to file_list. svn's stdout is also printed to
561 sys.stdout as in Run.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000562
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000563 Args:
maruel@chromium.org03807072010-08-16 17:18:44 +0000564 verbose: If True, uses verbose output
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000565 args: A sequence of command line parameters to be passed to svn.
maruel@chromium.org2b9aa8e2010-08-25 20:01:42 +0000566 cwd: The directory where svn is to be run.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000567
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000568 Raises:
569 Error: An error occurred while running the svn command.
570 """
maruel@chromium.org2b9aa8e2010-08-25 20:01:42 +0000571 stdout = stdout or sys.stdout
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000572 if file_list is None:
573 # Even if our caller doesn't care about file_list, we use it internally.
574 file_list = []
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000575
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000576 # svn update and svn checkout use the same pattern: the first three columns
577 # are for file status, property status, and lock status. This is followed
578 # by two spaces, and then the path to the file.
579 update_pattern = '^... (.*)$'
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000580
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000581 # The first three columns of svn status are the same as for svn update and
582 # svn checkout. The next three columns indicate addition-with-history,
583 # switch, and remote lock status. This is followed by one space, and then
584 # the path to the file.
585 status_pattern = '^...... (.*)$'
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000586
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000587 # args[0] must be a supported command. This will blow up if it's something
588 # else, which is good. Note that the patterns are only effective when
589 # these commands are used in their ordinary forms, the patterns are invalid
590 # for "svn status --show-updates", for example.
591 pattern = {
592 'checkout': update_pattern,
593 'status': status_pattern,
594 'update': update_pattern,
595 }[args[0]]
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000596 compiled_pattern = re.compile(pattern)
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000597 # Place an upper limit.
cbentzel@chromium.org2aee2292010-09-03 14:15:25 +0000598 backoff_time = 5
maruel@chromium.orgbec588d2010-10-26 13:50:25 +0000599 retries = 0
maruel@chromium.org03507062010-10-26 00:58:27 +0000600 while True:
maruel@chromium.orgbec588d2010-10-26 13:50:25 +0000601 retries += 1
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000602 previous_list_len = len(file_list)
603 failure = []
maruel@chromium.org54d1f1a2010-01-08 19:53:47 +0000604
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000605 def CaptureMatchingLines(line):
606 match = compiled_pattern.search(line)
607 if match:
608 file_list.append(match.group(1))
609 if line.startswith('svn: '):
maruel@chromium.org8599aa72010-02-08 20:27:14 +0000610 failure.append(line)
maruel@chromium.org54d1f1a2010-01-08 19:53:47 +0000611
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000612 try:
maruel@chromium.org17d01792010-09-01 18:07:10 +0000613 gclient_utils.CheckCallAndFilterAndHeader(
614 ['svn'] + args,
615 cwd=cwd,
616 always=verbose,
617 filter_fn=CaptureMatchingLines,
618 stdout=stdout)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000619 except subprocess2.CalledProcessError:
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000620 def IsKnownFailure():
621 for x in failure:
622 if (x.startswith('svn: OPTIONS of') or
623 x.startswith('svn: PROPFIND of') or
624 x.startswith('svn: REPORT of') or
maruel@chromium.orgf61fc932010-08-19 13:05:24 +0000625 x.startswith('svn: Unknown hostname') or
maruel@chromium.org7d8b97d2011-10-11 23:32:30 +0000626 x.startswith('svn: Server sent unexpected return value') or
627 x.startswith('svn: Can\'t connect to host')):
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000628 return True
629 return False
630
maruel@chromium.org953586a2010-06-15 14:22:24 +0000631 # Subversion client is really misbehaving with Google Code.
632 if args[0] == 'checkout':
633 # Ensure at least one file was checked out, otherwise *delete* the
634 # directory.
635 if len(file_list) == previous_list_len:
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000636 if not IsKnownFailure():
maruel@chromium.org953586a2010-06-15 14:22:24 +0000637 # No known svn error was found, bail out.
638 raise
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000639 # No file were checked out, so make sure the directory is
640 # deleted in case it's messed up and try again.
641 # Warning: It's bad, it assumes args[2] is the directory
642 # argument.
643 if os.path.isdir(args[2]):
digit@chromium.orgdc112ac2013-04-24 13:00:19 +0000644 gclient_utils.rmtree(args[2])
maruel@chromium.org953586a2010-06-15 14:22:24 +0000645 else:
646 # Progress was made, convert to update since an aborted checkout
647 # is now an update.
maruel@chromium.org2de10252010-02-08 01:10:39 +0000648 args = ['update'] + args[1:]
maruel@chromium.org953586a2010-06-15 14:22:24 +0000649 else:
650 # It was an update or export.
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000651 # We enforce that some progress has been made or a known failure.
652 if len(file_list) == previous_list_len and not IsKnownFailure():
653 # No known svn error was found and no progress, bail out.
654 raise
maruel@chromium.orgbec588d2010-10-26 13:50:25 +0000655 if retries == 10:
maruel@chromium.org03507062010-10-26 00:58:27 +0000656 raise
cbentzel@chromium.org2aee2292010-09-03 14:15:25 +0000657 print "Sleeping %.1f seconds and retrying...." % backoff_time
658 time.sleep(backoff_time)
659 backoff_time *= 1.3
maruel@chromium.org953586a2010-06-15 14:22:24 +0000660 continue
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000661 break
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000662
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000663 @staticmethod
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000664 def CaptureRemoteInfo(url):
665 """Returns a dictionary from the svn info output for the given url.
666
667 Throws an exception if svn info fails.
668 """
669 assert isinstance(url, str)
670 return SVN._CaptureInfo([url], None)
671
672 @staticmethod
673 def CaptureLocalInfo(files, cwd):
674 """Returns a dictionary from the svn info output for the given files.
675
676 Throws an exception if svn info fails.
677 """
678 assert isinstance(files, (list, tuple))
679 return SVN._CaptureInfo(files, cwd)
680
681 @staticmethod
682 def _CaptureInfo(files, cwd):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000683 """Returns a dictionary from the svn info output for the given file.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000684
maruel@chromium.org54019f32010-09-09 13:50:11 +0000685 Throws an exception if svn info fails."""
maruel@chromium.orgd25fb8f2011-04-07 13:40:15 +0000686 result = {}
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000687 info = ElementTree.XML(SVN.Capture(['info', '--xml'] + files, cwd))
maruel@chromium.orgade9c592011-04-07 15:59:11 +0000688 if info is None:
689 return result
690 entry = info.find('entry')
maruel@chromium.org6f323bb2011-04-26 15:42:53 +0000691 if entry is None:
692 return result
maruel@chromium.orgade9c592011-04-07 15:59:11 +0000693
694 # Use .text when the item is not optional.
695 result['Path'] = entry.attrib['path']
maruel@chromium.org7d654672012-01-05 19:07:23 +0000696 rev = entry.attrib['revision']
697 try:
698 result['Revision'] = int(rev)
699 except ValueError:
700 result['Revision'] = None
maruel@chromium.orgade9c592011-04-07 15:59:11 +0000701 result['Node Kind'] = entry.attrib['kind']
702 # Differs across versions.
703 if result['Node Kind'] == 'dir':
704 result['Node Kind'] = 'directory'
705 result['URL'] = entry.find('url').text
706 repository = entry.find('repository')
707 result['Repository Root'] = repository.find('root').text
708 result['UUID'] = repository.find('uuid')
709 wc_info = entry.find('wc-info')
710 if wc_info is not None:
711 result['Schedule'] = wc_info.find('schedule').text
712 result['Copied From URL'] = wc_info.find('copy-from-url')
713 result['Copied From Rev'] = wc_info.find('copy-from-rev')
714 else:
715 result['Schedule'] = None
716 result['Copied From URL'] = None
717 result['Copied From Rev'] = None
718 for key in result.keys():
719 if isinstance(result[key], unicode):
720 # Unicode results interferes with the higher layers matching up things
721 # in the deps dictionary.
722 result[key] = result[key].encode()
723 # Automatic conversion of optional parameters.
724 result[key] = getattr(result[key], 'text', result[key])
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000725 return result
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000726
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000727 @staticmethod
maruel@chromium.org54019f32010-09-09 13:50:11 +0000728 def CaptureRevision(cwd):
nasser@codeaurora.org5d63eb82010-03-24 23:22:09 +0000729 """Get the base revision of a SVN repository.
730
731 Returns:
732 Int base revision
733 """
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000734 return SVN.CaptureLocalInfo([], cwd).get('Revision')
nasser@codeaurora.org5d63eb82010-03-24 23:22:09 +0000735
736 @staticmethod
maruel@chromium.orgea15cb72012-05-04 14:16:31 +0000737 def CaptureStatus(files, cwd, no_ignore=False):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000738 """Returns the svn 1.5 svn status emulated output.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000739
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000740 @files can be a string (one file) or a list of files.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000741
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000742 Returns an array of (status, file) tuples."""
743 command = ["status", "--xml"]
maruel@chromium.orgea15cb72012-05-04 14:16:31 +0000744 if no_ignore:
745 command.append('--no-ignore')
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000746 if not files:
747 pass
748 elif isinstance(files, basestring):
749 command.append(files)
750 else:
751 command.extend(files)
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000752
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000753 status_letter = {
754 None: ' ',
755 '': ' ',
756 'added': 'A',
757 'conflicted': 'C',
758 'deleted': 'D',
759 'external': 'X',
760 'ignored': 'I',
761 'incomplete': '!',
762 'merged': 'G',
763 'missing': '!',
764 'modified': 'M',
765 'none': ' ',
766 'normal': ' ',
767 'obstructed': '~',
768 'replaced': 'R',
769 'unversioned': '?',
770 }
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000771 dom = ElementTree.XML(SVN.Capture(command, cwd))
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000772 results = []
maruel@chromium.orgade9c592011-04-07 15:59:11 +0000773 if dom is None:
774 return results
775 # /status/target/entry/(wc-status|commit|author|date)
776 for target in dom.findall('target'):
777 for entry in target.findall('entry'):
778 file_path = entry.attrib['path']
779 wc_status = entry.find('wc-status')
780 # Emulate svn 1.5 status ouput...
781 statuses = [' '] * 7
782 # Col 0
783 xml_item_status = wc_status.attrib['item']
784 if xml_item_status in status_letter:
785 statuses[0] = status_letter[xml_item_status]
786 else:
787 raise gclient_utils.Error(
788 'Unknown item status "%s"; please implement me!' %
789 xml_item_status)
790 # Col 1
791 xml_props_status = wc_status.attrib['props']
792 if xml_props_status == 'modified':
793 statuses[1] = 'M'
794 elif xml_props_status == 'conflicted':
795 statuses[1] = 'C'
796 elif (not xml_props_status or xml_props_status == 'none' or
797 xml_props_status == 'normal'):
798 pass
799 else:
800 raise gclient_utils.Error(
801 'Unknown props status "%s"; please implement me!' %
802 xml_props_status)
803 # Col 2
804 if wc_status.attrib.get('wc-locked') == 'true':
805 statuses[2] = 'L'
806 # Col 3
807 if wc_status.attrib.get('copied') == 'true':
808 statuses[3] = '+'
809 # Col 4
810 if wc_status.attrib.get('switched') == 'true':
811 statuses[4] = 'S'
812 # TODO(maruel): Col 5 and 6
813 item = (''.join(statuses), file_path)
814 results.append(item)
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000815 return results
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000816
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000817 @staticmethod
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000818 def IsMoved(filename, cwd):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000819 """Determine if a file has been added through svn mv"""
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000820 assert isinstance(filename, basestring)
821 return SVN.IsMovedInfo(SVN.CaptureLocalInfo([filename], cwd))
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000822
823 @staticmethod
824 def IsMovedInfo(info):
825 """Determine if a file has been added through svn mv"""
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000826 return (info.get('Copied From URL') and
827 info.get('Copied From Rev') and
828 info.get('Schedule') == 'add')
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000829
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000830 @staticmethod
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000831 def GetFileProperty(filename, property_name, cwd):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000832 """Returns the value of an SVN property for the given file.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000833
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000834 Args:
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000835 filename: The file to check
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000836 property_name: The name of the SVN property, e.g. "svn:mime-type"
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000837
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000838 Returns:
839 The value of the property, which will be the empty string if the property
840 is not set on the file. If the file is not under version control, the
841 empty string is also returned.
842 """
maruel@chromium.org54019f32010-09-09 13:50:11 +0000843 try:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000844 return SVN.Capture(['propget', property_name, filename], cwd)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000845 except subprocess2.CalledProcessError:
maruel@chromium.org54019f32010-09-09 13:50:11 +0000846 return ''
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000847
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000848 @staticmethod
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000849 def GenerateDiff(filenames, cwd, full_move, revision):
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000850 """Returns a string containing the diff for the given file list.
851
852 The files in the list should either be absolute paths or relative to the
853 given root. If no root directory is provided, the repository root will be
854 used.
855 The diff will always use relative paths.
856 """
maruel@chromium.org00fdcb32011-02-24 01:41:02 +0000857 assert isinstance(filenames, (list, tuple))
pkasting@chromium.org0db557c2013-04-24 23:44:23 +0000858 # If the user specified a custom diff command in their svn config file,
859 # then it'll be used when we do svn diff, which we don't want to happen
860 # since we want the unified diff.
861 if SVN.AssertVersion("1.7")[0]:
862 # On svn >= 1.7, the "--internal-diff" flag will solve this.
863 return SVN._GenerateDiffInternal(filenames, cwd, full_move, revision,
864 ["diff", "--internal-diff"],
865 ["diff", "--internal-diff"])
866 else:
867 # On svn < 1.7, the "--internal-diff" flag doesn't exist. Using
868 # --diff-cmd=diff doesn't always work, since e.g. Windows cmd users may
869 # not have a "diff" executable in their path at all. So we use an empty
870 # temporary directory as the config directory, which bypasses any user
871 # settings for the diff-cmd. However, we don't pass this for the
872 # remote_safe_diff_command parameter, since when a new config-dir is
873 # specified for an svn diff against a remote URL, it triggers
874 # authentication prompts. In this case there isn't really a good
875 # alternative to svn 1.7's --internal-diff flag.
876 bogus_dir = tempfile.mkdtemp()
877 try:
878 return SVN._GenerateDiffInternal(filenames, cwd, full_move, revision,
879 ["diff", "--config-dir", bogus_dir],
880 ["diff"])
881 finally:
882 gclient_utils.rmtree(bogus_dir)
883
884 @staticmethod
885 def _GenerateDiffInternal(filenames, cwd, full_move, revision, diff_command,
886 remote_safe_diff_command):
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000887 root = os.path.normcase(os.path.join(cwd, ''))
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000888 def RelativePath(path, root):
889 """We must use relative paths."""
maruel@chromium.orgfd9cbbb2010-01-08 23:04:03 +0000890 if os.path.normcase(path).startswith(root):
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000891 return path[len(root):]
892 return path
pkasting@chromium.org0db557c2013-04-24 23:44:23 +0000893 # Cleanup filenames
894 filenames = [RelativePath(f, root) for f in filenames]
895 # Get information about the modified items (files and directories)
896 data = dict((f, SVN.CaptureLocalInfo([f], root)) for f in filenames)
897 diffs = []
898 if full_move:
899 # Eliminate modified files inside moved/copied directory.
900 for (filename, info) in data.iteritems():
901 if SVN.IsMovedInfo(info) and info.get("Node Kind") == "directory":
902 # Remove files inside the directory.
903 filenames = [f for f in filenames
904 if not f.startswith(filename + os.path.sep)]
905 for filename in data.keys():
906 if not filename in filenames:
907 # Remove filtered out items.
908 del data[filename]
909 else:
910 metaheaders = []
911 for (filename, info) in data.iteritems():
912 if SVN.IsMovedInfo(info):
913 # for now, the most common case is a head copy,
914 # so let's just encode that as a straight up cp.
915 srcurl = info.get('Copied From URL')
916 file_root = info.get('Repository Root')
917 rev = int(info.get('Copied From Rev'))
918 assert srcurl.startswith(file_root)
919 src = srcurl[len(file_root)+1:]
920 try:
921 srcinfo = SVN.CaptureRemoteInfo(srcurl)
922 except subprocess2.CalledProcessError, e:
923 if not 'Not a valid URL' in e.stderr:
924 raise
925 # Assume the file was deleted. No idea how to figure out at which
926 # revision the file was deleted.
927 srcinfo = {'Revision': rev}
928 if (srcinfo.get('Revision') != rev and
929 SVN.Capture(remote_safe_diff_command + ['-r', '%d:head' % rev,
930 srcurl], cwd)):
931 metaheaders.append("#$ svn cp -r %d %s %s "
932 "### WARNING: note non-trunk copy\n" %
933 (rev, src, filename))
934 else:
935 metaheaders.append("#$ cp %s %s\n" % (src,
936 filename))
937 if metaheaders:
938 diffs.append("### BEGIN SVN COPY METADATA\n")
939 diffs.extend(metaheaders)
940 diffs.append("### END SVN COPY METADATA\n")
941 # Now ready to do the actual diff.
942 for filename in sorted(data):
943 diffs.append(SVN._DiffItemInternal(
944 filename, cwd, data[filename], diff_command, full_move, revision))
945 # Use StringIO since it can be messy when diffing a directory move with
946 # full_move=True.
947 buf = cStringIO.StringIO()
948 for d in filter(None, diffs):
949 buf.write(d)
950 result = buf.getvalue()
951 buf.close()
952 return result
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000953
954 @staticmethod
pkasting@chromium.org0db557c2013-04-24 23:44:23 +0000955 def _DiffItemInternal(filename, cwd, info, diff_command, full_move, revision):
pkasting@chromium.org917ea7f2013-04-19 20:10:03 +0000956 """Grabs the diff data."""
pkasting@chromium.org0db557c2013-04-24 23:44:23 +0000957 command = diff_command + [filename]
pkasting@chromium.org917ea7f2013-04-19 20:10:03 +0000958 if revision:
959 command.extend(['--revision', revision])
960 data = None
961 if SVN.IsMovedInfo(info):
962 if full_move:
963 if info.get("Node Kind") == "directory":
964 # Things become tricky here. It's a directory copy/move. We need to
965 # diff all the files inside it.
966 # This will put a lot of pressure on the heap. This is why StringIO
967 # is used and converted back into a string at the end. The reason to
968 # return a string instead of a StringIO is that StringIO.write()
969 # doesn't accept a StringIO object. *sigh*.
970 for (dirpath, dirnames, filenames) in os.walk(filename):
971 # Cleanup all files starting with a '.'.
972 for d in dirnames:
973 if d.startswith('.'):
974 dirnames.remove(d)
975 for f in filenames:
976 if f.startswith('.'):
977 filenames.remove(f)
978 for f in filenames:
979 if data is None:
980 data = cStringIO.StringIO()
981 data.write(GenFakeDiff(os.path.join(dirpath, f)))
982 if data:
983 tmp = data.getvalue()
984 data.close()
985 data = tmp
986 else:
987 data = GenFakeDiff(filename)
988 else:
989 if info.get("Node Kind") != "directory":
990 # svn diff on a mv/cp'd file outputs nothing if there was no change.
991 data = SVN.Capture(command, cwd)
992 if not data:
993 # We put in an empty Index entry so upload.py knows about them.
994 data = "Index: %s\n" % filename.replace(os.sep, '/')
995 # Otherwise silently ignore directories.
996 else:
997 if info.get("Node Kind") != "directory":
998 # Normal simple case.
999 try:
1000 data = SVN.Capture(command, cwd)
1001 except subprocess2.CalledProcessError:
1002 if revision:
1003 data = GenFakeDiff(filename)
1004 else:
1005 raise
1006 # Otherwise silently ignore directories.
1007 return data
1008
1009 @staticmethod
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001010 def GetEmail(cwd):
maruel@chromium.orgc78f2462009-11-21 01:20:57 +00001011 """Retrieves the svn account which we assume is an email address."""
maruel@chromium.org54019f32010-09-09 13:50:11 +00001012 try:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001013 infos = SVN.CaptureLocalInfo([], cwd)
maruel@chromium.orgda64d632011-09-08 17:41:15 +00001014 except subprocess2.CalledProcessError:
maruel@chromium.orgc78f2462009-11-21 01:20:57 +00001015 return None
1016
1017 # Should check for uuid but it is incorrectly saved for https creds.
maruel@chromium.org54019f32010-09-09 13:50:11 +00001018 root = infos['Repository Root']
maruel@chromium.orgc78f2462009-11-21 01:20:57 +00001019 realm = root.rsplit('/', 1)[0]
maruel@chromium.org54019f32010-09-09 13:50:11 +00001020 uuid = infos['UUID']
maruel@chromium.orgc78f2462009-11-21 01:20:57 +00001021 if root.startswith('https') or not uuid:
1022 regexp = re.compile(r'<%s:\d+>.*' % realm)
1023 else:
1024 regexp = re.compile(r'<%s:\d+> %s' % (realm, uuid))
1025 if regexp is None:
1026 return None
1027 if sys.platform.startswith('win'):
1028 if not 'APPDATA' in os.environ:
1029 return None
maruel@chromium.org720d9f32009-11-21 17:38:57 +00001030 auth_dir = os.path.join(os.environ['APPDATA'], 'Subversion', 'auth',
1031 'svn.simple')
maruel@chromium.orgc78f2462009-11-21 01:20:57 +00001032 else:
1033 if not 'HOME' in os.environ:
1034 return None
1035 auth_dir = os.path.join(os.environ['HOME'], '.subversion', 'auth',
1036 'svn.simple')
1037 for credfile in os.listdir(auth_dir):
1038 cred_info = SVN.ReadSimpleAuth(os.path.join(auth_dir, credfile))
1039 if regexp.match(cred_info.get('svn:realmstring')):
1040 return cred_info.get('username')
1041
1042 @staticmethod
1043 def ReadSimpleAuth(filename):
1044 f = open(filename, 'r')
1045 values = {}
maruel@chromium.org6e29d572010-06-04 17:32:20 +00001046 def ReadOneItem(item_type):
1047 m = re.match(r'%s (\d+)' % item_type, f.readline())
maruel@chromium.orgc78f2462009-11-21 01:20:57 +00001048 if not m:
1049 return None
1050 data = f.read(int(m.group(1)))
1051 if f.read(1) != '\n':
1052 return None
1053 return data
1054
1055 while True:
1056 key = ReadOneItem('K')
1057 if not key:
1058 break
1059 value = ReadOneItem('V')
1060 if not value:
1061 break
1062 values[key] = value
1063 return values
maruel@chromium.org94b1ee92009-12-19 20:27:20 +00001064
1065 @staticmethod
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001066 def GetCheckoutRoot(cwd):
maruel@chromium.org94b1ee92009-12-19 20:27:20 +00001067 """Returns the top level directory of the current repository.
1068
1069 The directory is returned as an absolute path.
1070 """
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001071 cwd = os.path.abspath(cwd)
maruel@chromium.org54019f32010-09-09 13:50:11 +00001072 try:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001073 info = SVN.CaptureLocalInfo([], cwd)
maruel@chromium.org885d6e82011-02-24 20:21:46 +00001074 cur_dir_repo_root = info['Repository Root']
1075 url = info['URL']
maruel@chromium.orgda64d632011-09-08 17:41:15 +00001076 except subprocess2.CalledProcessError:
maruel@chromium.org94b1ee92009-12-19 20:27:20 +00001077 return None
maruel@chromium.org94b1ee92009-12-19 20:27:20 +00001078 while True:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001079 parent = os.path.dirname(cwd)
maruel@chromium.org54019f32010-09-09 13:50:11 +00001080 try:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001081 info = SVN.CaptureLocalInfo([], parent)
maruel@chromium.org885d6e82011-02-24 20:21:46 +00001082 if (info['Repository Root'] != cur_dir_repo_root or
1083 info['URL'] != os.path.dirname(url)):
maruel@chromium.org54019f32010-09-09 13:50:11 +00001084 break
maruel@chromium.org885d6e82011-02-24 20:21:46 +00001085 url = info['URL']
maruel@chromium.orgda64d632011-09-08 17:41:15 +00001086 except subprocess2.CalledProcessError:
maruel@chromium.org94b1ee92009-12-19 20:27:20 +00001087 break
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001088 cwd = parent
1089 return GetCasedPath(cwd)
tony@chromium.org57564662010-04-14 02:35:12 +00001090
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +00001091 @staticmethod
1092 def IsValidRevision(url):
1093 """Verifies the revision looks like an SVN revision."""
1094 try:
1095 SVN.Capture(['info', url], cwd=None)
1096 return True
1097 except subprocess2.CalledProcessError:
1098 return False
1099
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001100 @classmethod
1101 def AssertVersion(cls, min_version):
tony@chromium.org57564662010-04-14 02:35:12 +00001102 """Asserts svn's version is at least min_version."""
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001103 if cls.current_version is None:
shouqun.liu@intel.com13b522c2012-07-20 17:16:51 +00001104 cls.current_version = cls.Capture(['--version', '--quiet'], None)
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001105 current_version_list = map(only_int, cls.current_version.split('.'))
tony@chromium.org57564662010-04-14 02:35:12 +00001106 for min_ver in map(int, min_version.split('.')):
1107 ver = current_version_list.pop(0)
1108 if ver < min_ver:
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001109 return (False, cls.current_version)
tony@chromium.org57564662010-04-14 02:35:12 +00001110 elif ver > min_ver:
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001111 return (True, cls.current_version)
1112 return (True, cls.current_version)
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001113
1114 @staticmethod
maruel@chromium.orgea15cb72012-05-04 14:16:31 +00001115 def Revert(cwd, callback=None, ignore_externals=False, no_ignore=False):
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001116 """Reverts all svn modifications in cwd, including properties.
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001117
1118 Deletes any modified files or directory.
1119
1120 A "svn update --revision BASE" call is required after to revive deleted
1121 files.
1122 """
maruel@chromium.orgea15cb72012-05-04 14:16:31 +00001123 for file_status in SVN.CaptureStatus(None, cwd, no_ignore=no_ignore):
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001124 file_path = os.path.join(cwd, file_status[1])
maruel@chromium.org8c415122011-03-15 17:14:27 +00001125 if (ignore_externals and
1126 file_status[0][0] == 'X' and
1127 file_status[0][1:].isspace()):
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001128 # Ignore externals.
1129 logging.info('Ignoring external %s' % file_status[1])
1130 continue
1131
maruel@chromium.org62087572012-04-24 23:16:28 +00001132 # This is the case where '! L .' is returned by 'svn status'. Just
1133 # strip off the '/.'.
1134 if file_path.endswith(os.path.sep + '.'):
1135 file_path = file_path[:-2]
1136
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001137 if callback:
1138 callback(file_status)
1139
maruel@chromium.org8c415122011-03-15 17:14:27 +00001140 if os.path.exists(file_path):
1141 # svn revert is really stupid. It fails on inconsistent line-endings,
1142 # on switched directories, etc. So take no chance and delete everything!
1143 # In theory, it wouldn't be necessary for property-only change but then
1144 # it'd have to look for switched directories, etc so it's not worth
1145 # optimizing this use case.
1146 if os.path.isfile(file_path) or os.path.islink(file_path):
1147 logging.info('os.remove(%s)' % file_path)
1148 os.remove(file_path)
1149 elif os.path.isdir(file_path):
digit@chromium.orgdc112ac2013-04-24 13:00:19 +00001150 logging.info('rmtree(%s)' % file_path)
1151 gclient_utils.rmtree(file_path)
maruel@chromium.org8c415122011-03-15 17:14:27 +00001152 else:
1153 logging.critical(
1154 ('No idea what is %s.\nYou just found a bug in gclient'
1155 ', please ping maruel@chromium.org ASAP!') % file_path)
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001156
maruel@chromium.org8c415122011-03-15 17:14:27 +00001157 if (file_status[0][0] in ('D', 'A', '!') or
1158 not file_status[0][1:].isspace()):
maruel@chromium.orgaf453492011-03-03 21:04:09 +00001159 # Added, deleted file requires manual intervention and require calling
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001160 # revert, like for properties.
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001161 if not os.path.isdir(cwd):
maruel@chromium.org8b322b32011-11-01 19:05:50 +00001162 # '.' was deleted. It's not worth continuing.
1163 return
maruel@chromium.orgaf453492011-03-03 21:04:09 +00001164 try:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001165 SVN.Capture(['revert', file_status[1]], cwd=cwd)
maruel@chromium.orgda64d632011-09-08 17:41:15 +00001166 except subprocess2.CalledProcessError:
maruel@chromium.orgaf453492011-03-03 21:04:09 +00001167 if not os.path.exists(file_path):
1168 continue
1169 raise