~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/transport_util.py

  • Committer: Patch Queue Manager
  • Date: 2011-10-09 13:52:06 UTC
  • mfrom: (6202.1.3 revno-revision)
  • Revision ID: pqm@pqm.ubuntu.com-20111009135206-t3utsln6mtzv9eut
(jelmer) Add a --revision argument to 'bzr revno'. (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
77
77
            fake_base, _from_transport=_from_transport)
78
78
        # The following is needed to minimize the effects of our trick above
79
79
        # while retaining the best compatibility.
80
 
        self._scheme = _hooked_scheme
81
 
        base = self._unsplit_url(self._scheme,
82
 
                                 self._user, self._password,
83
 
                                 self._host, self._port,
84
 
                                 self._path)
85
 
        super(ConnectedTransport, self).__init__(base)
 
80
        self._parsed_url.scheme = _hooked_scheme
 
81
        super(ConnectedTransport, self).__init__(str(self._parsed_url))
86
82
 
87
83
 
88
84
class ConnectionHookedTransport(InstrumentedTransport):
112
108
        # standard test support code will work and permit the server url
113
109
        # correctly.
114
110
        url = self.get_url()
115
 
        t = transport.get_transport(url)
 
111
        t = transport.get_transport_from_url(url)
116
112
        if t.base.endswith('work/'):
117
113
            t = t.clone('../..')
118
114
        self.permit_url(t.base)