← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

  • Committer: Martin Pool
  • Date: 2007-02-06 06:27:24 UTC
  • mto: This revision was merged to the branch mainline in revision 2283.
  • Revision ID: mbp@sourcefrog.net-20070206062724-a5uo1u27jxsal2t0
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.

Change help for --format to just say 'see help formats'

RepositoryFormat.register_metadir gains an optional parameter for the
module name containing the repository format, and lazily loads from there.

Disable test_interrepository_get_returns_correct_optimiser, because it
seems too brittle.

Remove InterWeaveRepo, these should now just be upgraded.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
592
592
        Weaves are used if this branch's repostory uses weaves.
593
593
        """
594
594
        if isinstance(self.bzrdir, bzrdir.BzrDirPreSplitOut):
595
 
            from bzrlib import repository
 
595
            from bzrlib.repofmt import weaverepo
596
596
            format = bzrdir.BzrDirMetaFormat1()
597
 
            format.repository_format = repository.RepositoryFormat7()
 
597
            format.repository_format = weaverepo.RepositoryFormat7()
598
598
        else:
599
599
            format = self.repository.bzrdir.cloning_metadir()
600
600
        return format