From a08702aca6905b14377e540fe84d159dcb816f80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= Date: Sat, 14 Jun 2008 01:51:58 +0000 Subject: Merged revisions 64262 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r64262 | martin.v.loewis | 2008-06-14 03:50:46 +0200 (Sa, 14 Jun 2008) | 2 lines Support subversion repositories of version 8. ........ --- Tools/scripts/svneol.py | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/Tools/scripts/svneol.py b/Tools/scripts/svneol.py index a5e562c..5864cdc 100644 --- a/Tools/scripts/svneol.py +++ b/Tools/scripts/svneol.py @@ -33,9 +33,21 @@ and for a file with a binary mime-type property: 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: -- cgit v0.12