From: Fabian Groffen <grobian@gentoo.org>
Date: Sat, 15 Oct 2011 12:41:13 +0000 (+0200)
Subject: FindVCS: support Subversion 1.7
X-Git-Tag: v2.2.0_alpha68~35
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=513445d8e36db3cc2c03e4c6ed3c357e0d6f15b6;p=portage.git

FindVCS: support Subversion 1.7

Since subversion 1.7, only a top-level .svn dir is used.  Make FindVCS
also deal with that.  (Tested with repoman on Prefix SVN-based tree.)
---

diff --git a/pym/repoman/utilities.py b/pym/repoman/utilities.py
index 380f8edb5..79137036c 100644
--- a/pym/repoman/utilities.py
+++ b/pym/repoman/utilities.py
@@ -472,7 +472,7 @@ def FindVCS():
 	outvcs = []
 
 	def seek(depth = None):
-		""" Seek for distributed VCSes. """
+		""" Seek for VCSes that have a top-level data directory only. """
 		retvcs = []
 		pathprep = ''
 
@@ -483,6 +483,8 @@ def FindVCS():
 				retvcs.append('bzr')
 			if os.path.isdir(os.path.join(pathprep, '.hg')):
 				retvcs.append('hg')
+			if os.path.isdir(os.path.join(pathprep, '.svn')):  # >=1.7
+				retvcs.append('svn')
 
 			if retvcs:
 				break
@@ -497,7 +499,7 @@ def FindVCS():
 	# Level zero VCS-es.
 	if os.path.isdir('CVS'):
 		outvcs.append('cvs')
-	if os.path.isdir('.svn'):
+	if os.path.isdir('.svn'):  # <1.7
 		outvcs.append('svn')
 
 	# If we already found one of 'level zeros', just take a quick look