[meld/VersionControlRework: 33/123] vc: Rename parameter for a marginally better indication of its use

[Kai Willadsen <kaiw src gnome org>]

commit da29e72517ad8732986192d7a870268f9ca17654
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sun Mar 22 09:53:07 2015 +1000

    vc: Rename parameter for a marginally better indication of its use
    
    The 'directory' parameter is really the base dir containing the
    folders and files being 'get'ed.

 meld/vc/_vc.py |    4 ++--
 meld/vc/bzr.py |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/meld/vc/_vc.py b/meld/vc/_vc.py
index 4f5f071..795a74c 100644
--- a/meld/vc/_vc.py
+++ b/meld/vc/_vc.py
@@ -227,7 +227,7 @@ class Vc(object):
             directory = os.path.dirname(files[0][1])
         return self._get_dirsandfiles(directory, dirs, files)
 
-    def _get_dirsandfiles(self, directory, dirs, files):
+    def _get_dirsandfiles(self, base, dirs, files):
 
         tree = self._get_tree_cache()
 
@@ -244,7 +244,7 @@ class Vc(object):
             # removed files are not in the filesystem, so must be added here
             if state in (STATE_REMOVED, STATE_MISSING):
                 folder, name = os.path.split(path)
-                if folder == directory:
+                if folder == base:
                     retfiles.append(File(path, name, state))
         return retdirs, retfiles
 
diff --git a/meld/vc/bzr.py b/meld/vc/bzr.py
index eaf2e9e..78c7049 100644
--- a/meld/vc/bzr.py
+++ b/meld/vc/bzr.py
@@ -218,7 +218,7 @@ class Vc(_vc.Vc):
             dict((x, max(y)) for x, y in tree_cache.items()))
         self._tree_meta_cache = dict(tree_meta_cache)
 
-    def _get_dirsandfiles(self, directory, dirs, files):
+    def _get_dirsandfiles(self, base, dirs, files):
         tree = self._get_tree_cache()
 
         retfiles = []
@@ -228,7 +228,7 @@ class Vc(_vc.Vc):
             mydir, name = os.path.split(path)
             if path.endswith('/'):
                 mydir, name = os.path.split(mydir)
-            if mydir != directory:
+            if mydir != base:
                 continue
             meta = ','.join(self._tree_meta_cache.get(path, []))
             if path.endswith('/'):