Rev 2254: Re-register InterWeaveRepo, fix test integration, add test for it in file:///home/mbp/bzr/Work/repoformats/

[Martin Pool]

------------------------------------------------------------
revno: 2254
revision-id: mbp at sourcefrog.net-20070212050955-ctczxopwvmco8rv0
parent: mbp at sourcefrog.net-20070212042128-tad5xv28x4zubo5s
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: repoformats
timestamp: Mon 2007-02-12 16:09:55 +1100
message:
  Re-register InterWeaveRepo, fix test integration, add test for it
modified:
  bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
  bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
=== modified file 'bzrlib/repository.py'
--- a/bzrlib/repository.py	2007-02-12 04:21:28 +0000
+++ b/bzrlib/repository.py	2007-02-12 05:09:55 +0000
@@ -1227,7 +1227,7 @@
 class InterWeaveRepo(InterSameDataRepository):
     """Optimised code paths between Weave based repositories."""
 
-
+    @classmethod
     def _get_repo_format_to_test(self):
         from bzrlib.repofmt import weaverepo
         return weaverepo.RepositoryFormat7()
@@ -1500,6 +1500,7 @@
 
 
 InterRepository.register_optimiser(InterSameDataRepository)
+InterRepository.register_optimiser(InterWeaveRepo)
 InterRepository.register_optimiser(InterKnitRepo)
 InterRepository.register_optimiser(InterModel1and2)
 InterRepository.register_optimiser(InterKnit1and2)

=== modified file 'bzrlib/tests/test_repository.py'
--- a/bzrlib/tests/test_repository.py	2007-02-07 09:11:31 +0000
+++ b/bzrlib/tests/test_repository.py	2007-02-12 05:09:55 +0000
@@ -394,6 +394,16 @@
         # now we should get the default InterRepository object again.
         self.assertGetsDefaultInterRepository(dummy_a, dummy_b)
 
+    def test_interweave_registered(self):
+        # optimized conversion between weave repos is (still) present
+        t = self.get_transport()
+        t.mkdir('r1')
+        t.mkdir('r2')
+        r1 = bzrdir.BzrDirFormat6().initialize('r1')
+        r2 = bzrdir.BzrDirFormat6().initialize('r2')
+        inter_repo = repository.InterRepository.get(r1.open_repository(), 
+                r2.open_repository())
+        self.assertIsInstance(inter_repo, repository.InterWeaveRepo)
 
 class TestRepositoryConverter(TestCaseWithTransport):