[meld] Fix VC comparison for non-VC folders



commit 7429b41b0e8665846b35cda9af7ce6bf9f037630
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Thu Feb 28 17:42:01 2013 +1000

    Fix VC comparison for non-VC folders

 meld/vc/_null.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/meld/vc/_null.py b/meld/vc/_null.py
index c3cee00..361b7ef 100644
--- a/meld/vc/_null.py
+++ b/meld/vc/_null.py
@@ -45,7 +45,7 @@ class Vc(_vc.Vc):
     def resolved_command(self):
         return [self.CMD,"resolved"]
 
-    def lookup_files(self, dirs, files):
+    def lookup_files(self, dirs, files, directory=None):
         "files is array of (name, path). assume all files in same dir"
         d = [_vc.Dir(x[1], x[0], _vc.STATE_NONE) for x in dirs]
         f = [_vc.File(x[1], x[0], _vc.STATE_NONE) for x in files]


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