/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/bzrdir.py

  • Committer: Jelmer Vernooij
  • Date: 2011-03-08 00:04:05 UTC
  • mfrom: (5704 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5705.
  • Revision ID: jelmer@samba.org-20110308000405-sgvkkcjm1dz8em4z
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bzrdir.py
1176
1176
    def open_branch(self, name=None, unsupported=False,
1177
1177
                    ignore_fallbacks=False):
1178
1178
        """See BzrDir.open_branch."""
1179
 
        from bzrlib.branch import BzrBranchFormat4
 
1179
        from bzrlib.branch_weave import BzrBranchFormat4
1180
1180
        format = BzrBranchFormat4()
1181
1181
        self._check_supported(format, unsupported)
1182
1182
        return format.open(self, name, _found=True)
1862
1862
        return "Bazaar-NG branch, format 5\n"
1863
1863
 
1864
1864
    def get_branch_format(self):
1865
 
        from bzrlib import branch
1866
 
        return branch.BzrBranchFormat4()
 
1865
        from bzrlib import branch_weave
 
1866
        return branch_weave.BzrBranchFormat4()
1867
1867
 
1868
1868
    def get_format_description(self):
1869
1869
        """See BzrDirFormat.get_format_description()."""
1883
1883
 
1884
1884
        Except when they are being cloned.
1885
1885
        """
1886
 
        from bzrlib.branch import BzrBranchFormat4
 
1886
        from bzrlib.branch_weave import BzrBranchFormat4
1887
1887
        from bzrlib.repofmt.weaverepo import RepositoryFormat5
1888
1888
        result = (super(BzrDirFormat5, self).initialize_on_transport(transport))
1889
1889
        RepositoryFormat5().initialize(result, _internal=True)
1927
1927
        return "All-in-one format 6"
1928
1928
 
1929
1929
    def get_branch_format(self):
1930
 
        from bzrlib import branch
1931
 
        return branch.BzrBranchFormat4()
 
1930
        from bzrlib import branch_weave
 
1931
        return branch_weave.BzrBranchFormat4()
1932
1932
 
1933
1933
    def get_converter(self, format=None):
1934
1934
        """See BzrDirFormat.get_converter()."""
1944
1944
 
1945
1945
        Except when they are being cloned.
1946
1946
        """
1947
 
        from bzrlib.branch import BzrBranchFormat4
 
1947
        from bzrlib.branch_weave import BzrBranchFormat4
1948
1948
        from bzrlib.repofmt.weaverepo import RepositoryFormat6
1949
1949
        result = super(BzrDirFormat6, self).initialize_on_transport(transport)
1950
1950
        RepositoryFormat6().initialize(result, _internal=True)