[meld/VersionControlRework: 51/123] vc._vc: Merge _get_dirsandfiles into lookup_files
- From: Kai Willadsen <kaiw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld/VersionControlRework: 51/123] vc._vc: Merge _get_dirsandfiles into lookup_files
- Date: Sun, 19 Apr 2015 20:10:17 +0000 (UTC)
commit 9224e0e77176cbaec7b6b2f5631ad387c4d4fe45
Author: Kai Willadsen <kai willadsen gmail com>
Date: Sun Mar 29 10:41:56 2015 +1000
vc._vc: Merge _get_dirsandfiles into lookup_files
meld/vc/_vc.py | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
---
diff --git a/meld/vc/_vc.py b/meld/vc/_vc.py
index 3091157..6bf487c 100644
--- a/meld/vc/_vc.py
+++ b/meld/vc/_vc.py
@@ -207,13 +207,9 @@ class Vc(object):
dirs, files = self.lookup_files(cdirs, cfiles, path)
return dirs + files
- def lookup_files(self, dirs, files, directory):
+ def lookup_files(self, dirs, files, base):
# All dirs and files must be direct children of same directory.
# dirs and files are lists of (name, path) tuples.
- return self._get_dirsandfiles(directory, dirs, files)
-
- def _get_dirsandfiles(self, base, dirs, files):
-
tree = self._get_tree_cache()
def make_entry(name, path, isdir):
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]