← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bzrdir.py

  • Committer: Ross Lagerwall
  • Date: 2012-08-07 06:32:51 UTC
  • mto: (6437.63.5 2.5)
  • mto: This revision was merged to the branch mainline in revision 6558.
  • Revision ID: rosslagerwall@gmail.com-20120807063251-x9p03ghg2ws8oqjc
Add bzrlib/locale to .bzrignore

bzrlib/locale is generated with ./setup.py build_mo which is in turn called
by ./setup.py build

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