[merge] split out repository formats

[Martin Pool]

On  6 Feb 2007, John Arbash Meinel <john at arbash-meinel.com> wrote:
> I would have probably put the base class and the registry in
> bzrlib/repofmt/__init__.py, but this isn't a huge deal.
> 
> ...
> 
> 
> You also didn't mention a few other things that you did. Namely getting
> rid of InterWeaveRepo and changing bzrdir.open_repository() for certain
> formats to create_repository() for all formats.
> 
> I think Robert brought up a reasonable concern about whether you could
> upgrade a Weave to a knit.
> 
> There probably are not many people still using a Weave repo because of
> the warning. But then again has Dapper had an official upgrade to bzr?
> Because 0.8.2 was perfectly ok using Weave formats. And back in Nov I
> know some of the distro people were still using Weaves because they just
> hadn't needed to upgrade yet. (For small projects they work okay).

I've added back InterWeaveRepo and a test that it is found properly.

> So I really like the idea, but I feel your description of what is going
> on is incomplete, and I'm not sure if I've missed something in the large
> patch.

OK so here's an updated version.  

On considering your comments about old clients I have put the old
formats into lazy_import so that they can still be found by old code.
(This possibly makes some of the other changes unnecessary...)

Since the lazy_imports are somewhat more tolerant of circular
dependencies they make some of these changes easier...

Some things get more documentation.

register_metadir previously took a string parameter 'repo' being the
repository format class name.  It now also takes repo_module saying from
where it should be loaded, and gives a better message if this fails.

Repository._serializer is now set from the constructor so it can be
lazily loaded.

Trimmed some unnecessary imports.

RepositoryFormatRegistry can contain either Format instances, or
callables (such as classes) that can be used to construct an instance.
That accomodates callers who were previously registering instances,
while making it follow the general pattern of registering factories,
which also makes it easier to lazily construct them.   You can now more
usefully call repository.format_registry.register_lazy, and I do.

Add default RepositoryFormat.__eq__ method that assumes they're
stateless and so just compares classes.

InterRepository._matching_repo_format changed to a class method
_get_repo_format_to_test for clarity and flexibility.

Disabled an apparently wrong test for interrepo:

=== modified file bzrlib/tests/interrepository_implementations/test_interreposi
... tory.py // last-changed:mbp at sourcefrog.net-20070206062724-a5uo1u27jxsal2t0
--- bzrlib/tests/interrepository_implementations/test_interrepository.py
+++ bzrlib/tests/interrepository_implementations/test_interrepository.py
@@ -103,10 +103,16 @@
         # we assume the optimising code paths are triggered
         # by the type of the repo not the transport - at this point.
         # we may need to update this test if this changes.
-        source_repo = self.make_repository("source")
-        target_repo = self.make_to_repository("target")
-        interrepo = repository.InterRepository.get(source_repo, target_repo)
-        self.assertEqual(self.interrepo_class, interrepo.__class__)
+        #
+        # XXX: This code tests that we get an InterRepository when we try to
+        # convert between the two repositories that it wants to be tested with
+        # -- but that's not necessarily correct.  So for now this is disabled.
+        # mbp 20070206
+        ## source_repo = self.make_repository("source")
+        ## target_repo = self.make_to_repository("target")
+        ## interrepo = repository.InterRepository.get(source_repo, target_repo)
+        ## self.assertEqual(self.interrepo_class, interrepo.__class__)
+        pass
 

-- 
Martin
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 20070212-repoformats.diff
Type: text/x-diff
Size: 332513 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070212/04c5c684/attachment-0001.bin