/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/bzrdir.py

Merge cleanup into shell-like-tests

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bzrdir.py
1827
1827
    def probe_transport(klass, transport):
1828
1828
        """Return the .bzrdir style format present in a directory."""
1829
1829
        try:
1830
 
            format_string = transport.get(".bzr/branch-format").read()
 
1830
            format_string = transport.get_bytes(".bzr/branch-format")
1831
1831
        except errors.NoSuchFile:
1832
1832
            raise errors.NotBranchError(path=transport.base)
1833
1833
 
3111
3111
        self._network_name = None
3112
3112
 
3113
3113
    def get_format_description(self):
 
3114
        if self._network_name:
 
3115
            real_format = network_format_registry.get(self._network_name)
 
3116
            return 'Remote: ' + real_format.get_format_description()
3114
3117
        return 'bzr remote bzrdir'
3115
3118
 
3116
3119
    def get_format_string(self):