← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bzrdir.py

  • Committer: Jelmer Vernooij
  • Date: 2012-03-30 18:36:46 UTC
  • mto: This revision was merged to the branch mainline in revision 6535.
  • Revision ID: jelmer@samba.org-20120330183646-azkod5najbuewous
Move BzrBranchFormat5 into a separate file.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bzrdir.py
53
53
    workingtree_3,
54
54
    workingtree_4,
55
55
    )
 
56
from bzrlib.branchfmt import fullhistory as fullhistorybranch
56
57
from bzrlib.repofmt import knitpack_repo
57
58
from bzrlib.transport import (
58
59
    do_catching_redirections,
1811
1812
            old = branch._format.__class__
1812
1813
            new = self.target_format.get_branch_format().__class__
1813
1814
            while old != new:
1814
 
                if (old == _mod_branch.BzrBranchFormat5 and
 
1815
                if (old == fullhistorybranch.BzrBranchFormat5 and
1815
1816
                    new in (_mod_branch.BzrBranchFormat6,
1816
1817
                        _mod_branch.BzrBranchFormat7,
1817
1818
                        _mod_branch.BzrBranchFormat8)):
2113
2114
register_metadir(controldir.format_registry, 'knit',
2114
2115
    'bzrlib.repofmt.knitrepo.RepositoryFormatKnit1',
2115
2116
    'Format using knits.  Recommended for interoperation with bzr <= 0.14.',
2116
 
    branch_format='bzrlib.branch.BzrBranchFormat5',
 
2117
    branch_format='bzrlib.branchfmt.fullhistory.BzrBranchFormat5',
2117
2118
    tree_format='bzrlib.workingtree_3.WorkingTreeFormat3',
2118
2119
    hidden=True,
2119
2120
    deprecated=True)
2122
2123
    help='Format using dirstate for working trees. '
2123
2124
        'Compatible with bzr 0.8 and '
2124
2125
        'above when accessed over the network. Introduced in bzr 0.15.',
2125
 
    branch_format='bzrlib.branch.BzrBranchFormat5',
 
2126
    branch_format='bzrlib.branchfmt.fullhistory.BzrBranchFormat5',
2126
2127
    tree_format='bzrlib.workingtree_4.WorkingTreeFormat4',
2127
2128
    hidden=True,
2128
2129
    deprecated=True)