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

Timestamp:

05/18/08 01:56:34 (5 years ago)

Author:

lele@…

Hash name:

20080517235634-97f81-6ec8fd33b4a2d0706fca42e0fa0579da0254d9bb

Message:

Reduce "rename A B"+"add B" to "add B"

File:

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

vcpx/repository/darcs/source.py

@@ -45 +45 @@
 
         - collapse "add A; rename A B" into "add B"
+        - collapse "rename A B; add B" into "add B"
         - annihilate "add A; remove A"
         - collapse "rename A B; remove B" into "remove A"
@@ -91 +92 @@
                         return e
 
+                # The "rename A B; add B" into "add B"
+                if e.action_kind == e.RENAMED and e.name == entry.name:
+                    del self.entries[i]
+
                 # Assert also that add_dir events must preceeds any
                 # add_file and ren_file that have that dir as target,
@@ -129 +134 @@
         # The "rename A B; rename B C" to "rename A C" part
         elif entry.action_kind == entry.RENAMED:
-            for i in self.entries:
-                if i.action_kind == i.RENAMED and i.name == entry.old_name:
-                    i.name = entry.name
-                    return i
+            for e in self.entries:
+                if e.action_kind == e.RENAMED and e.name == entry.old_name:
+                    e.name = entry.name
+                    return e
+
+            # The "rename A B; add B" into "add B", part two
+            for i,e in enumerate(self.entries):
+                if e.action_kind == e.ADDED and e.name == entry.name:
+                    return None
 
         # Ok, it must be either an edit or a rename: the former goes