[Python-checkins] r64262 - python/trunk/Tools/scripts/svneol.py

Sat Jun 14 03:50:46 CEST 2008

Author: martin.v.loewis
Date: Sat Jun 14 03:50:46 2008
New Revision: 64262
Log:
Support subversion repositories of version 8.
Modified:
 python/trunk/Tools/scripts/svneol.py
Modified: python/trunk/Tools/scripts/svneol.py
==============================================================================

--- python/trunk/Tools/scripts/svneol.py	(original)
+++ python/trunk/Tools/scripts/svneol.py	Sat Jun 14 03:50:46 2008
@@ -33,9 +33,21 @@
 import re
 import os
 
+def propfile(root, fn):
+ default = os.path.join(root, ".svn", "props", fn+".svn-work")
+ try:
+ format = int(open(os.path.join(root, ".svn", "format")).read().strip())
+ except IOError:
+ return default
+ # XXX I don't know what version uses what format;
+ # this condition is just anecdotal
+ if format >= 8:
+ return os.path.join(root, ".svn", "prop-base", fn+".svn-base")
+ return default
+
 def proplist(root, fn):
 "Return a list of property names for file fn in directory root"
- path = os.path.join(root, ".svn", "props", fn+".svn-work")
+ path = propfile(root, fn)
 try:
 f = open(path)
 except IOError:
