[meld/VersionControlRework: 50/123] vc._vc: Further simplify lookup_files
- From: Kai Willadsen <kaiw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld/VersionControlRework: 50/123] vc._vc: Further simplify lookup_files
- Date: Sun, 19 Apr 2015 20:10:11 +0000 (UTC)
commit 7864ace3128750ba4de07a5518ae9ceac7b3f5fb
Author: Kai Willadsen <kai willadsen gmail com>
Date: Sun Mar 29 10:39:29 2015 +1000
vc._vc: Further simplify lookup_files
The unused directory argument is now required and will always be equal
to what this code previously looked up.
meld/vc/_vc.py | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
---
diff --git a/meld/vc/_vc.py b/meld/vc/_vc.py
index 65cf7ae..3091157 100644
--- a/meld/vc/_vc.py
+++ b/meld/vc/_vc.py
@@ -208,12 +208,8 @@ class Vc(object):
return dirs + files
def lookup_files(self, dirs, files, directory):
- # Assumes that all files are in the same directory. files is an array
- # of (name, path) tuples.
- if len(dirs):
- directory = os.path.dirname(dirs[0][1])
- elif len(files):
- directory = os.path.dirname(files[0][1])
+ # 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):
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]