[meld/VersionControlRework: 12/123] meld.vc._vc: Simplify caching



commit 779b33add12cd7e87f658b4ec3f6826927f9f712
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sat Mar 21 15:12:11 2015 +1000

    meld.vc._vc: Simplify caching

 meld/vc/_vc.py |    5 +----
 meld/vcview.py |    2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)
---
diff --git a/meld/vc/_vc.py b/meld/vc/_vc.py
index 493eda6..55732e5 100644
--- a/meld/vc/_vc.py
+++ b/meld/vc/_vc.py
@@ -192,15 +192,12 @@ class Vc(object):
     def get_working_directory(self, workdir):
         return workdir
 
-    def cache_inventory(self, directory):
-        self._tree_cache = self._lookup_tree_cache(directory)
-
     def _lookup_tree_cache(self, directory):
         raise NotImplementedError()
 
     def _get_tree_cache(self, directory):
         if self._tree_cache is None:
-            self.cache_inventory(directory)
+            self._tree_cache = self._lookup_tree_cache(directory)
         return self._tree_cache
 
     def update_file_state(self, path):
diff --git a/meld/vcview.py b/meld/vcview.py
index 9d266e6..d6a4664 100644
--- a/meld/vcview.py
+++ b/meld/vcview.py
@@ -428,7 +428,7 @@ class VcView(melddoc.MeldDoc, gnomeglade.Component):
                    active_action(a[0]) and a[1]]
 
         yield _("Scanning %s") % rootname
-        self.vc.cache_inventory(rootname)
+        self.vc._get_tree_cache(rootname)
         while todo:
             # This needs to happen sorted and depth-first in order for our row
             # references to remain valid while we traverse.


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