blob: 94b925e87d0abf14762462607221a88f51316214 [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
primiano@chromium.org1c127382015-02-17 11:15:40 +0000446 def IsDirectoryVersioned(cwd, relative_dir):
447 """Checks whether the given |relative_dir| is part of cwd's repo."""
448 return bool(GIT.Capture(['ls-tree', 'HEAD', relative_dir], cwd=cwd))
449
450 @staticmethod
451 def CleanupDir(cwd, relative_dir):
452 """Cleans up untracked file inside |relative_dir|."""
453 return bool(GIT.Capture(['clean', '-df', relative_dir], cwd=cwd))
454
455 @staticmethod
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000456 def GetGitSvnHeadRev(cwd):
457 """Gets the most recently pulled git-svn revision."""
458 try:
459 output = GIT.Capture(['svn', 'info'], cwd=cwd)
460 match = re.search(r'^Revision: ([0-9]+)$', output, re.MULTILINE)
461 return int(match.group(1)) if match else None
462 except (subprocess2.CalledProcessError, ValueError):
463 return None
464
465 @staticmethod
wittman@chromium.org492a3682012-08-10 00:28:28 +0000466 def ParseGitSvnSha1(output):
467 """Parses git-svn output for the first sha1."""
468 match = re.search(r'[0-9a-fA-F]{40}', output)
469 return match.group(0) if match else None
470
471 @staticmethod
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000472 def GetSha1ForSvnRev(cwd, rev):
473 """Returns a corresponding git sha1 for a SVN revision."""
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000474 if not GIT.IsGitSvn(cwd=cwd):
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000475 return None
476 try:
szager@chromium.orgc51def32012-10-15 18:50:37 +0000477 output = GIT.Capture(['svn', 'find-rev', 'r' + str(rev)], cwd=cwd)
478 return GIT.ParseGitSvnSha1(output)
479 except subprocess2.CalledProcessError:
480 return None
481
482 @staticmethod
483 def GetBlessedSha1ForSvnRev(cwd, rev):
484 """Returns a git commit hash from the master branch history that has
485 accurate .DEPS.git and git submodules. To understand why this is more
486 complicated than a simple call to `git svn find-rev`, refer to:
487
488 http://www.chromium.org/developers/how-tos/git-repo
489 """
490 git_svn_rev = GIT.GetSha1ForSvnRev(cwd, rev)
491 if not git_svn_rev:
492 return None
493 try:
szager@google.com312a6a42012-10-11 21:19:42 +0000494 output = GIT.Capture(
495 ['rev-list', '--ancestry-path', '--reverse',
496 '--grep', 'SVN changes up to revision [0-9]*',
497 '%s..refs/remotes/origin/master' % git_svn_rev], cwd=cwd)
498 if not output:
499 return None
500 sha1 = output.splitlines()[0]
501 if not sha1:
502 return None
503 output = GIT.Capture(['rev-list', '-n', '1', '%s^1' % sha1], cwd=cwd)
504 if git_svn_rev != output.rstrip():
505 raise gclient_utils.Error(sha1)
506 return sha1
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000507 except subprocess2.CalledProcessError:
508 return None
509
510 @staticmethod
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000511 def IsValidRevision(cwd, rev, sha_only=False):
512 """Verifies the revision is a proper git revision.
513
514 sha_only: Fail unless rev is a sha hash.
515 """
maruel@chromium.org81473862012-06-27 17:30:56 +0000516 # 'git rev-parse foo' where foo is *any* 40 character hex string will return
517 # the string and return code 0. So strip one character to force 'git
518 # rev-parse' to do a hash table look-up and returns 128 if the hash is not
519 # present.
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000520 lookup_rev = rev
maruel@chromium.org81473862012-06-27 17:30:56 +0000521 if re.match(r'^[0-9a-fA-F]{40}$', rev):
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000522 lookup_rev = rev[:-1]
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000523 try:
ilevy@chromium.org224ba242013-07-08 22:02:31 +0000524 sha = GIT.Capture(['rev-parse', lookup_rev], cwd=cwd).lower()
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000525 if lookup_rev != rev:
526 # Make sure we get the original 40 chars back.
hinoka@google.com68953172014-06-11 22:14:35 +0000527 return rev.lower() == sha
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000528 if sha_only:
hinoka@google.com68953172014-06-11 22:14:35 +0000529 return sha.startswith(rev.lower())
530 return True
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000531 except subprocess2.CalledProcessError:
532 return False
533
maruel@chromium.org36ac2392011-10-12 16:36:11 +0000534 @classmethod
535 def AssertVersion(cls, min_version):
maruel@chromium.orgd0f854a2010-03-11 19:35:53 +0000536 """Asserts git's version is at least min_version."""
maruel@chromium.org36ac2392011-10-12 16:36:11 +0000537 if cls.current_version is None:
bashi@chromium.orgfcffd482012-02-24 01:47:00 +0000538 current_version = cls.Capture(['--version'], '.')
539 matched = re.search(r'version ([0-9\.]+)', current_version)
540 cls.current_version = matched.group(1)
maruel@chromium.org36ac2392011-10-12 16:36:11 +0000541 current_version_list = map(only_int, cls.current_version.split('.'))
maruel@chromium.orgd0f854a2010-03-11 19:35:53 +0000542 for min_ver in map(int, min_version.split('.')):
543 ver = current_version_list.pop(0)
544 if ver < min_ver:
maruel@chromium.org36ac2392011-10-12 16:36:11 +0000545 return (False, cls.current_version)
maruel@chromium.orgd0f854a2010-03-11 19:35:53 +0000546 elif ver > min_ver:
maruel@chromium.org36ac2392011-10-12 16:36:11 +0000547 return (True, cls.current_version)
548 return (True, cls.current_version)
maruel@chromium.orgd0f854a2010-03-11 19:35:53 +0000549
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000550
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000551class SVN(object):
tony@chromium.org57564662010-04-14 02:35:12 +0000552 current_version = None
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000553
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000554 @staticmethod
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000555 def Capture(args, cwd, **kwargs):
maruel@chromium.org54019f32010-09-09 13:50:11 +0000556 """Always redirect stderr.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000557
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000558 Throws an exception if non-0 is returned.
559 """
maruel@chromium.org904af082011-09-08 22:06:09 +0000560 return subprocess2.check_output(
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000561 ['svn'] + args, stderr=subprocess2.PIPE, cwd=cwd, **kwargs)
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000562
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000563 @staticmethod
maruel@chromium.org2b9aa8e2010-08-25 20:01:42 +0000564 def RunAndGetFileList(verbose, args, cwd, file_list, stdout=None):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000565 """Runs svn checkout, update, or status, output to stdout.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000566
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000567 The first item in args must be either "checkout", "update", or "status".
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000568
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000569 svn's stdout is parsed to collect a list of files checked out or updated.
570 These files are appended to file_list. svn's stdout is also printed to
571 sys.stdout as in Run.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000572
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000573 Args:
maruel@chromium.org03807072010-08-16 17:18:44 +0000574 verbose: If True, uses verbose output
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000575 args: A sequence of command line parameters to be passed to svn.
maruel@chromium.org2b9aa8e2010-08-25 20:01:42 +0000576 cwd: The directory where svn is to be run.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000577
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000578 Raises:
579 Error: An error occurred while running the svn command.
580 """
maruel@chromium.org2b9aa8e2010-08-25 20:01:42 +0000581 stdout = stdout or sys.stdout
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000582 if file_list is None:
583 # Even if our caller doesn't care about file_list, we use it internally.
584 file_list = []
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000585
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000586 # svn update and svn checkout use the same pattern: the first three columns
587 # are for file status, property status, and lock status. This is followed
588 # by two spaces, and then the path to the file.
589 update_pattern = '^... (.*)$'
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000590
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000591 # The first three columns of svn status are the same as for svn update and
592 # svn checkout. The next three columns indicate addition-with-history,
593 # switch, and remote lock status. This is followed by one space, and then
594 # the path to the file.
595 status_pattern = '^...... (.*)$'
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000596
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000597 # args[0] must be a supported command. This will blow up if it's something
598 # else, which is good. Note that the patterns are only effective when
599 # these commands are used in their ordinary forms, the patterns are invalid
600 # for "svn status --show-updates", for example.
601 pattern = {
602 'checkout': update_pattern,
603 'status': status_pattern,
604 'update': update_pattern,
605 }[args[0]]
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000606 compiled_pattern = re.compile(pattern)
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000607 # Place an upper limit.
cbentzel@chromium.org2aee2292010-09-03 14:15:25 +0000608 backoff_time = 5
maruel@chromium.orgbec588d2010-10-26 13:50:25 +0000609 retries = 0
maruel@chromium.org03507062010-10-26 00:58:27 +0000610 while True:
maruel@chromium.orgbec588d2010-10-26 13:50:25 +0000611 retries += 1
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000612 previous_list_len = len(file_list)
613 failure = []
maruel@chromium.org54d1f1a2010-01-08 19:53:47 +0000614
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000615 def CaptureMatchingLines(line):
616 match = compiled_pattern.search(line)
617 if match:
618 file_list.append(match.group(1))
619 if line.startswith('svn: '):
maruel@chromium.org8599aa72010-02-08 20:27:14 +0000620 failure.append(line)
maruel@chromium.org54d1f1a2010-01-08 19:53:47 +0000621
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000622 try:
maruel@chromium.org17d01792010-09-01 18:07:10 +0000623 gclient_utils.CheckCallAndFilterAndHeader(
624 ['svn'] + args,
625 cwd=cwd,
626 always=verbose,
627 filter_fn=CaptureMatchingLines,
628 stdout=stdout)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000629 except subprocess2.CalledProcessError:
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000630 def IsKnownFailure():
631 for x in failure:
632 if (x.startswith('svn: OPTIONS of') or
633 x.startswith('svn: PROPFIND of') or
634 x.startswith('svn: REPORT of') or
maruel@chromium.orgf61fc932010-08-19 13:05:24 +0000635 x.startswith('svn: Unknown hostname') or
maruel@chromium.org7d8b97d2011-10-11 23:32:30 +0000636 x.startswith('svn: Server sent unexpected return value') or
637 x.startswith('svn: Can\'t connect to host')):
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000638 return True
639 return False
640
maruel@chromium.org953586a2010-06-15 14:22:24 +0000641 # Subversion client is really misbehaving with Google Code.
642 if args[0] == 'checkout':
643 # Ensure at least one file was checked out, otherwise *delete* the
644 # directory.
645 if len(file_list) == previous_list_len:
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000646 if not IsKnownFailure():
maruel@chromium.org953586a2010-06-15 14:22:24 +0000647 # No known svn error was found, bail out.
648 raise
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000649 # No file were checked out, so make sure the directory is
650 # deleted in case it's messed up and try again.
651 # Warning: It's bad, it assumes args[2] is the directory
652 # argument.
653 if os.path.isdir(args[2]):
digit@chromium.orgdc112ac2013-04-24 13:00:19 +0000654 gclient_utils.rmtree(args[2])
maruel@chromium.org953586a2010-06-15 14:22:24 +0000655 else:
656 # Progress was made, convert to update since an aborted checkout
657 # is now an update.
maruel@chromium.org2de10252010-02-08 01:10:39 +0000658 args = ['update'] + args[1:]
maruel@chromium.org953586a2010-06-15 14:22:24 +0000659 else:
660 # It was an update or export.
maruel@chromium.org6133c5b2010-08-18 18:34:48 +0000661 # We enforce that some progress has been made or a known failure.
662 if len(file_list) == previous_list_len and not IsKnownFailure():
663 # No known svn error was found and no progress, bail out.
664 raise
maruel@chromium.orgbec588d2010-10-26 13:50:25 +0000665 if retries == 10:
maruel@chromium.org03507062010-10-26 00:58:27 +0000666 raise
cbentzel@chromium.org2aee2292010-09-03 14:15:25 +0000667 print "Sleeping %.1f seconds and retrying...." % backoff_time
668 time.sleep(backoff_time)
669 backoff_time *= 1.3
maruel@chromium.org953586a2010-06-15 14:22:24 +0000670 continue
maruel@chromium.orgb71b67e2009-11-24 20:48:19 +0000671 break
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000672
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000673 @staticmethod
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000674 def CaptureRemoteInfo(url):
675 """Returns a dictionary from the svn info output for the given url.
676
677 Throws an exception if svn info fails.
678 """
679 assert isinstance(url, str)
680 return SVN._CaptureInfo([url], None)
681
682 @staticmethod
683 def CaptureLocalInfo(files, cwd):
684 """Returns a dictionary from the svn info output for the given files.
685
686 Throws an exception if svn info fails.
687 """
688 assert isinstance(files, (list, tuple))
689 return SVN._CaptureInfo(files, cwd)
690
691 @staticmethod
692 def _CaptureInfo(files, cwd):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000693 """Returns a dictionary from the svn info output for the given file.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000694
maruel@chromium.org54019f32010-09-09 13:50:11 +0000695 Throws an exception if svn info fails."""
maruel@chromium.orgd25fb8f2011-04-07 13:40:15 +0000696 result = {}
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000697 info = ElementTree.XML(SVN.Capture(['info', '--xml'] + files, cwd))
maruel@chromium.orgade9c592011-04-07 15:59:11 +0000698 if info is None:
699 return result
700 entry = info.find('entry')
maruel@chromium.org6f323bb2011-04-26 15:42:53 +0000701 if entry is None:
702 return result
maruel@chromium.orgade9c592011-04-07 15:59:11 +0000703
704 # Use .text when the item is not optional.
705 result['Path'] = entry.attrib['path']
maruel@chromium.org7d654672012-01-05 19:07:23 +0000706 rev = entry.attrib['revision']
707 try:
708 result['Revision'] = int(rev)
709 except ValueError:
710 result['Revision'] = None
maruel@chromium.orgade9c592011-04-07 15:59:11 +0000711 result['Node Kind'] = entry.attrib['kind']
712 # Differs across versions.
713 if result['Node Kind'] == 'dir':
714 result['Node Kind'] = 'directory'
715 result['URL'] = entry.find('url').text
716 repository = entry.find('repository')
717 result['Repository Root'] = repository.find('root').text
718 result['UUID'] = repository.find('uuid')
719 wc_info = entry.find('wc-info')
720 if wc_info is not None:
721 result['Schedule'] = wc_info.find('schedule').text
722 result['Copied From URL'] = wc_info.find('copy-from-url')
723 result['Copied From Rev'] = wc_info.find('copy-from-rev')
724 else:
725 result['Schedule'] = None
726 result['Copied From URL'] = None
727 result['Copied From Rev'] = None
728 for key in result.keys():
729 if isinstance(result[key], unicode):
730 # Unicode results interferes with the higher layers matching up things
731 # in the deps dictionary.
732 result[key] = result[key].encode()
733 # Automatic conversion of optional parameters.
734 result[key] = getattr(result[key], 'text', result[key])
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000735 return result
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000736
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000737 @staticmethod
maruel@chromium.org54019f32010-09-09 13:50:11 +0000738 def CaptureRevision(cwd):
nasser@codeaurora.org5d63eb82010-03-24 23:22:09 +0000739 """Get the base revision of a SVN repository.
740
741 Returns:
742 Int base revision
743 """
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000744 return SVN.CaptureLocalInfo([], cwd).get('Revision')
nasser@codeaurora.org5d63eb82010-03-24 23:22:09 +0000745
746 @staticmethod
maruel@chromium.orgea15cb72012-05-04 14:16:31 +0000747 def CaptureStatus(files, cwd, no_ignore=False):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000748 """Returns the svn 1.5 svn status emulated output.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000749
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000750 @files can be a string (one file) or a list of files.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000751
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000752 Returns an array of (status, file) tuples."""
753 command = ["status", "--xml"]
maruel@chromium.orgea15cb72012-05-04 14:16:31 +0000754 if no_ignore:
755 command.append('--no-ignore')
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000756 if not files:
757 pass
758 elif isinstance(files, basestring):
759 command.append(files)
760 else:
761 command.extend(files)
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000762
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000763 status_letter = {
764 None: ' ',
765 '': ' ',
766 'added': 'A',
767 'conflicted': 'C',
768 'deleted': 'D',
769 'external': 'X',
770 'ignored': 'I',
771 'incomplete': '!',
772 'merged': 'G',
773 'missing': '!',
774 'modified': 'M',
775 'none': ' ',
776 'normal': ' ',
777 'obstructed': '~',
778 'replaced': 'R',
779 'unversioned': '?',
780 }
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000781 dom = ElementTree.XML(SVN.Capture(command, cwd))
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000782 results = []
maruel@chromium.orgade9c592011-04-07 15:59:11 +0000783 if dom is None:
784 return results
785 # /status/target/entry/(wc-status|commit|author|date)
786 for target in dom.findall('target'):
787 for entry in target.findall('entry'):
788 file_path = entry.attrib['path']
789 wc_status = entry.find('wc-status')
790 # Emulate svn 1.5 status ouput...
791 statuses = [' '] * 7
792 # Col 0
793 xml_item_status = wc_status.attrib['item']
794 if xml_item_status in status_letter:
795 statuses[0] = status_letter[xml_item_status]
796 else:
797 raise gclient_utils.Error(
798 'Unknown item status "%s"; please implement me!' %
799 xml_item_status)
800 # Col 1
801 xml_props_status = wc_status.attrib['props']
802 if xml_props_status == 'modified':
803 statuses[1] = 'M'
804 elif xml_props_status == 'conflicted':
805 statuses[1] = 'C'
806 elif (not xml_props_status or xml_props_status == 'none' or
807 xml_props_status == 'normal'):
808 pass
809 else:
810 raise gclient_utils.Error(
811 'Unknown props status "%s"; please implement me!' %
812 xml_props_status)
813 # Col 2
814 if wc_status.attrib.get('wc-locked') == 'true':
815 statuses[2] = 'L'
816 # Col 3
817 if wc_status.attrib.get('copied') == 'true':
818 statuses[3] = '+'
819 # Col 4
820 if wc_status.attrib.get('switched') == 'true':
821 statuses[4] = 'S'
822 # TODO(maruel): Col 5 and 6
823 item = (''.join(statuses), file_path)
824 results.append(item)
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000825 return results
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000826
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000827 @staticmethod
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000828 def IsMoved(filename, cwd):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000829 """Determine if a file has been added through svn mv"""
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000830 assert isinstance(filename, basestring)
831 return SVN.IsMovedInfo(SVN.CaptureLocalInfo([filename], cwd))
maruel@chromium.org3c55d982010-05-06 14:25:44 +0000832
833 @staticmethod
834 def IsMovedInfo(info):
835 """Determine if a file has been added through svn mv"""
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000836 return (info.get('Copied From URL') and
837 info.get('Copied From Rev') and
838 info.get('Schedule') == 'add')
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000839
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000840 @staticmethod
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000841 def GetFileProperty(filename, property_name, cwd):
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000842 """Returns the value of an SVN property for the given file.
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000843
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000844 Args:
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000845 filename: The file to check
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000846 property_name: The name of the SVN property, e.g. "svn:mime-type"
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000847
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000848 Returns:
849 The value of the property, which will be the empty string if the property
850 is not set on the file. If the file is not under version control, the
851 empty string is also returned.
852 """
maruel@chromium.org54019f32010-09-09 13:50:11 +0000853 try:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000854 return SVN.Capture(['propget', property_name, filename], cwd)
maruel@chromium.orgda64d632011-09-08 17:41:15 +0000855 except subprocess2.CalledProcessError:
maruel@chromium.org54019f32010-09-09 13:50:11 +0000856 return ''
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000857
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000858 @staticmethod
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000859 def GenerateDiff(filenames, cwd, full_move, revision):
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000860 """Returns a string containing the diff for the given file list.
861
862 The files in the list should either be absolute paths or relative to the
863 given root. If no root directory is provided, the repository root will be
864 used.
865 The diff will always use relative paths.
866 """
maruel@chromium.org00fdcb32011-02-24 01:41:02 +0000867 assert isinstance(filenames, (list, tuple))
pkasting@chromium.org0db557c2013-04-24 23:44:23 +0000868 # If the user specified a custom diff command in their svn config file,
869 # then it'll be used when we do svn diff, which we don't want to happen
870 # since we want the unified diff.
871 if SVN.AssertVersion("1.7")[0]:
872 # On svn >= 1.7, the "--internal-diff" flag will solve this.
873 return SVN._GenerateDiffInternal(filenames, cwd, full_move, revision,
874 ["diff", "--internal-diff"],
875 ["diff", "--internal-diff"])
876 else:
877 # On svn < 1.7, the "--internal-diff" flag doesn't exist. Using
878 # --diff-cmd=diff doesn't always work, since e.g. Windows cmd users may
879 # not have a "diff" executable in their path at all. So we use an empty
880 # temporary directory as the config directory, which bypasses any user
881 # settings for the diff-cmd. However, we don't pass this for the
882 # remote_safe_diff_command parameter, since when a new config-dir is
883 # specified for an svn diff against a remote URL, it triggers
884 # authentication prompts. In this case there isn't really a good
885 # alternative to svn 1.7's --internal-diff flag.
886 bogus_dir = tempfile.mkdtemp()
887 try:
888 return SVN._GenerateDiffInternal(filenames, cwd, full_move, revision,
889 ["diff", "--config-dir", bogus_dir],
890 ["diff"])
891 finally:
892 gclient_utils.rmtree(bogus_dir)
893
894 @staticmethod
895 def _GenerateDiffInternal(filenames, cwd, full_move, revision, diff_command,
896 remote_safe_diff_command):
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000897 root = os.path.normcase(os.path.join(cwd, ''))
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000898 def RelativePath(path, root):
899 """We must use relative paths."""
maruel@chromium.orgfd9cbbb2010-01-08 23:04:03 +0000900 if os.path.normcase(path).startswith(root):
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000901 return path[len(root):]
902 return path
pkasting@chromium.org0db557c2013-04-24 23:44:23 +0000903 # Cleanup filenames
904 filenames = [RelativePath(f, root) for f in filenames]
905 # Get information about the modified items (files and directories)
906 data = dict((f, SVN.CaptureLocalInfo([f], root)) for f in filenames)
907 diffs = []
908 if full_move:
909 # Eliminate modified files inside moved/copied directory.
910 for (filename, info) in data.iteritems():
911 if SVN.IsMovedInfo(info) and info.get("Node Kind") == "directory":
912 # Remove files inside the directory.
913 filenames = [f for f in filenames
914 if not f.startswith(filename + os.path.sep)]
915 for filename in data.keys():
916 if not filename in filenames:
917 # Remove filtered out items.
918 del data[filename]
919 else:
920 metaheaders = []
921 for (filename, info) in data.iteritems():
922 if SVN.IsMovedInfo(info):
923 # for now, the most common case is a head copy,
924 # so let's just encode that as a straight up cp.
925 srcurl = info.get('Copied From URL')
926 file_root = info.get('Repository Root')
927 rev = int(info.get('Copied From Rev'))
928 assert srcurl.startswith(file_root)
929 src = srcurl[len(file_root)+1:]
930 try:
931 srcinfo = SVN.CaptureRemoteInfo(srcurl)
932 except subprocess2.CalledProcessError, e:
933 if not 'Not a valid URL' in e.stderr:
934 raise
935 # Assume the file was deleted. No idea how to figure out at which
936 # revision the file was deleted.
937 srcinfo = {'Revision': rev}
938 if (srcinfo.get('Revision') != rev and
939 SVN.Capture(remote_safe_diff_command + ['-r', '%d:head' % rev,
940 srcurl], cwd)):
941 metaheaders.append("#$ svn cp -r %d %s %s "
942 "### WARNING: note non-trunk copy\n" %
943 (rev, src, filename))
944 else:
945 metaheaders.append("#$ cp %s %s\n" % (src,
946 filename))
947 if metaheaders:
948 diffs.append("### BEGIN SVN COPY METADATA\n")
949 diffs.extend(metaheaders)
950 diffs.append("### END SVN COPY METADATA\n")
951 # Now ready to do the actual diff.
952 for filename in sorted(data):
953 diffs.append(SVN._DiffItemInternal(
954 filename, cwd, data[filename], diff_command, full_move, revision))
955 # Use StringIO since it can be messy when diffing a directory move with
956 # full_move=True.
957 buf = cStringIO.StringIO()
958 for d in filter(None, diffs):
959 buf.write(d)
960 result = buf.getvalue()
961 buf.close()
962 return result
maruel@chromium.orgf2f9d552009-12-22 00:12:57 +0000963
964 @staticmethod
pkasting@chromium.org0db557c2013-04-24 23:44:23 +0000965 def _DiffItemInternal(filename, cwd, info, diff_command, full_move, revision):
pkasting@chromium.org917ea7f2013-04-19 20:10:03 +0000966 """Grabs the diff data."""
pkasting@chromium.org0db557c2013-04-24 23:44:23 +0000967 command = diff_command + [filename]
pkasting@chromium.org917ea7f2013-04-19 20:10:03 +0000968 if revision:
969 command.extend(['--revision', revision])
970 data = None
971 if SVN.IsMovedInfo(info):
972 if full_move:
973 if info.get("Node Kind") == "directory":
974 # Things become tricky here. It's a directory copy/move. We need to
975 # diff all the files inside it.
976 # This will put a lot of pressure on the heap. This is why StringIO
977 # is used and converted back into a string at the end. The reason to
978 # return a string instead of a StringIO is that StringIO.write()
979 # doesn't accept a StringIO object. *sigh*.
980 for (dirpath, dirnames, filenames) in os.walk(filename):
981 # Cleanup all files starting with a '.'.
982 for d in dirnames:
983 if d.startswith('.'):
984 dirnames.remove(d)
985 for f in filenames:
986 if f.startswith('.'):
987 filenames.remove(f)
988 for f in filenames:
989 if data is None:
990 data = cStringIO.StringIO()
991 data.write(GenFakeDiff(os.path.join(dirpath, f)))
992 if data:
993 tmp = data.getvalue()
994 data.close()
995 data = tmp
996 else:
997 data = GenFakeDiff(filename)
998 else:
999 if info.get("Node Kind") != "directory":
1000 # svn diff on a mv/cp'd file outputs nothing if there was no change.
1001 data = SVN.Capture(command, cwd)
1002 if not data:
1003 # We put in an empty Index entry so upload.py knows about them.
1004 data = "Index: %s\n" % filename.replace(os.sep, '/')
1005 # Otherwise silently ignore directories.
1006 else:
1007 if info.get("Node Kind") != "directory":
1008 # Normal simple case.
1009 try:
1010 data = SVN.Capture(command, cwd)
1011 except subprocess2.CalledProcessError:
1012 if revision:
1013 data = GenFakeDiff(filename)
1014 else:
1015 raise
1016 # Otherwise silently ignore directories.
1017 return data
1018
1019 @staticmethod
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001020 def GetEmail(cwd):
maruel@chromium.orgc78f2462009-11-21 01:20:57 +00001021 """Retrieves the svn account which we assume is an email address."""
maruel@chromium.org54019f32010-09-09 13:50:11 +00001022 try:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001023 infos = SVN.CaptureLocalInfo([], cwd)
maruel@chromium.orgda64d632011-09-08 17:41:15 +00001024 except subprocess2.CalledProcessError:
maruel@chromium.orgc78f2462009-11-21 01:20:57 +00001025 return None
1026
1027 # Should check for uuid but it is incorrectly saved for https creds.
maruel@chromium.org54019f32010-09-09 13:50:11 +00001028 root = infos['Repository Root']
maruel@chromium.orgc78f2462009-11-21 01:20:57 +00001029 realm = root.rsplit('/', 1)[0]
maruel@chromium.org54019f32010-09-09 13:50:11 +00001030 uuid = infos['UUID']
maruel@chromium.orgc78f2462009-11-21 01:20:57 +00001031 if root.startswith('https') or not uuid:
1032 regexp = re.compile(r'<%s:\d+>.*' % realm)
1033 else:
1034 regexp = re.compile(r'<%s:\d+> %s' % (realm, uuid))
1035 if regexp is None:
1036 return None
1037 if sys.platform.startswith('win'):
1038 if not 'APPDATA' in os.environ:
1039 return None
maruel@chromium.org720d9f32009-11-21 17:38:57 +00001040 auth_dir = os.path.join(os.environ['APPDATA'], 'Subversion', 'auth',
1041 'svn.simple')
maruel@chromium.orgc78f2462009-11-21 01:20:57 +00001042 else:
1043 if not 'HOME' in os.environ:
1044 return None
1045 auth_dir = os.path.join(os.environ['HOME'], '.subversion', 'auth',
1046 'svn.simple')
1047 for credfile in os.listdir(auth_dir):
1048 cred_info = SVN.ReadSimpleAuth(os.path.join(auth_dir, credfile))
1049 if regexp.match(cred_info.get('svn:realmstring')):
1050 return cred_info.get('username')
1051
1052 @staticmethod
1053 def ReadSimpleAuth(filename):
1054 f = open(filename, 'r')
1055 values = {}
maruel@chromium.org6e29d572010-06-04 17:32:20 +00001056 def ReadOneItem(item_type):
1057 m = re.match(r'%s (\d+)' % item_type, f.readline())
maruel@chromium.orgc78f2462009-11-21 01:20:57 +00001058 if not m:
1059 return None
1060 data = f.read(int(m.group(1)))
1061 if f.read(1) != '\n':
1062 return None
1063 return data
1064
1065 while True:
1066 key = ReadOneItem('K')
1067 if not key:
1068 break
1069 value = ReadOneItem('V')
1070 if not value:
1071 break
1072 values[key] = value
1073 return values
maruel@chromium.org94b1ee92009-12-19 20:27:20 +00001074
1075 @staticmethod
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001076 def GetCheckoutRoot(cwd):
maruel@chromium.org94b1ee92009-12-19 20:27:20 +00001077 """Returns the top level directory of the current repository.
1078
1079 The directory is returned as an absolute path.
1080 """
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001081 cwd = os.path.abspath(cwd)
maruel@chromium.org54019f32010-09-09 13:50:11 +00001082 try:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001083 info = SVN.CaptureLocalInfo([], cwd)
maruel@chromium.org885d6e82011-02-24 20:21:46 +00001084 cur_dir_repo_root = info['Repository Root']
1085 url = info['URL']
maruel@chromium.orgda64d632011-09-08 17:41:15 +00001086 except subprocess2.CalledProcessError:
maruel@chromium.org94b1ee92009-12-19 20:27:20 +00001087 return None
maruel@chromium.org94b1ee92009-12-19 20:27:20 +00001088 while True:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001089 parent = os.path.dirname(cwd)
maruel@chromium.org54019f32010-09-09 13:50:11 +00001090 try:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001091 info = SVN.CaptureLocalInfo([], parent)
maruel@chromium.org885d6e82011-02-24 20:21:46 +00001092 if (info['Repository Root'] != cur_dir_repo_root or
1093 info['URL'] != os.path.dirname(url)):
maruel@chromium.org54019f32010-09-09 13:50:11 +00001094 break
maruel@chromium.org885d6e82011-02-24 20:21:46 +00001095 url = info['URL']
maruel@chromium.orgda64d632011-09-08 17:41:15 +00001096 except subprocess2.CalledProcessError:
maruel@chromium.org94b1ee92009-12-19 20:27:20 +00001097 break
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001098 cwd = parent
1099 return GetCasedPath(cwd)
tony@chromium.org57564662010-04-14 02:35:12 +00001100
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +00001101 @staticmethod
1102 def IsValidRevision(url):
1103 """Verifies the revision looks like an SVN revision."""
1104 try:
1105 SVN.Capture(['info', url], cwd=None)
1106 return True
1107 except subprocess2.CalledProcessError:
1108 return False
1109
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001110 @classmethod
1111 def AssertVersion(cls, min_version):
tony@chromium.org57564662010-04-14 02:35:12 +00001112 """Asserts svn's version is at least min_version."""
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001113 if cls.current_version is None:
shouqun.liu@intel.com13b522c2012-07-20 17:16:51 +00001114 cls.current_version = cls.Capture(['--version', '--quiet'], None)
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001115 current_version_list = map(only_int, cls.current_version.split('.'))
tony@chromium.org57564662010-04-14 02:35:12 +00001116 for min_ver in map(int, min_version.split('.')):
1117 ver = current_version_list.pop(0)
1118 if ver < min_ver:
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001119 return (False, cls.current_version)
tony@chromium.org57564662010-04-14 02:35:12 +00001120 elif ver > min_ver:
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001121 return (True, cls.current_version)
1122 return (True, cls.current_version)
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001123
1124 @staticmethod
maruel@chromium.orgea15cb72012-05-04 14:16:31 +00001125 def Revert(cwd, callback=None, ignore_externals=False, no_ignore=False):
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001126 """Reverts all svn modifications in cwd, including properties.
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001127
1128 Deletes any modified files or directory.
1129
1130 A "svn update --revision BASE" call is required after to revive deleted
1131 files.
1132 """
maruel@chromium.orgea15cb72012-05-04 14:16:31 +00001133 for file_status in SVN.CaptureStatus(None, cwd, no_ignore=no_ignore):
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001134 file_path = os.path.join(cwd, file_status[1])
maruel@chromium.org8c415122011-03-15 17:14:27 +00001135 if (ignore_externals and
1136 file_status[0][0] == 'X' and
1137 file_status[0][1:].isspace()):
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001138 # Ignore externals.
1139 logging.info('Ignoring external %s' % file_status[1])
1140 continue
1141
maruel@chromium.org62087572012-04-24 23:16:28 +00001142 # This is the case where '! L .' is returned by 'svn status'. Just
1143 # strip off the '/.'.
1144 if file_path.endswith(os.path.sep + '.'):
1145 file_path = file_path[:-2]
1146
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001147 if callback:
1148 callback(file_status)
1149
maruel@chromium.org8c415122011-03-15 17:14:27 +00001150 if os.path.exists(file_path):
1151 # svn revert is really stupid. It fails on inconsistent line-endings,
1152 # on switched directories, etc. So take no chance and delete everything!
1153 # In theory, it wouldn't be necessary for property-only change but then
1154 # it'd have to look for switched directories, etc so it's not worth
1155 # optimizing this use case.
1156 if os.path.isfile(file_path) or os.path.islink(file_path):
1157 logging.info('os.remove(%s)' % file_path)
1158 os.remove(file_path)
1159 elif os.path.isdir(file_path):
digit@chromium.orgdc112ac2013-04-24 13:00:19 +00001160 logging.info('rmtree(%s)' % file_path)
1161 gclient_utils.rmtree(file_path)
maruel@chromium.org8c415122011-03-15 17:14:27 +00001162 else:
1163 logging.critical(
1164 ('No idea what is %s.\nYou just found a bug in gclient'
1165 ', please ping maruel@chromium.org ASAP!') % file_path)
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001166
maruel@chromium.org8c415122011-03-15 17:14:27 +00001167 if (file_status[0][0] in ('D', 'A', '!') or
1168 not file_status[0][1:].isspace()):
maruel@chromium.orgaf453492011-03-03 21:04:09 +00001169 # Added, deleted file requires manual intervention and require calling
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001170 # revert, like for properties.
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001171 if not os.path.isdir(cwd):
maruel@chromium.org8b322b32011-11-01 19:05:50 +00001172 # '.' was deleted. It's not worth continuing.
1173 return
maruel@chromium.orgaf453492011-03-03 21:04:09 +00001174 try:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001175 SVN.Capture(['revert', file_status[1]], cwd=cwd)
maruel@chromium.orgda64d632011-09-08 17:41:15 +00001176 except subprocess2.CalledProcessError:
maruel@chromium.orgaf453492011-03-03 21:04:09 +00001177 if not os.path.exists(file_path):
1178 continue
1179 raise