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

Timestamp:

03/21/08 01:25:04 (5 years ago)

Author:

Miklos Vajna <vmiklos@…>

Hash name:

20080321002504-8c5d4-2714c0f975822a2e4ebbcd6d4996c9237027cd40

Message:

DarcsChangeset?.addEntry: fix optimization

in case the changeset is like "mv a a2; mkdir a; mv a2 a/b" disable an
optimization that would break the conversion

File:

• vcpx/repository/darcs/source.py (modified) (1 diff)

vcpx/repository/darcs/source.py

@@ -73 +73 @@
             for i,e in enumerate(self.entries):
                 if e.action_kind == e.RENAMED and e.old_name == entry.name:
+                    # Unfortunately we have to check if the order if
+                    # messed up, in that case we should not do anything.
+                    # Example: mv a a2; mkdir a; mv a2 a/b
+                    skip = False
+                    for j in self.entries:
+                        if j.action_kind == j.RENAMED and j.name.startswith(dirname):
+                            skip = True
+                            break
                     # Luckily enough (since removes are the first entries
                     # in the list, that is) by anticipating the add we
                     # cure also the case below, when addition follows
                     # edit.
-                    e.action_kind = e.ADDED
-                    e.old_name = None
-                    return e
+                    if not skip:
+                        e.action_kind = e.ADDED
+                        e.old_name = None
+                        return e
 
                 # Assert also that add_dir events must preceeds any