Changeset 1583 in tailor for vcpx/repository/darcs/source.py

Timestamp:

05/31/08 01:17:47 (5 years ago)

Author:

lele@…

Hash name:

20080530231747-97f81-cfc68186fb253db37a7b0599d6873ff14e67d80f

Message:

Collapse another strange darcs combination
Patch [1211] splitted the monolithic git backend into a subpackage,
moving files around: strangely, it say something like

• add A
• mv A B
• edit B

(although not in that order) with the net result of a simpler add B.

File:

• vcpx/repository/darcs/source.py (modified) (3 diffs)

vcpx/repository/darcs/source.py

@@ -62 +62 @@
         - collapse "rename A B; remove B" into "remove A"
         - collapse "rename A B; rename B C" into "rename A C"
+        - collapse "add A; edit A" into "add A"
         """
 
@@ -106 +107 @@
                             e.old_name = None
                             e.is_directory = entry.is_directory
+
+                            # Collapse "add A; edit A" into "add A"
+                            for j,oe in enumerate(self.entries):
+                                if oe.action_kind == e.UPDATED and e.name == oe.name:
+                                    del self.entries[j]
+
                             return e
 
@@ -170 +177 @@
         # obviously to the end, and since the latter, as said, come
         # in very early, appending is just good.
+
         self.entries.append(entry)
         return entry