[meld/VersionControlRework: 18/123] meld.vc.bzr: Fix file gathering for new cache behaviour



commit c83eb374bb41fc7e5cfc246ff9a5c6b834047ae5
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sun Mar 22 07:41:21 2015 +1000

    meld.vc.bzr: Fix file gathering for new cache behaviour

 meld/vc/bzr.py |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/meld/vc/bzr.py b/meld/vc/bzr.py
index 88eb80f..55bf859 100644
--- a/meld/vc/bzr.py
+++ b/meld/vc/bzr.py
@@ -137,14 +137,12 @@ class Vc(_vc.Vc):
         return self.root
 
     def get_files_to_commit(self, paths):
+        tree = self._get_tree_cache()
         files = []
         for p in paths:
             if os.path.isdir(p):
-                # FIXME: This used to be self._lookup_files(p), which
-                # definitely didn't do what we wanted.
-                entries = self.cache_tree()
                 names = [
-                    x for x, y in entries.items() if y in self.commit_statuses]
+                    x for x, y in tree.items() if y in self.commit_statuses]
                 files.extend(names)
             else:
                 files.append(os.path.relpath(p, self.root))


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