← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/plugins/weave_fmt/branch.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-03-12 00:01:34 UTC
  • mfrom: (5582.10.97 weave-plugin)
  • Revision ID: pqm@pqm.ubuntu.com-20110312000134-exy10w8ctjs8tpiu
Tags: upstream-2.4.0~beta1~bzr5718
(jelmer) Add Prober.known_formats() in favour of
 BzrDirFormat.register_format() and ControlDirFormat.register_format().
 (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugins/weave_fmt/branch.py
34
34
    def _get_checkout_format(self):
35
35
        """Return the most suitable metadir for a checkout of this branch.
36
36
        """
37
 
        from bzrlib.repofmt.weaverepo import RepositoryFormat7
 
37
        from bzrlib.plugins.weave_fmt.repository import RepositoryFormat7
38
38
        from bzrlib.bzrdir import BzrDirMetaFormat1
39
39
        format = BzrDirMetaFormat1()
40
40
        format.repository_format = RepositoryFormat7()
91
91
 
92
92
    def __init__(self):
93
93
        super(BzrBranchFormat4, self).__init__()
94
 
        from bzrlib.bzrdir_weave import (
95
 
            BzrDirFormat4, BzrDirFormat5, BzrDirFormat6)
 
94
        from bzrlib.plugins.weave_fmt.bzrdir import (
 
95
            BzrDirFormat4, BzrDirFormat5, BzrDirFormat6,
 
96
            )
96
97
        self._matchingbzrdir = BzrDirFormat6()
97
98
        self._compatible_bzrdirs = [BzrDirFormat4, BzrDirFormat5,
98
99
            BzrDirFormat6]