Changeset 1135 in tailor

Timestamp:

05/26/06 00:57:50 (7 years ago)

Author:

lele@…

Hash name:

20060525225750-97f81-fe30e21967f7b5fcd68c6994c566fe5038a0a60f

Message:

Don't propagate deletions with rsync

Location:

vcpx

Files:

• target.py (modified) (3 diffs)
• dualwd.py (modified) (1 diff)
• tests/tailor.py (modified) (2 diffs)

vcpx/target.py

@@ -265 +265 @@
 
         from os.path import join, isdir
-
-        added = changeset.addedEntries()
-        renamed = changeset.renamedEntries()
-        removed = changeset.removedEntries()
-
-        # Sort added entries, to be sure that /root/addedDir/ comes
-        # before /root/addedDir/addedSubdir
-        added.sort(lambda x,y: cmp(x.name, y.name))
-
-        # Sort removes in reverse order, to delete directories after
-        # their contents.
-        removed.sort(lambda x,y: cmp(y.name, x.name))
-
-        # Replay the actions
-
-        if renamed and removed:
-            # Handle the "replace" operation, that is a remove+rename
-
-            renames = [e.name for e in renamed]
-            removesfirst = []
-            for rem in removed:
-                if rem.name in renames:
-                    removesfirst.append(rem)
-
-            if removesfirst:
-                self._removeEntries(removesfirst)
-                for rem in removesfirst:
-                    removed.remove(rem)
-
-        if renamed: self._renameEntries(renamed)
-        if removed: self._removeEntries(removed)
-        if added: self._addEntries(added)
+        from changes import ChangesetEntry
+
+        added = []
+        actions = { ChangesetEntry.ADDED: self._addEntries,
+                    ChangesetEntry.DELETED: self._removeEntries,
+                    # ChangesetEntry.UPDATED: nothing
+                    ChangesetEntry.RENAMED: self._renameEntries
+                    }
+
+        last = None
+        group = []
+        for e in changeset.entries:
+            if last is None or last.action_kind == e.action_kind:
+                last = e
+                group.append(e)
+            if last.action_kind != e.action_kind:
+                actions[last.action_kind](group)
+                group = [e]
+            if e.action_kind == e.ADDED:
+                added.append(e)
+        if group:
+            actions[group[0].action_kind](group)
+
 
         # Finally, deal with "copied" directories. The simple way is
@@ -393 +384 @@
         """
 
-        from os import rename
+        from os import rename, unlink
         from os.path import split, join, exists
 
@@ -409 +400 @@
                 self._addPathnames(parents)
 
-            # Check to see if the oldentry is still there. If it is,
-            # that probably means one thing: it's been moved and then
-            # replaced, see svn 'R' event. In this case, rename the
-            # existing old entry to something else to trick targets
-            # (that will assume the move was already done manually) and
-            # finally restore its name.
-
-            absold = join(self.basedir, e.old_name)
-            renamed = exists(absold)
-            if renamed:
-                rename(absold, absold + '-TAILOR-HACKED-TEMP-NAME')
+            if self.shared_basedirs:
+                # Check to see if the oldentry is still there. If it is,
+                # that probably means one thing: it's been moved and then
+                # replaced, see svn 'R' event. In this case, rename the
+                # existing old entry to something else to trick targets
+                # (that will assume the move was already done manually) and
+                # finally restore its name.
+
+                absold = join(self.basedir, e.old_name)
+                renamed = exists(absold)
+                if renamed:
+                    rename(absold, absold + '-TAILOR-HACKED-TEMP-NAME')
+            else:
+                # With disjunct directories, old entries are *always*
+                # there because we dropped the --delete option to rsync.
+                # So, instead of renaming the old entry, we temporarily
+                # rename the new one, perform the target system rename
+                # and replace back the real content (it may be a
+                # renamed+edited event).
+                renamed = False
+                absnew = join(self.basedir, e.name)
+                renamed = exists(absnew)
+                if renamed:
+                    rename(absnew, absnew + '-TAILOR-HACKED-TEMP-NAME')
+
             try:
                 self._renamePathname(e.old_name, e.name)
             finally:
                 if renamed:
-                    rename(absold + '-TAILOR-HACKED-TEMP-NAME', absold)
+                    if self.shared_basedirs:
+                        rename(absold + '-TAILOR-HACKED-TEMP-NAME', absold)
+                    else:
+                        unlink(absnew)
+                        rename(absnew + '-TAILOR-HACKED-TEMP-NAME', absnew)
 
     def _renamePathname(self, oldname, newname):

vcpx/dualwd.py

@@ -108 +108 @@
 
     def _syncTargetWithSource(self):
-        cmd = ['rsync', '--delete', '--archive']
+        cmd = ['rsync', '--archive']
         now = datetime.now()
         if hasattr(self, '_last_rsync'):

vcpx/tests/tailor.py

@@ -214 +214 @@
 
 
-[darcs_add_remove]
-source = darcs:darcs_add_remove
-target = svn:darcs_add_remove
-root-directory = %(testdir)s/darcs_add_remove
-start-revision = 20050214010941-5007d-0c6d72fdbd6bb35b8a511d2cce0aec2dd3d6288d.gz
-
-[darcs:darcs_add_remove]
-repository = http://darcs.vexi.org/_mike/experimental/org.ibex.util
-subdir = util
-
-[svn:darcs_add_remove]
-repository = file://%(testdir)s/darcs_add_remove.svnrepo
-module = /ibex
-use-propset = True
+[darcs_rename_delete]
+source = darcs:darcs_rename_delete
+target = svn:darcs_rename_delete
+root-directory = %(testdir)s/darcs_rename_delete
+start-revision = INITIAL
+
+[darcs:darcs_rename_delete]
+repository = %(testdir)s/rename_delete
+subdir = darcs
+
+[svn:darcs_rename_delete]
+repository = file://%(testdir)s/darcs_rename_delete.svnrepo
+module = /
+subdir = svn
+
+
+[darcs_rename_delete_dir]
+source = darcs:darcs_rename_delete_dir
+target = svn:darcs_rename_delete_dir
+root-directory = %(testdir)s/darcs_rename_delete_dir
+start-revision = INITIAL
+
+[darcs:darcs_rename_delete_dir]
+repository = %(testdir)s/rename_delete_dir
+subdir = darcs
+
+[svn:darcs_rename_delete_dir]
+repository = file://%(testdir)s/darcs_rename_delete_dir.svnrepo
+module = /
+subdir = svn
 
 '''
@@ -393 +409 @@
         self.failUnless(exists(external % '_we'))
 
-    def testDarcsAddRemove(self):
-        "Try to migrate a buggy darcs patch that adds and removes the same file"
-
-        self.tailorize('darcs_add_remove')
+    def testDarcsRenameDelete(self):
+        "Try to migrate a darcs patch that renames and removes the same file"
+
+        from os import mkdir
+        from os.path import join
+
+        drepo = join(self.TESTDIR, 'rename_delete')
+        mkdir(drepo)
+
+        dinit = ExternalCommand(command=['darcs', 'init'], cwd=drepo)
+        dinit.execute()
+
+        fileA = join(drepo, 'fileA')
+        open(fileA, 'w')
+        dadd = ExternalCommand(command=['darcs', 'add'], cwd=drepo)
+        dadd.execute(fileA)
+
+        drecord = ExternalCommand(command=['darcs', 'record',
+                                           '-a', '-m'], cwd=drepo)
+        drecord.execute('Add A')
+
+        fileB = join(drepo, 'fileB')
+        drename = ExternalCommand(command=['darcs', 'mv'], cwd=drepo)
+        drename.execute(fileA, fileB)
+
+        dremove = ExternalCommand(command=['darcs', 'remove'], cwd=drepo)
+        dremove.execute(fileB)
+
+        drecord.execute('Move A to B and delete B')
+
+        self.tailorize('darcs_rename_delete')
+
+    def testDarcsRenameDeleteDir(self):
+        "Test if darcs to svn fails on moves combined with directory deletes"
+
+        from os import mkdir
+        from os.path import join
+
+        drepo = join(self.TESTDIR, 'rename_delete_dir')
+        mkdir(drepo)
+
+        dinit = ExternalCommand(command=['darcs', 'init'], cwd=drepo)
+        dinit.execute()
+
+        dir = join(drepo, 'dir')
+        mkdir(dir)
+        dadd = ExternalCommand(command=['darcs', 'add'], cwd=drepo)
+        dadd.execute(dir)
+        fileA = join(dir, 'fileA')
+        open(fileA, 'w')
+        dadd.execute(fileA)
+
+        drecord = ExternalCommand(command=['darcs', 'record',
+                                           '-a', '-m'], cwd=drepo)
+        drecord.execute('Add dir and dir/A')
+
+        fileB = join(drepo, 'fileA')
+        drename = ExternalCommand(command=['darcs', 'mv'], cwd=drepo)
+        drename.execute(fileA, fileB)
+
+        dremove = ExternalCommand(command=['darcs', 'remove'], cwd=drepo)
+        dremove.execute(dir)
+
+        drecord.execute('Move dir/A to A and delete dir')
+
+        self.tailorize('darcs_rename_delete_dir')