← 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-04-16 11:08:11 UTC
  • mfrom: (6521 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6522.
  • Revision ID: jelmer@samba.org-20120416110811-0y996ihqy9o2bb1t
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bzrdir.py
465
465
                    stacked=stacked)
466
466
        return result
467
467
 
468
 
    @deprecated_method(deprecated_in((2, 3, 0)))
469
 
    def generate_backup_name(self, base):
470
 
        return self._available_backup_name(base)
471
 
 
472
468
    def _available_backup_name(self, base):
473
469
        """Find a non-existing backup file name based on base.
474
470
 
1234
1230
    """The known .bzr formats."""
1235
1231
 
1236
1232
    @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
1233
    def probe_transport(klass, transport):
1248
1234
        """Return the .bzrdir style format present in a directory."""
1249
1235
        try:
1370
1356
        :param shared_repo: Control whether made repositories are shared or
1371
1357
            not.
1372
1358
        :param vfs_only: If True do not attempt to use a smart server
1373
 
        :return: repo, bzrdir, require_stacking, repository_policy. repo is
 
1359
        :return: repo, controldir, require_stacking, repository_policy. repo is
1374
1360
            None if none was created or found, bzrdir is always valid.
1375
1361
            require_stacking is the result of examining the stacked_on
1376
1362
            parameter and any stacking policy found for the target.