← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bzrdir.py

  • Committer: Vincent Ladeuil
  • Date: 2012-08-01 09:27:40 UTC
  • mfrom: (6437.63.4 2.5)
  • mto: This revision was merged to the branch mainline in revision 6549.
  • Revision ID: v.ladeuil+lp@free.fr-20120801092740-rhcwpdylg14ojvrq
Merge 2.5 including fix for bug #957049

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,
465
466
                    stacked=stacked)
466
467
        return result
467
468
 
468
 
    @deprecated_method(deprecated_in((2, 3, 0)))
469
 
    def generate_backup_name(self, base):
470
 
        return self._available_backup_name(base)
471
 
 
472
469
    def _available_backup_name(self, base):
473
470
        """Find a non-existing backup file name based on base.
474
471
 
1234
1231
    """The known .bzr formats."""
1235
1232
 
1236
1233
    @classmethod
1237
 
    @deprecated_method(deprecated_in((2, 4, 0)))
1238
 
    def register_bzrdir_format(klass, format):
1239
 
        klass.formats.register(format.get_format_string(), format)
1240
 
 
1241
 
    @classmethod
1242
 
    @deprecated_method(deprecated_in((2, 4, 0)))
1243
 
    def unregister_bzrdir_format(klass, format):
1244
 
        klass.formats.remove(format.get_format_string())
1245
 
 
1246
 
    @classmethod
1247
1234
    def probe_transport(klass, transport):
1248
1235
        """Return the .bzrdir style format present in a directory."""
1249
1236
        try:
1370
1357
        :param shared_repo: Control whether made repositories are shared or
1371
1358
            not.
1372
1359
        :param vfs_only: If True do not attempt to use a smart server
1373
 
        :return: repo, bzrdir, require_stacking, repository_policy. repo is
 
1360
        :return: repo, controldir, require_stacking, repository_policy. repo is
1374
1361
            None if none was created or found, bzrdir is always valid.
1375
1362
            require_stacking is the result of examining the stacked_on
1376
1363
            parameter and any stacking policy found for the target.
1825
1812
            old = branch._format.__class__
1826
1813
            new = self.target_format.get_branch_format().__class__
1827
1814
            while old != new:
1828
 
                if (old == _mod_branch.BzrBranchFormat5 and
 
1815
                if (old == fullhistorybranch.BzrBranchFormat5 and
1829
1816
                    new in (_mod_branch.BzrBranchFormat6,
1830
1817
                        _mod_branch.BzrBranchFormat7,
1831
1818
                        _mod_branch.BzrBranchFormat8)):
2127
2114
register_metadir(controldir.format_registry, 'knit',
2128
2115
    'bzrlib.repofmt.knitrepo.RepositoryFormatKnit1',
2129
2116
    'Format using knits.  Recommended for interoperation with bzr <= 0.14.',
2130
 
    branch_format='bzrlib.branch.BzrBranchFormat5',
 
2117
    branch_format='bzrlib.branchfmt.fullhistory.BzrBranchFormat5',
2131
2118
    tree_format='bzrlib.workingtree_3.WorkingTreeFormat3',
2132
2119
    hidden=True,
2133
2120
    deprecated=True)
2136
2123
    help='Format using dirstate for working trees. '
2137
2124
        'Compatible with bzr 0.8 and '
2138
2125
        'above when accessed over the network. Introduced in bzr 0.15.',
2139
 
    branch_format='bzrlib.branch.BzrBranchFormat5',
 
2126
    branch_format='bzrlib.branchfmt.fullhistory.BzrBranchFormat5',
2140
2127
    tree_format='bzrlib.workingtree_4.WorkingTreeFormat4',
2141
2128
    hidden=True,
2142
2129
    deprecated=True)