← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/smart/client.py

  • Committer: Andrew Bennetts
  • Date: 2008-03-17 17:16:11 UTC
  • mfrom: (3290 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3756.
  • Revision ID: andrew.bennetts@canonical.com-20080317171611-o9wdrnf0m7qwo198
Merge from bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smart/client.py
87
87
        anything but path, so it is only safe to use it in requests sent over
88
88
        the medium from the matching transport.
89
89
        """
90
 
        if self._shared_connection.base.startswith('bzr+http://'):
 
90
        base = self._shared_connection.base
 
91
        if base.startswith('bzr+http://') or base.startswith('bzr+https://'):
91
92
            medium_base = self._shared_connection.base
92
93
        else:
93
94
            medium_base = urlutils.join(self._shared_connection.base, '/')