Changeset 1469 in tailor

Timestamp:

03/21/08 01:42:16 (5 years ago)

Author:

Miklos Vajna <vmiklos@…>

Hash name:

20080321004216-8c5d4-f39b2735e21fc0fa00f86c51e0ef816afc977658

Message:

darcs source: collapse "rename A B; rename B C" into "rename A C"

File:

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

vcpx/repository/darcs/source.py

@@ -47 +47 @@
         - annihilate "add A; remove A"
         - collapse "rename A B; remove B" into "remove A"
+        - collapse "rename A B; rename B C" into "rename A C"
         """
 
@@ -125 +126 @@
                     del self.entries[i]
                     return None
+
+        # 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
 
         # Ok, it must be either an edit or a rename: the former goes