[meld/VersionControlRework: 20/123] meld.vc: Pull out common cache_tree implementations



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

    meld.vc: Pull out common cache_tree implementations

 meld/vc/_vc.py       |    6 ++++--
 meld/vc/bzr.py       |    5 -----
 meld/vc/git.py       |    5 -----
 meld/vc/mercurial.py |    5 -----
 meld/vc/svn.py       |    5 -----
 5 files changed, 4 insertions(+), 22 deletions(-)
---
diff --git a/meld/vc/_vc.py b/meld/vc/_vc.py
index 2814d7c..5198b48 100644
--- a/meld/vc/_vc.py
+++ b/meld/vc/_vc.py
@@ -192,8 +192,10 @@ class Vc(object):
     def get_working_directory(self, workdir):
         return workdir
 
-    def cache_tree(self, directory):
-        raise NotImplementedError()
+    def cache_tree(self):
+        tree_state = {}
+        self._update_tree_state_cache("./", tree_state)
+        return tree_state
 
     def _get_tree_cache(self):
         if not self._tree_cache:
diff --git a/meld/vc/bzr.py b/meld/vc/bzr.py
index f46827a..dedf1f0 100644
--- a/meld/vc/bzr.py
+++ b/meld/vc/bzr.py
@@ -148,11 +148,6 @@ class Vc(_vc.Vc):
                 files.append(os.path.relpath(p, self.root))
         return sorted(list(set(files)))
 
-    def cache_tree(self):
-        tree_state = {}
-        self._update_tree_state_cache("./", tree_state)
-        return tree_state
-
     def _update_tree_state_cache(self, path, tree_state):
         # FIXME: This actually clears out state information, because the
         # current API doesn't have any state outside of _tree_cache.
diff --git a/meld/vc/git.py b/meld/vc/git.py
index 4f8962f..e7ca00e 100644
--- a/meld/vc/git.py
+++ b/meld/vc/git.py
@@ -367,11 +367,6 @@ class Vc(_vc.Vc):
             for path in unversioned_entries:
                 tree_state[get_real_path(path)] = _vc.STATE_NONE
 
-    def cache_tree(self):
-        tree_state = {}
-        self._update_tree_state_cache("./", tree_state)
-        return tree_state
-
     def update_file_state(self, path):
         tree_state = self._get_tree_cache()
         self._update_tree_state_cache(path, tree_state)
diff --git a/meld/vc/mercurial.py b/meld/vc/mercurial.py
index be77930..529729c 100644
--- a/meld/vc/mercurial.py
+++ b/meld/vc/mercurial.py
@@ -122,11 +122,6 @@ class Vc(_vc.Vc):
                 state = self.state_map.get(statekey.strip(), _vc.STATE_NONE)
                 tree_state[path] = state
 
-    def cache_tree(self):
-        tree_state = {}
-        self._update_tree_state_cache("./", tree_state)
-        return tree_state
-
     def update_file_state(self, path):
         tree_state = self._get_tree_cache()
         self._update_tree_state_cache(path, tree_state)
diff --git a/meld/vc/svn.py b/meld/vc/svn.py
index 9217da9..37e1d63 100644
--- a/meld/vc/svn.py
+++ b/meld/vc/svn.py
@@ -216,11 +216,6 @@ class Vc(_vc.Vc):
                         tree_state[mydir] = {}
                     tree_state[mydir][name] = (item, rev)
 
-    def cache_tree(self):
-        tree_state = {}
-        self._update_tree_state_cache('./', tree_state)
-        return tree_state
-
     def update_file_state(self, path):
         tree_state = self._get_tree_cache()
         self._update_tree_state_cache(path, tree_state)


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