← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/remote.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2008-04-01 02:16:14 UTC
  • mfrom: (3313.2.4 _SmartClient-takes-medium)
  • Revision ID: pqm@pqm.ubuntu.com-20080401021614-ec34l5pd7xp7bkku
Deprecate get_shared_medium,
        and pass medium & base directly into _SmartClient. (Andrew Bennetts)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/remote.py
62
62
        self._real_bzrdir = None
63
63
 
64
64
        if _client is None:
65
 
            self._shared_medium = transport.get_shared_medium()
66
 
            self._client = client._SmartClient(self._shared_medium)
 
65
            medium = transport.get_smart_medium()
 
66
            self._client = client._SmartClient(medium, transport.base)
67
67
        else:
68
68
            self._client = _client
69
 
            self._shared_medium = None
70
69
            return
71
70
 
72
71
        path = self._path_for_remote_call(self._client)
277
276
            self._real_repository = None
278
277
        self.bzrdir = remote_bzrdir
279
278
        if _client is None:
280
 
            self._client = client._SmartClient(self.bzrdir._shared_medium)
 
279
            self._client = remote_bzrdir._client
281
280
        else:
282
281
            self._client = _client
283
282
        self._format = format
836
835
 
837
836
    def _get_parent_map(self, keys):
838
837
        """Helper for get_parent_map that performs the RPC."""
839
 
        medium = self._client.get_smart_medium()
 
838
        medium = self._client._medium
840
839
        if not medium._remote_is_at_least_1_2:
841
840
            # We already found out that the server can't understand
842
841
            # Repository.get_parent_map requests, so just fetch the whole
1055
1054
        return self._real_repository.has_signature_for_revision_id(revision_id)
1056
1055
 
1057
1056
    def get_data_stream_for_search(self, search):
1058
 
        medium = self._client.get_smart_medium()
 
1057
        medium = self._client._medium
1059
1058
        if not medium._remote_is_at_least_1_2:
1060
1059
            self._ensure_real()
1061
1060
            return self._real_repository.get_data_stream_for_search(search)
1229
1228
        if _client is not None:
1230
1229
            self._client = _client
1231
1230
        else:
1232
 
            self._client = client._SmartClient(self.bzrdir._shared_medium)
 
1231
            self._client = remote_bzrdir._client
1233
1232
        self.repository = remote_repository
1234
1233
        if real_branch is not None:
1235
1234
            self._real_branch = real_branch