[meld/VersionControlRework: 103/123] vc.svn: Fix cwd usage in subversion



commit 6af45f843827aed205095e75894546cc727ccd7b
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sat Apr 18 08:12:13 2015 +1000

    vc.svn: Fix cwd usage in subversion

 meld/vc/svn.py |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/meld/vc/svn.py b/meld/vc/svn.py
index a512be1..b88cba1 100644
--- a/meld/vc/svn.py
+++ b/meld/vc/svn.py
@@ -199,12 +199,10 @@ class Vc(_vc.Vc):
         for target in tree.findall("target") + tree.findall("changelist"):
             for entry in (t for t in target.getchildren() if t.tag == "entry"):
                 path = entry.attrib["path"]
-                if path == ".":
-                    path = os.getcwd()
-                if path == "":
+                if not path:
                     continue
                 if not os.path.isabs(path):
-                    path = os.path.abspath(path)
+                    path = os.path.abspath(os.path.join(self.location, path))
                 for status in (e for e in entry.getchildren() \
                                if e.tag == "wc-status"):
                     item = status.attrib["item"]


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