[meld/meld-3-12] meld.vc.svn: Make repository validity check relative to the repo root



commit 499d322745b29e61bf8edadaa8c61890923001ca
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Mon Oct 27 07:12:06 2014 +1000

    meld.vc.svn: Make repository validity check relative to the repo root
    
    This fixes a regression from 1.8 where we started incorrectly checking
    repository validity against the repo view location, not the actual root
    of the repository.

 meld/vc/svn.py |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/meld/vc/svn.py b/meld/vc/svn.py
index c89372a..0ffbeb8 100644
--- a/meld/vc/svn.py
+++ b/meld/vc/svn.py
@@ -161,10 +161,12 @@ class Vc(_vc.CachedVc):
         if _vc.call([cls.CMD, "info"], cwd=path):
             return False
 
+        root, location = cls.is_in_repo(path)
+
         # Check for repository version, trusting format file then entries file
-        format_path = os.path.join(path, cls.VC_DIR, "format")
-        entries_path = os.path.join(path, cls.VC_DIR, "entries")
-        wcdb_path = os.path.join(path, cls.VC_DIR, "wc.db")
+        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)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]