← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

(jelmer) Simplify handling of server probing. (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
181
181
        For instance, if the branch is at URL/.bzr/branch,
182
182
        Branch.open(URL) -> a Branch instance.
183
183
        """
184
 
        control = controldir.ControlDir.open(base, _unsupported,
185
 
                                     possible_transports=possible_transports)
 
184
        control = controldir.ControlDir.open(base,
 
185
            possible_transports=possible_transports, _unsupported=_unsupported)
186
186
        return control.open_branch(unsupported=_unsupported,
187
187
            possible_transports=possible_transports)
188
188
 
3024
3024
                                                config=conf)
3025
3025
        if stacked_url is None:
3026
3026
            raise errors.NotStacked(self)
3027
 
        return stacked_url
 
3027
        return stacked_url.encode('utf-8')
3028
3028
 
3029
3029
    @needs_read_lock
3030
3030
    def get_rev_id(self, revno, history=None):