[meld/VersionControlRework: 26/123] vc.bzr: Re-fix files-to-commit gathering



commit a79203f226fa04cdf966c351c7ea3fa49fb31bc4
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sun Mar 22 08:33:00 2015 +1000

    vc.bzr: Re-fix files-to-commit gathering

 meld/vc/bzr.py |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/meld/vc/bzr.py b/meld/vc/bzr.py
index d709c27..b8dbe87 100644
--- a/meld/vc/bzr.py
+++ b/meld/vc/bzr.py
@@ -140,9 +140,9 @@ class Vc(_vc.Vc):
         files = []
         for p in paths:
             if os.path.isdir(p):
-                names = [
-                    x for x, y in tree.items() if y in self.commit_statuses]
-                files.extend(names)
+                for path, status in tree.items():
+                    if status in self.commit_statuses and path.startswith(p):
+                        files.append(os.path.relpath(path, self.root))
             else:
                 files.append(os.path.relpath(p, self.root))
         return sorted(list(set(files)))


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