← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/remote.py

(gz) Remove bzrlib/util/elementtree/ package (Martin Packman)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/remote.py
20
20
imported from bzrlib.smart.
21
21
"""
22
22
 
 
23
from __future__ import absolute_import
 
24
 
23
25
__all__ = ['RemoteTransport', 'RemoteTCPTransport', 'RemoteSSHTransport']
24
26
 
25
27
from cStringIO import StringIO
170
172
 
171
173
    def _remote_path(self, relpath):
172
174
        """Returns the Unicode version of the absolute path for relpath."""
173
 
        return self._combine_paths(self._path, relpath)
 
175
        return urlutils.URL._combine_paths(self._parsed_url.path, relpath)
174
176
 
175
177
    def _call(self, method, *args):
176
178
        resp = self._call2(method, *args)
483
485
 
484
486
    def _build_medium(self):
485
487
        client_medium = medium.SmartTCPClientMedium(
486
 
            self._host, self._port, self.base)
 
488
            self._parsed_url.host, self._parsed_url.port, self.base)
487
489
        return client_medium, None
488
490
 
489
491
 
496
498
 
497
499
    def _build_medium(self):
498
500
        client_medium = medium.SmartTCPClientMedium(
499
 
            self._host, self._port, self.base)
 
501
            self._parsed_url.host, self._parsed_url.port, self.base)
500
502
        client_medium._protocol_version = 2
501
503
        client_medium._remember_remote_is_before((1, 6))
502
504
        return client_medium, None
512
514
    def _build_medium(self):
513
515
        location_config = config.LocationConfig(self.base)
514
516
        bzr_remote_path = location_config.get_bzr_remote_path()
515
 
        user = self._user
 
517
        user = self._parsed_url.user
516
518
        if user is None:
517
519
            auth = config.AuthenticationConfig()
518
 
            user = auth.get_user('ssh', self._host, self._port)
519
 
        ssh_params = medium.SSHParams(self._host, self._port, user,
520
 
            self._password, bzr_remote_path)
 
520
            user = auth.get_user('ssh', self._parsed_url.host,
 
521
                self._parsed_url.port)
 
522
        ssh_params = medium.SSHParams(self._parsed_url.host,
 
523
                self._parsed_url.port, user, self._parsed_url.password,
 
524
                bzr_remote_path)
521
525
        client_medium = medium.SmartSSHClientMedium(self.base, ssh_params)
522
 
        return client_medium, (user, self._password)
 
526
        return client_medium, (user, self._parsed_url.password)
523
527
 
524
528
 
525
529
class RemoteHTTPTransport(RemoteTransport):
539
543
            # url only for an intial construction (when the url came from the
540
544
            # command-line).
541
545
            http_url = base[len('bzr+'):]
542
 
            self._http_transport = transport.get_transport(http_url)
 
546
            self._http_transport = transport.get_transport_from_url(http_url)
543
547
        else:
544
548
            self._http_transport = http_transport
545
549
        super(RemoteHTTPTransport, self).__init__(