[meld/VersionControlRework: 60/123] vc._vc: Fix removed entry replacement for entry creation changes



commit 151f21e8b1e2433371bae6792718a34e2e411bbc
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sun Mar 29 12:54:54 2015 +1000

    vc._vc: Fix removed entry replacement for entry creation changes

 meld/vc/_vc.py |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/meld/vc/_vc.py b/meld/vc/_vc.py
index 6c2b6f9..270f32f 100644
--- a/meld/vc/_vc.py
+++ b/meld/vc/_vc.py
@@ -234,8 +234,9 @@ class Vc(object):
                     # TODO: Ideally we'd know whether this was a folder
                     # or a file. Since it's gone however, only the VC
                     # knows, and may or may not tell us.
-                    entry = make_entry(name, path, Gio.FileType.UNKNOWN)
-                    retfiles.append(entry)
+                    meta = meta_tree.get(path, "")
+                    retfiles.append(
+                        Entry(path, name, state, isdir=False, options=meta))
 
         return retfiles
 


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