Changeset 1501 in tailor

Timestamp:

05/18/08 19:55:31 (5 years ago)

Author:

lele@…

Hash name:

20080518175531-97f81-1ddbf126ce022be13c58d17c875cb0ef09e4e4e7

Message:

Fixup previous renames when reading darcs patches
For some reason a darcs patch may contain something like

    <move from="logo.png" to="logos-20041102120340/plain_logo.png"/>
    <move from="logos-20041102120340" to="logos"/>
    <move from="logos/large_logo.png-20041102120441" to="logos/large_logo.png"/>
    <move from="logos/logo.png-20041102120441" to="logos/logo.png"/>
    <add_directory>
    logos-20041102120340
    </add_directory>
    ...

Location:

vcpx

Files:

• tests/darcs.py (modified) (1 diff)
• repository/darcs/source.py (modified) (2 diffs)
• tests/data/darcs-rename_and_add_dir_test.log (added)

vcpx/tests/darcs.py

@@ -186 +186 @@
         self.assertEqual(entry.name, 'darcs_cgi.lhs')
         self.assertEqual(entry.action_kind, entry.UPDATED)
+
+    def testRenameAndAddDir(self):
+        """Verify that the parser reduce rename A B+add B to rename A B"""
+
+        log = self.getDarcsOutput('darcs-rename_and_add_dir_test')
+        csets = changesets_from_darcschanges(log)
+
+        cset = csets.next()
+        self.assertEqual(len(cset.entries), 7)
+
+        entry = cset.entries[0]
+        self.assertEqual(entry.name, 'logos/plain_logo.png')
+        self.assertEqual(entry.action_kind, entry.RENAMED)
+        self.assertEqual(entry.old_name, 'logo.png')
+
+        entry = cset.entries[1]
+        self.assertEqual(entry.name, 'logos')
+        self.assertEqual(entry.action_kind, entry.ADDED)
+
+        entry = cset.entries[2]
+        self.assertEqual(entry.name, 'logos/large_logo.png')
+        self.assertEqual(entry.action_kind, entry.ADDED)
 
     def testBadOrderedXML(self):

vcpx/repository/darcs/source.py

@@ -71 +71 @@
             # to an addition instead, and don't insert any other entry
 
-            dirname = entry.name+'/' # darcs hopefully use forward slashes also under win
+            # darcs hopefully use forward slashes also under win
+            dirname = entry.name+'/'
 
             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.
-                    if not skip:
-                        e.action_kind = e.ADDED
-                        e.old_name = None
-                        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]
+                if e.action_kind == e.RENAMED:
+                    if 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.
+                        if not skip:
+                            e.action_kind = e.ADDED
+                            e.old_name = None
+                            return e
+
+                    # The "rename A B; add B" into "add B"
+                    if e.name == entry.name:
+                        del self.entries[i]
 
                 # Assert also that add_dir events must preceeds any
@@ -134 +136 @@
         # The "rename A B; rename B C" to "rename A C" part
         elif entry.action_kind == entry.RENAMED:
+            # Adjust previous renames
+            olddirname = entry.old_name+'/'
+            for e in self.entries:
+                if e.action_kind == e.RENAMED and e.name.startswith(olddirname):
+                    e.name = entry.name + '/' + e.name[len(olddirname):]
+
             for e in self.entries:
                 if e.action_kind == e.RENAMED and e.name == entry.old_name: