~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/remote.py

merge hpss-get-checkout-format.

Show diffs side-by-side

added added

removed removed

Lines of Context:
496
496
        return self._real_bzrdir.checkout_metadir()
497
497
 
498
498
    def checkout_metadir(self):
 
499
        """Retrieve the controldir format to use for checkouts of this one.
 
500
        """
499
501
        medium = self._client._medium
500
502
        if medium._is_remote_before((2, 5)):
501
503
            return self._vfs_checkout_metadir()
512
514
        try:
513
515
            format = controldir.network_format_registry.get(control_name)
514
516
        except KeyError:
515
 
            raise errors.UnknownFormatError(kind='control', format=control_name)
 
517
            raise errors.UnknownFormatError(kind='control',
 
518
                format=control_name)
516
519
        if repo_name:
517
520
            try:
518
521
                repo_format = _mod_repository.network_format_registry.get(