[meld] Fix command-line comparison of VC files in subdirs (closes bgo#693419)



commit 4e8e6d706c382a0034371ddc5e58f915ac007cc6
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sat Feb 9 08:05:08 2013 +1000

    Fix command-line comparison of VC files in subdirs (closes bgo#693419)
    
    Patch from Cedric Le Dillau.

 meld/vc/git.py    |    2 +-
 meld/vc/svn_17.py |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/meld/vc/git.py b/meld/vc/git.py
index aa23b20..4933086 100644
--- a/meld/vc/git.py
+++ b/meld/vc/git.py
@@ -92,7 +92,7 @@ class Vc(_vc.CachedVc):
 
         obj = commit + ":" + path
         process = subprocess.Popen([self.CMD, "cat-file", "blob", obj],
-                                   cwd=self.location, stdout=subprocess.PIPE,
+                                   cwd=self.root, stdout=subprocess.PIPE,
                                    stderr=subprocess.PIPE)
         vc_file = process.stdout
 
diff --git a/meld/vc/svn_17.py b/meld/vc/svn_17.py
index 6814ef6..810300f 100644
--- a/meld/vc/svn_17.py
+++ b/meld/vc/svn_17.py
@@ -49,7 +49,7 @@ class Vc(svn.Vc):
         path = path[len(self.root) + 1:]
 
         process = subprocess.Popen([self.CMD, "cat", "-r", commit, path],
-                                   cwd=self.location, stdout=subprocess.PIPE,
+                                   cwd=self.root, stdout=subprocess.PIPE,
                                    stderr=subprocess.PIPE)
         vc_file = process.stdout
 


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