Fix monotone support in meld-1.2



Hi Folks (especially Stephen)

Fedora 10 recently squirted meld-1.2 onto my machine and I realized that
the monotone support was broken by the vc re-factoring.

Attached patch corrects this in the most obvious way.

-- 
Daniel Thompson <daniel redfelineninja org uk>
It appears that monotone support broke in meld-1.2.

Two problems:

- there is no called self.get_tree() in _get_dirsandfiles meaning the 
  symbol tree doesn't exist.

- lookup_files() doesn't return the result of _vc.Vc.lookup_files() up
  the call chain (i.e. the method returns None)

Having read the TODO: I tried simply removing the override.
Works for me...

Index: meld-1.2/vc/monotone.py
===================================================================
--- meld-1.2.orig/vc/monotone.py
+++ meld-1.2/vc/monotone.py
@@ -247,14 +247,10 @@ class Vc(_vc.Vc):
         else:
             return self._tree_cache
 
-    # TODO: if get_tree() could be called later,
-    # we wouldn't need this override for lookup_files()
-    def lookup_files(self, dirs, files):
-        tree = self.get_tree()
-        _vc.Vc.lookup_files(self, dirs, files)
-
     def _get_dirsandfiles(self, directory, dirs, files):
 
+        tree = self.get_tree()
+
         retfiles = []
         retdirs = []
         vcfiles = {}
Index: meld-1.2/vc/monotone.pyc
===================================================================
Binary files meld-1.2.orig/vc/monotone.pyc and meld-1.2/vc/monotone.pyc differ


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