Changeset 1222 in tailor

Timestamp:

07/10/06 01:43:05 (7 years ago)

Author:

lele@…

Hash name:

20060709234305-97f81-5e42989c3be7ed6d12b6f56252fcb8c8fdb724a9

Message:

Fix the reordering of bad ordered darcs hunks

Location:

vcpx

Files:

• tests/darcs.py (modified) (4 diffs)
• repository/darcs/source.py (modified) (1 diff)

vcpx/tests/darcs.py

@@ -172 +172 @@
 
         entry = cset.entries[0]
+        self.assertEqual(entry.name, 'bdir')
+        self.assertEqual(entry.action_kind, entry.ADDED)
+
+        entry = cset.entries[1]
         self.assertEqual(entry.name, 'dir')
         self.assertEqual(entry.action_kind, entry.RENAMED)
-
-        entry = cset.entries[1]
-        self.assertEqual(entry.name, 'bdir')
-        self.assertEqual(entry.action_kind, entry.ADDED)
 
         cset = csets[3]
@@ -259 +259 @@
     <move from="tools/README-do_gen" to="generate/README"/>
     <move from="tools/do_gen.sh" to="generate/do_src.sh"/>
+    <move from="generate/added.sh" to="generate/added-then-renamed.sh"/>
     <modify_file>
     Makefile.am<removed_lines num='1'/><added_lines num='1'/>
@@ -334 +335 @@
     tools
     </remove_directory>
+    <add_file>
+    generate/added.sh
+    </add_file>
     </summary>
 </patch>
@@ -351 +355 @@
         for i,e in enumerate(cset.entries):
             if e.action_kind == e.RENAMED:
-                postadds = [n for n in cset.entries[i+1:]
-                            if e.name.startswith(n.name+'/') and (n.action_kind==n.ADDED or
-                                                                  n.action_kind==n.RENAMED)]
+                postadds = [n.name for n in cset.entries[i+1:]
+                            if ((e.name.startswith(n.name+'/') or (e.old_name==n.name)) and
+                                (n.action_kind==n.ADDED or n.action_kind==n.RENAMED))]
                 for ee in postadds:
                     print ee

vcpx/repository/darcs/source.py

@@ -137 +137 @@
                         if e.action_kind == e.RENAMED:
                             for j,n in enumerate(entries[i+1:]):
-                                if (e.name.startswith(n.name+'/') and
-                                    (n.action_kind == n.ADDED or
-                                     n.action_kind == n.RENAMED)):
+                                if ((e.name.startswith(n.name+'/') or e.old_name==n.name) and
+                                    (n.action_kind == n.ADDED or n.action_kind == n.RENAMED)):
                                     m = entries.pop(i+1+j)
                                     entries.insert(i, m)