/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/remote.py

  • Committer: Andrew Bennetts
  • Date: 2008-04-07 10:34:57 UTC
  • mfrom: (3344 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3349.
  • Revision ID: andrew.bennetts@canonical.com-20080407103457-ro4t95pd3imwt0zw
Merge from bzr.dev.

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)
275
274
            self._real_repository = None
276
275
        self.bzrdir = remote_bzrdir
277
276
        if _client is None:
278
 
            self._client = client._SmartClient(self.bzrdir._shared_medium)
 
277
            self._client = remote_bzrdir._client
279
278
        else:
280
279
            self._client = _client
281
280
        self._format = format
359
358
        self._ensure_real()
360
359
        return self._real_repository._generate_text_key_index()
361
360
 
 
361
    @symbol_versioning.deprecated_method(symbol_versioning.one_four)
362
362
    def get_revision_graph(self, revision_id=None):
363
363
        """See Repository.get_revision_graph()."""
 
364
        return self._get_revision_graph(revision_id)
 
365
 
 
366
    def _get_revision_graph(self, revision_id):
 
367
        """Private method for using with old (< 1.2) servers to fallback."""
364
368
        if revision_id is None:
365
369
            revision_id = ''
366
370
        elif revision.is_null(revision_id):
809
813
 
810
814
    def _get_parent_map(self, keys):
811
815
        """Helper for get_parent_map that performs the RPC."""
812
 
        medium = self._client.get_smart_medium()
 
816
        medium = self._client._medium
813
817
        if not medium._remote_is_at_least_1_2:
814
818
            # We already found out that the server can't understand
815
819
            # Repository.get_parent_map requests, so just fetch the whole
816
820
            # graph.
 
821
            # XXX: Note that this will issue a deprecation warning. This is ok
 
822
            # :- its because we're working with a deprecated server anyway, and
 
823
            # the user will almost certainly have seen a warning about the
 
824
            # server version already.
817
825
            return self.get_revision_graph()
818
826
 
819
827
        keys = set(keys)
868
876
            # To avoid having to disconnect repeatedly, we keep track of the
869
877
            # fact the server doesn't understand remote methods added in 1.2.
870
878
            medium._remote_is_at_least_1_2 = False
871
 
            return self.get_revision_graph()
 
879
            return self.get_revision_graph(None)
872
880
        if response[0][0] not in ['ok']:
873
881
            response[1].cancel_read_body()
874
882
            raise errors.UnexpectedSmartServerResponse(response[0])
1025
1033
        return self._real_repository.has_signature_for_revision_id(revision_id)
1026
1034
 
1027
1035
    def get_data_stream_for_search(self, search):
1028
 
        medium = self._client.get_smart_medium()
 
1036
        medium = self._client._medium
1029
1037
        if not medium._remote_is_at_least_1_2:
1030
1038
            self._ensure_real()
1031
1039
            return self._real_repository.get_data_stream_for_search(search)
1200
1208
        if _client is not None:
1201
1209
            self._client = _client
1202
1210
        else:
1203
 
            self._client = client._SmartClient(self.bzrdir._shared_medium)
 
1211
            self._client = remote_bzrdir._client
1204
1212
        self.repository = remote_repository
1205
1213
        if real_branch is not None:
1206
1214
            self._real_branch = real_branch