[meld/VersionControlRework: 39/123] vc._vc: Comment additions



commit 6e730a25875922746ad59fba54a31af963623bc1
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sun Mar 22 14:23:46 2015 +1000

    vc._vc: Comment additions

 meld/vc/_vc.py |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/meld/vc/_vc.py b/meld/vc/_vc.py
index 08e7124..2d5b43c 100644
--- a/meld/vc/_vc.py
+++ b/meld/vc/_vc.py
@@ -234,12 +234,15 @@ class Vc(object):
         retfiles = [make_entry(name, path, False) for name, path in files]
         retdirs = [make_entry(name, path, True) for name, path in dirs]
 
+        # Removed entries are not in the filesystem, so must be added here
         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(make_entry(name, path, False))
+                    # 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.
+                    retfiles.append(make_entry(name, path, isdir=False))
 
         return retdirs, retfiles
 


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