Changeset 1246 in tailor

Timestamp:

08/16/06 02:01:01 (7 years ago)

Author:

lele@…

Hash name:

20060816000101-97f81-ae488fe484c47114e094c9f083fdc70f93151a1d

Message:

Insert add_dir entries at the right place
This is an adaption of a patch by Jeff Licquia <jeff@…>:
instead of appending the ADD entries for the parent directories, place
them at the right place, ie before the entry that triggers the
creation.

Location:

vcpx

Files:

• repository/cvsps.py (modified) (6 diffs)
• tests/tailor.py (modified) (2 diffs)

vcpx/repository/cvsps.py

@@ -296 +296 @@
                                    'revision %s', e.name, e.new_revision)
                     e.action_kind = e.ADDED
-                    addeddirs.extend(self.__createParentCVSDirectories(changeset, e.name))
+                    for dir in self.__createParentCVSDirectories(changeset, e.name):
+                        addeddirs.append((e, dir))
                 elif info.cvs_version == e.new_revision:
                     self.log.debug('skipping "%s" since it is already '
@@ -309 +310 @@
                         deleteddirs.append(entrydir)
                     continue
-            elif e.action_kind == e.ADDED and e.new_revision is None:
-                # This is a new directory entry, there is no need to update it
-                continue
+            elif e.action_kind == e.ADDED:
+                if e.new_revision is None:
+                    # This is a new directory entry, there is no need to update it
+                    continue
+                else:
+                    for dir in self.__createParentCVSDirectories(changeset, e.name):
+                        addeddirs.append((e, dir))
 
             # If this is a directory (CVS does not version directories,
@@ -361 +366 @@
         # added/removed, so that the replayer gets their name.
 
-        for path in addeddirs:
-            entry = changeset.addEntry(path, None)
+        for entry,path in addeddirs:
+            entry = changeset.addEntry(path, None, before=entry)
             entry.action_kind = entry.ADDED
 
@@ -511 +516 @@
         return last
 
-    def _willApplyChangeset(self, changeset, applyable=None):
-        """
-        This gets called just before applying each changeset.
-
-        Since CVS has no "createdir" event, we have to take care
-        of new directories, creating empty-but-reasonable CVS dirs.
-        """
-
-        if UpdatableSourceWorkingDir._willApplyChangeset(self, changeset,
-                                                         applyable):
-            for m in changeset.entries:
-                if m.action_kind == m.ADDED:
-                    self.__createParentCVSDirectories(changeset, m.name)
-
-            return True
-        else:
-            return False
-
     def __createParentCVSDirectories(self, changeset, entry):
         """
@@ -549 +536 @@
         parentcvs = join(self.repository.basedir, path, 'CVS')
         while not exists(parentcvs):
-            tobeadded.insert(0, join(self.repository.basedir, path))
+            tobeadded.insert(0, path)
             if not path:
                 break
@@ -567 +554 @@
             rootf.close()
 
-        for basedir in tobeadded:
+        for toadd in tobeadded:
+            basedir = join(self.repository.basedir, toadd)
             cvsarea = join(basedir, 'CVS')
 

vcpx/tests/tailor.py

@@ -245 +245 @@
 subdir = svn
 
+
+[cvsdirtest]
+target = bzr:cvsdirtest
+start-revision = INITIAL
+root-directory = %(testdir)s/cvsdirtest/cvs2bzr
+source = cvs:cvsdirtest
+subdir = test-work
+
+[cvspsdirtest]
+target = bzr:cvsdirtest
+start-revision = INITIAL
+root-directory = %(testdir)s/cvsdirtest/cvsps2bzr
+source = cvsps:cvsdirtest
+subdir = test-work
+
+[darcsdirtest]
+target = darcs:cvsdirtest
+start-revision = INITIAL
+root-directory = %(testdir)s/cvsdirtest/cvs2darcs
+source = cvs:cvsdirtest
+subdir = test-work
+
+[svndirtest]
+target = svn:cvsdirtest
+start-revision = INITIAL
+root-directory = %(testdir)s/cvsdirtest/cvs2svn
+source = cvs:cvsdirtest
+subdir = test-work
+
+[bzr:cvsdirtest]
+
+[darcs:cvsdirtest]
+
+[cvs:cvsdirtest]
+module = test
+repository = %(testdir)s/cvsdirtest.cvsrepo
+
+[cvsps:cvsdirtest]
+module = test
+repository = %(testdir)s/cvsdirtest.cvsrepo
+
+[svn:cvsdirtest]
+module = test
+repository = file://%(testdir)s/cvsdirtest.svnrepo
+
 '''
 
@@ -509 +554 @@
 
         self.tailorize('darcs_rename_delete_dir')
+
+
+class CvsOrderTest(OperationalTest):
+    """Test problems with improper ordering of adds with new directories."""
+
+    def setUp(self):
+        """Create a CVS repository that has the difficult history."""
+
+        from os import mkdir, getcwd
+        from os.path import join, exists
+
+        super(CvsOrderTest, self).setUp()
+
+        repodir = join(self.TESTDIR, 'cvsdirtest.cvsrepo')
+        basedir = join(self.TESTDIR, 'cvsdirtest')
+
+        if not exists(repodir):
+            cvscmd = ['cvs', '-d', repodir]
+            mkdir(basedir)
+            mkdir(repodir)
+            ExternalCommand(cwd=self.TESTDIR, nolog=True, command=cvscmd).execute(
+                'init')
+
+            startdir = join(basedir, 'start')
+            mkdir(startdir)
+            open(join(startdir, 'foo'), "w").close()
+
+            ExternalCommand(cwd=startdir, nolog=True, command=cvscmd).execute(
+                'import', '-m', 'one', 'test', 'test', 'test1')
+
+            workdir = join(basedir, 'work')
+            ExternalCommand(cwd=startdir, nolog=True, command=cvscmd).execute(
+                'checkout', '-d', workdir, 'test')
+
+            bardir = join(workdir, 'bar')
+            mkdir(bardir)
+            baz = join(bardir, 'baz')
+            open(baz, "w").close()
+
+            ExternalCommand(cwd=workdir, nolog=True, command=cvscmd).execute(
+                'add', bardir, baz)
+            ExternalCommand(cwd=workdir, nolog=True, command=cvscmd).execute(
+                'commit', '-m', 'two')
+
+    def testCvsConvertDirectoryAddToBazaarng(self):
+        """Test that we can handle directory adds in the cvs module to bzr."""
+
+        t = Tailorizer("cvsdirtest", self.config)
+        t()
+
+    def testCvspsConvertDirectoryAddToBazaarng(self):
+        """Test that we can handle directory adds in the cvsps module to bzr."""
+
+        t = Tailorizer("cvspsdirtest", self.config)
+        t()
+
+    def testCvsConvertDirectoryAddToDarcs(self):
+        """Test that we can handle directory adds in the cvs module to darcs."""
+
+        t = Tailorizer("darcsdirtest", self.config)
+        t()
+
+    def testCvsConvertDirectoryAddToSubversion(self):
+        """Test that we can handle directory adds in the cvs module to svn."""
+
+        t = Tailorizer("svndirtest", self.config)
+        t()