[meld/VersionControlRework: 35/123] vc._vc: Use 'meta' information for folders and removed entries as well

[Kai Willadsen <kaiw src gnome org>]

commit 3ef150f1f22ca332aa7967393650c5fdcb04cf60
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sun Mar 22 13:32:37 2015 +1000

    vc._vc: Use 'meta' information for folders and removed entries as well

 meld/vc/_vc.py |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)
---
diff --git a/meld/vc/_vc.py b/meld/vc/_vc.py
index 795a74c..184d67c 100644
--- a/meld/vc/_vc.py
+++ b/meld/vc/_vc.py
@@ -236,16 +236,24 @@ class Vc(object):
         for name, path in files:
             state = tree.get(path, STATE_NORMAL)
             meta = self._tree_meta_cache.get(path, "")
+            if isinstance(meta, list):
+                meta = ','.join(meta)
             retfiles.append(File(path, name, state, options=meta))
         for name, path in dirs:
             state = tree.get(path, STATE_NORMAL)
-            retdirs.append(Dir(path, name, state))
+            meta = self._tree_meta_cache.get(path, "")
+            if isinstance(meta, list):
+                meta = ','.join(meta)
+            retdirs.append(Dir(path, name, state, options=meta))
         for path, state in tree.items():
             # 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 == base:
-                    retfiles.append(File(path, name, state))
+                    meta = self._tree_meta_cache.get(path, "")
+                    if isinstance(meta, list):
+                        meta = ','.join(meta)
+                    retfiles.append(File(path, name, state, options=meta))
         return retdirs, retfiles
 
     def get_entry(self, path):