Changeset 1001 in tailor

Timestamp:

11/15/05 08:07:47 (8 years ago)

Author:

Brendan Cully <brendan@…>

Hash name:

20051115070747-0ae3a-12b6c6f21029519486fa155a5dbbbe344798815f

Message:

Fix mercurial source deletion detection

The original mercurial delete logic would find any unchanged file in a
changeset to be deleted. This horrible bug was mitigated by the fact that
I had forgotten to actually add DELETED changeset entries to the changeset.

File:

• vcpx/hglib.py (modified) (2 diffs)

vcpx/hglib.py

@@ -101 +101 @@
                 pms = {}
 
-        # Every time we find a file in the current manifest, we pop it from the parents.
-        # Anything left over in parents is a deleted file.
         for f in files:
             e = ChangesetEntry(f)
@@ -113 +111 @@
                 pms.pop(oldname[0])
             else:
-                try:
-                    del pms[f]
+                if pms.has_key(f):
                     e.action_kind = ChangesetEntry.UPDATED
-                except KeyError:
+                else:
                     e.action_kind = ChangesetEntry.ADDED
 
             entries.append(e)
 
-        for df in pms.iterkeys():
+        for df in [file for file in pms.iterkeys() if not manifest.has_key(file)]:
             e = ChangesetEntry(df)
             e.action_kind = ChangesetEntry.DELETED
+            entries.append(e)
 
         from mercurial.node import hex