/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/smart/client.py

  • Committer: Andrew Bennetts
  • Date: 2008-09-08 12:59:00 UTC
  • mfrom: (3695 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3756.
  • Revision ID: andrew.bennetts@canonical.com-20080908125900-8ywtsr7jqyyatjz0
Merge from bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smart/client.py
1
 
# Copyright (C) 2006 Canonical Ltd
 
1
# Copyright (C) 2006-2008 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
 
import urllib
18
 
from urlparse import urlparse
19
 
 
20
 
from bzrlib.smart import protocol
21
 
from bzrlib import urlutils
 
17
import bzrlib
 
18
from bzrlib.smart import message, protocol
 
19
from bzrlib.trace import warning
 
20
from bzrlib import errors
22
21
 
23
22
 
24
23
class _SmartClient(object):
25
24
 
26
 
    def __init__(self, medium, base):
 
25
    def __init__(self, medium, headers=None):
27
26
        """Constructor.
28
27
 
29
28
        :param medium: a SmartClientMedium
30
 
        :param base: a URL
31
29
        """
32
30
        self._medium = medium
33
 
        self._base = base
 
31
        if headers is None:
 
32
            self._headers = {'Software version': bzrlib.__version__}
 
33
        else:
 
34
            self._headers = dict(headers)
 
35
 
 
36
    def _send_request(self, protocol_version, method, args, body=None,
 
37
                      readv_body=None):
 
38
        encoder, response_handler = self._construct_protocol(
 
39
            protocol_version)
 
40
        encoder.set_headers(self._headers)
 
41
        if body is not None:
 
42
            if readv_body is not None:
 
43
                raise AssertionError(
 
44
                    "body and readv_body are mutually exclusive.")
 
45
            encoder.call_with_body_bytes((method, ) + args, body)
 
46
        elif readv_body is not None:
 
47
            encoder.call_with_body_readv_array((method, ) + args,
 
48
                    readv_body)
 
49
        else:
 
50
            encoder.call(method, *args)
 
51
        return response_handler
 
52
 
 
53
    def _call_and_read_response(self, method, args, body=None, readv_body=None,
 
54
            expect_response_body=True):
 
55
        if self._medium._protocol_version is not None:
 
56
            response_handler = self._send_request(
 
57
                self._medium._protocol_version, method, args, body=body,
 
58
                readv_body=readv_body)
 
59
            return (response_handler.read_response_tuple(
 
60
                        expect_body=expect_response_body),
 
61
                    response_handler)
 
62
        else:
 
63
            for protocol_version in [3, 2]:
 
64
                if protocol_version == 2:
 
65
                    # If v3 doesn't work, the remote side is older than 1.6.
 
66
                    self._medium._remember_remote_is_before((1, 6))
 
67
                response_handler = self._send_request(
 
68
                    protocol_version, method, args, body=body,
 
69
                    readv_body=readv_body)
 
70
                try:
 
71
                    response_tuple = response_handler.read_response_tuple(
 
72
                        expect_body=expect_response_body)
 
73
                except errors.UnexpectedProtocolVersionMarker, err:
 
74
                    # TODO: We could recover from this without disconnecting if
 
75
                    # we recognise the protocol version.
 
76
                    warning(
 
77
                        'Server does not understand Bazaar network protocol %d,'
 
78
                        ' reconnecting.  (Upgrade the server to avoid this.)'
 
79
                        % (protocol_version,))
 
80
                    self._medium.disconnect()
 
81
                    continue
 
82
                except errors.ErrorFromSmartServer:
 
83
                    # If we received an error reply from the server, then it
 
84
                    # must be ok with this protocol version.
 
85
                    self._medium._protocol_version = protocol_version
 
86
                    raise
 
87
                else:
 
88
                    self._medium._protocol_version = protocol_version
 
89
                    return response_tuple, response_handler
 
90
            raise errors.SmartProtocolError(
 
91
                'Server is not a Bazaar server: ' + str(err))
 
92
 
 
93
    def _construct_protocol(self, version):
 
94
        request = self._medium.get_request()
 
95
        if version == 3:
 
96
            request_encoder = protocol.ProtocolThreeRequester(request)
 
97
            response_handler = message.ConventionalResponseHandler()
 
98
            response_proto = protocol.ProtocolThreeDecoder(
 
99
                response_handler, expect_version_marker=True)
 
100
            response_handler.setProtoAndMediumRequest(response_proto, request)
 
101
        elif version == 2:
 
102
            request_encoder = protocol.SmartClientRequestProtocolTwo(request)
 
103
            response_handler = request_encoder
 
104
        else:
 
105
            request_encoder = protocol.SmartClientRequestProtocolOne(request)
 
106
            response_handler = request_encoder
 
107
        return request_encoder, response_handler
34
108
 
35
109
    def call(self, method, *args):
36
110
        """Call a method on the remote server."""
46
120
            result, smart_protocol = smart_client.call_expecting_body(...)
47
121
            body = smart_protocol.read_body_bytes()
48
122
        """
49
 
        request = self._medium.get_request()
50
 
        smart_protocol = protocol.SmartClientRequestProtocolTwo(request)
51
 
        smart_protocol.call(method, *args)
52
 
        return smart_protocol.read_response_tuple(expect_body=True), smart_protocol
 
123
        return self._call_and_read_response(
 
124
            method, args, expect_response_body=True)
53
125
 
54
126
    def call_with_body_bytes(self, method, args, body):
55
127
        """Call a method on the remote server with body bytes."""
60
132
                raise TypeError('args must be byte strings, not %r' % (args,))
61
133
        if type(body) is not str:
62
134
            raise TypeError('body must be byte string, not %r' % (body,))
63
 
        request = self._medium.get_request()
64
 
        smart_protocol = protocol.SmartClientRequestProtocolOne(request)
65
 
        smart_protocol.call_with_body_bytes((method, ) + args, body)
66
 
        return smart_protocol.read_response_tuple()
 
135
        response, response_handler = self._call_and_read_response(
 
136
            method, args, body=body, expect_response_body=False)
 
137
        return response
67
138
 
68
139
    def call_with_body_bytes_expecting_body(self, method, args, body):
69
140
        """Call a method on the remote server with body bytes."""
74
145
                raise TypeError('args must be byte strings, not %r' % (args,))
75
146
        if type(body) is not str:
76
147
            raise TypeError('body must be byte string, not %r' % (body,))
77
 
        request = self._medium.get_request()
78
 
        smart_protocol = protocol.SmartClientRequestProtocolTwo(request)
79
 
        smart_protocol.call_with_body_bytes((method, ) + args, body)
80
 
        return smart_protocol.read_response_tuple(expect_body=True), smart_protocol
 
148
        response, response_handler = self._call_and_read_response(
 
149
            method, args, body=body, expect_response_body=True)
 
150
        return (response, response_handler)
 
151
 
 
152
    def call_with_body_readv_array(self, args, body):
 
153
        response, response_handler = self._call_and_read_response(
 
154
                args[0], args[1:], readv_body=body, expect_response_body=True)
 
155
        return (response, response_handler)
81
156
 
82
157
    def remote_path_from_transport(self, transport):
83
158
        """Convert transport into a path suitable for using in a request.
86
161
        anything but path, so it is only safe to use it in requests sent over
87
162
        the medium from the matching transport.
88
163
        """
89
 
        base = self._base
90
 
        if (base.startswith('bzr+http://') or base.startswith('bzr+https://')
91
 
            or base.startswith('http://') or base.startswith('https://')):
92
 
            medium_base = self._base
93
 
        else:
94
 
            medium_base = urlutils.join(self._base, '/')
95
 
            
96
 
        rel_url = urlutils.relative_url(medium_base, transport.base)
97
 
        return urllib.unquote(rel_url)
 
164
        return self._medium.remote_path_from_transport(transport)
 
165