[meld/VersionControlRework: 14/123] vc: _lookup_tree_cache is poorly named

[Kai Willadsen <kaiw src gnome org>]

commit 4c8d0fd2c9f164b92eb581e977640b398220cc6a
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sun Mar 22 07:01:17 2015 +1000

    vc: _lookup_tree_cache is poorly named

 meld/vc/_vc.py       |    4 ++--
 meld/vc/bzr.py       |    6 ++++--
 meld/vc/git.py       |    2 +-
 meld/vc/mercurial.py |    2 +-
 meld/vc/svn.py       |    2 +-
 5 files changed, 9 insertions(+), 7 deletions(-)
---
diff --git a/meld/vc/_vc.py b/meld/vc/_vc.py
index 55732e5..5cf58ae 100644
--- a/meld/vc/_vc.py
+++ b/meld/vc/_vc.py
@@ -192,12 +192,12 @@ class Vc(object):
     def get_working_directory(self, workdir):
         return workdir
 
-    def _lookup_tree_cache(self, directory):
+    def cache_tree(self, directory):
         raise NotImplementedError()
 
     def _get_tree_cache(self, directory):
         if self._tree_cache is None:
-            self._tree_cache = self._lookup_tree_cache(directory)
+            self._tree_cache = self.cache_tree(directory)
         return self._tree_cache
 
     def update_file_state(self, path):
diff --git a/meld/vc/bzr.py b/meld/vc/bzr.py
index 6768c2d..5691d11 100644
--- a/meld/vc/bzr.py
+++ b/meld/vc/bzr.py
@@ -140,7 +140,9 @@ class Vc(_vc.Vc):
         files = []
         for p in paths:
             if os.path.isdir(p):
-                entries = self._lookup_tree_cache(p)
+                # FIXME: This used to be self._lookup_files(p), which
+                # definitely didn't do what we wanted.
+                entries = self.cache_tree(p)
                 names = [
                     x for x, y in entries.items() if y in self.commit_statuses]
                 files.extend(names)
@@ -148,7 +150,7 @@ class Vc(_vc.Vc):
                 files.append(os.path.relpath(p, self.root))
         return sorted(list(set(files)))
 
-    def _lookup_tree_cache(self, rootdir):
+    def cache_tree(self, rootdir):
         branch_root = _vc.popen(
             [self.CMD] + self.CMDARGS + ["root", rootdir]).read().rstrip('\n')
         entries = []
diff --git a/meld/vc/git.py b/meld/vc/git.py
index 00c4bc2..5466ef6 100644
--- a/meld/vc/git.py
+++ b/meld/vc/git.py
@@ -367,7 +367,7 @@ class Vc(_vc.Vc):
             for path in unversioned_entries:
                 tree_state[get_real_path(path)] = _vc.STATE_NONE
 
-    def _lookup_tree_cache(self, rootdir):
+    def cache_tree(self, rootdir):
         # Get a list of all files in rootdir, as well as their status
         tree_state = {}
         self._update_tree_state_cache("./", tree_state)
diff --git a/meld/vc/mercurial.py b/meld/vc/mercurial.py
index b54058a..a5ac73b 100644
--- a/meld/vc/mercurial.py
+++ b/meld/vc/mercurial.py
@@ -122,7 +122,7 @@ class Vc(_vc.Vc):
                 state = self.state_map.get(statekey.strip(), _vc.STATE_NONE)
                 tree_state[path] = state
 
-    def _lookup_tree_cache(self, rootdir):
+    def cache_tree(self, rootdir):
         # Get a list of all files in rootdir, as well as their status
         tree_state = {}
         self._update_tree_state_cache("./", tree_state)
diff --git a/meld/vc/svn.py b/meld/vc/svn.py
index b0a4f92..05dcecf 100644
--- a/meld/vc/svn.py
+++ b/meld/vc/svn.py
@@ -214,7 +214,7 @@ class Vc(_vc.Vc):
                         tree_state[mydir] = {}
                     tree_state[mydir][name] = (item, rev)
 
-    def _lookup_tree_cache(self, rootdir):
+    def cache_tree(self, rootdir):
         # Get a list of all files in rootdir, as well as their status
         tree_state = {}
         self._update_tree_state_cache(rootdir, tree_state)