← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/transport_util.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-08-17 18:13:57 UTC
  • mfrom: (5268.7.29 transport-segments)
  • Revision ID: pqm@pqm.ubuntu.com-20110817181357-y5q5eth1hk8bl3om
(jelmer) Allow specifying the colocated branch to use in the branch URL,
 and retrieving the branch name using ControlDir._get_selected_branch.
 (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/transport_util.py
78
78
        # The following is needed to minimize the effects of our trick above
79
79
        # while retaining the best compatibility.
80
80
        self._parsed_url.scheme = _hooked_scheme
81
 
        base = self._unsplit_url(self._parsed_url.scheme,
82
 
                                 self._parsed_url.user,
83
 
                                 self._parsed_url.password,
84
 
                                 self._parsed_url.host, self._parsed_url.port,
85
 
                                 self._parsed_url.path)
86
 
        super(ConnectedTransport, self).__init__(base)
 
81
        super(ConnectedTransport, self).__init__(str(self._parsed_url))
87
82
 
88
83
 
89
84
class ConnectionHookedTransport(InstrumentedTransport):