Changeset 1582 in tailor for vcpx/repository/darcs/target.py

Timestamp:

05/30/08 12:06:39 (5 years ago)

Author:

lele@…

Hash name:

20080530100639-97f81-0bf36b33541bc6a0d1af593154ba59b5dd55db4b

Message:

Ouch! The changeset is already adapted at that point...

File:

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

vcpx/repository/darcs/target.py

@@ -181 +181 @@
 
         entries = []
-        adapted = self._adaptChangeset(changeset)
-        while adapted.entries:
-            e = adapted.entries.pop(0)
+
+        while changeset.entries:
+            e = changeset.entries.pop(0)
             if e.action_kind == e.DELETED:
                 elide = False
-                for j,oe in enumerate(adapted.entries):
+                for j,oe in enumerate(changeset.entries):
                     if oe.action_kind == oe.ADDED and e.name == oe.name:
                         self.log.debug('Collapsing a %s and a %s on %s, assuming '
                                        'an upstream "replacement"',
                                        e.action_kind, oe.action_kind, oe.name)
-                        del adapted.entries[j]
+                        del changeset.entries[j]
                         elide = True
                         break
@@ -198 +198 @@
             elif e.action_kind == e.ADDED:
                 elide = False
-                for j,oe in enumerate(adapted.entries):
+                for j,oe in enumerate(changeset.entries):
                     if oe.action_kind == oe.DELETED and e.name == oe.name:
                         self.log.debug('Collapsing a %s and a %s on %s, assuming '
                                        'an upstream "replacement"',
                                        e.action_kind, oe.action_kind, oe.name)
-                        del adapted.entries[j]
+                        del changeset.entries[j]
                         elide = True
                         break