[meld/VersionControlRework: 13/123] vc.svn: Enshorten the repo version detection code

[Kai Willadsen <kaiw src gnome org>]

commit d4fbbdf85db67d5affc55a0d3ba21f8fca5f206a
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sun Mar 22 06:36:35 2015 +1000

    vc.svn: Enshorten the repo version detection code

 meld/vc/svn.py |   24 +++++++++---------------
 1 files changed, 9 insertions(+), 15 deletions(-)
---
diff --git a/meld/vc/svn.py b/meld/vc/svn.py
index c339ab4..b0a4f92 100644
--- a/meld/vc/svn.py
+++ b/meld/vc/svn.py
@@ -167,24 +167,18 @@ class Vc(_vc.Vc):
             return False
 
         root, location = cls.is_in_repo(path)
+        vc_dir = os.path.join(root, cls.VC_DIR)
 
         # Check for repository version, trusting format file then entries file
-        format_path = os.path.join(root, cls.VC_DIR, "format")
-        entries_path = os.path.join(root, cls.VC_DIR, "entries")
-        wcdb_path = os.path.join(root, cls.VC_DIR, "wc.db")
-        format_exists = os.path.exists(format_path)
-        entries_exists = os.path.exists(entries_path)
-        wcdb_exists = os.path.exists(wcdb_path)
-        if format_exists:
-            with open(format_path) as f:
-                repo_version = int(f.readline().strip())
-        elif entries_exists:
-            with open(entries_path) as f:
-                repo_version = int(f.readline().strip())
-        elif wcdb_exists:
+        for filename in ("format", "entries"):
+            path = os.path.join(vc_dir, filename)
+            if os.path.exists(path):
+                with open(path) as f:
+                    repo_version = int(f.readline().strip())
+                break
+
+        if not repo_version and os.path.exists(os.path.join(vc_dir, "wc.db")):
             repo_version = 12
-        else:
-            return False
 
         return cls._repo_version_support(repo_version)