← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bzrdir.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-03-07 17:52:19 UTC
  • mfrom: (5697.2.2 weave-branch)
  • Revision ID: pqm@pqm.ubuntu.com-20110307175219-4wuflxgl4hfzivom
(jelmer) Move weave-era branch formats to bzrlib.branch_weave.
 (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bzrdir.py
1137
1137
    def open_branch(self, name=None, unsupported=False,
1138
1138
                    ignore_fallbacks=False):
1139
1139
        """See BzrDir.open_branch."""
1140
 
        from bzrlib.branch import BzrBranchFormat4
 
1140
        from bzrlib.branch_weave import BzrBranchFormat4
1141
1141
        format = BzrBranchFormat4()
1142
1142
        self._check_supported(format, unsupported)
1143
1143
        return format.open(self, name, _found=True)
1823
1823
        return "Bazaar-NG branch, format 5\n"
1824
1824
 
1825
1825
    def get_branch_format(self):
1826
 
        from bzrlib import branch
1827
 
        return branch.BzrBranchFormat4()
 
1826
        from bzrlib import branch_weave
 
1827
        return branch_weave.BzrBranchFormat4()
1828
1828
 
1829
1829
    def get_format_description(self):
1830
1830
        """See BzrDirFormat.get_format_description()."""
1844
1844
 
1845
1845
        Except when they are being cloned.
1846
1846
        """
1847
 
        from bzrlib.branch import BzrBranchFormat4
 
1847
        from bzrlib.branch_weave import BzrBranchFormat4
1848
1848
        from bzrlib.repofmt.weaverepo import RepositoryFormat5
1849
1849
        result = (super(BzrDirFormat5, self).initialize_on_transport(transport))
1850
1850
        RepositoryFormat5().initialize(result, _internal=True)
1888
1888
        return "All-in-one format 6"
1889
1889
 
1890
1890
    def get_branch_format(self):
1891
 
        from bzrlib import branch
1892
 
        return branch.BzrBranchFormat4()
 
1891
        from bzrlib import branch_weave
 
1892
        return branch_weave.BzrBranchFormat4()
1893
1893
 
1894
1894
    def get_converter(self, format=None):
1895
1895
        """See BzrDirFormat.get_converter()."""
1905
1905
 
1906
1906
        Except when they are being cloned.
1907
1907
        """
1908
 
        from bzrlib.branch import BzrBranchFormat4
 
1908
        from bzrlib.branch_weave import BzrBranchFormat4
1909
1909
        from bzrlib.repofmt.weaverepo import RepositoryFormat6
1910
1910
        result = super(BzrDirFormat6, self).initialize_on_transport(transport)
1911
1911
        RepositoryFormat6().initialize(result, _internal=True)