Rev 498: Add conversion checks. in file:///data/jelmer/bzr-svn/0.4/

[Jelmer Vernooij]

At file:///data/jelmer/bzr-svn/0.4/

------------------------------------------------------------
revno: 498
revision-id: jelmer at samba.org-20070624233340-fyypx48cco4esw6h
parent: jelmer at samba.org-20070624232120-rpsynq9yhsyrn4q5
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Mon 2007-06-25 01:33:40 +0200
message:
  Add conversion checks.
modified:
  format.py                      format.py-20060406233823-b6fa009fe35dfde7
  repository.py                  repository.py-20060306123302-1f8c5069b3fe0265
  tests/test_repos.py            test_repos.py-20060508151940-ddc49a59257ca712
=== modified file 'format.py'
--- a/format.py	2007-06-24 23:19:37 +0000
+++ b/format.py	2007-06-24 23:33:40 +0000
@@ -170,6 +170,8 @@
 
     def __init__(self):
         super(SvnFormat, self).__init__()
+        from repository import SvnRepositoryFormat
+        self.repository_format = SvnRepositoryFormat()
 
     @classmethod
     def probe_transport(klass, transport):

=== modified file 'repository.py'
--- a/repository.py	2007-06-24 20:13:54 +0000
+++ b/repository.py	2007-06-24 23:33:40 +0000
@@ -148,8 +148,6 @@
 
     def __init__(self):
         super(SvnRepositoryFormat, self).__init__()
-        from format import SvnFormat
-        self._matchingbzrdir = SvnFormat()
 
     def get_format_description(self):
         return "Subversion Repository"
@@ -158,6 +156,9 @@
         """Svn repositories cannot be created (yet)."""
         raise UninitializableFormat(self)
 
+    def check_conversion_target(self, target_repo_format):
+        return target_repo_format.rich_root_data
+
 cachedbs = {}
 
 class SvnRepository(Repository):

=== modified file 'tests/test_repos.py'
--- a/tests/test_repos.py	2007-06-24 21:43:28 +0000
+++ b/tests/test_repos.py	2007-06-24 23:33:40 +0000
@@ -17,7 +17,7 @@
 """Subversion repository tests."""
 
 from bzrlib.branch import Branch
-from bzrlib.bzrdir import BzrDir
+from bzrlib.bzrdir import BzrDir, format_registry
 from bzrlib.errors import NoSuchRevision, UninitializableFormat, BzrError
 from bzrlib.inventory import Inventory
 from bzrlib.repository import Repository
@@ -1054,6 +1054,18 @@
         self.assertEqual("Subversion Repository", 
                          self.format.get_format_description())
 
+    def test_conversion_target_self(self):
+        self.assertTrue(self.format.check_conversion_target(self.format))
+
+    def test_conversion_target_incompatible(self):
+        self.assertFalse(self.format.check_conversion_target(
+              format_registry.make_bzrdir('weave').repository_format))
+
+    def test_conversion_target_compatible(self):
+        self.assertTrue(self.format.check_conversion_target(
+          format_registry.make_bzrdir('dirstate-with-subtree').repository_format))
+
+
 class MetadataMarshallerTests(TestCase):
     def test_generate_revision_metadata_none(self):
         self.assertEquals("",