~bzr-pqm/bzr/bzr.dev

1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
1
# Copyright (C) 2006 Canonical Ltd
2
#
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
#
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
12
#
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
2018.5.20 by Andrew Bennetts
Move bzrlib/transport/smart/_smart.py to bzrlib/transport/remote.py and rename SmartTransport to RemoteTransport (Robert Collins, Andrew Bennetts)
17
"""RemoteTransport client for the smart-server.
2018.5.19 by Andrew Bennetts
Add docstrings to all the new modules, and a few other places.
18
19
This module shouldn't be accessed directly.  The classes defined here should be
2018.5.21 by Andrew Bennetts
Move bzrlib.transport.smart to bzrlib.smart
20
imported from bzrlib.smart.
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
21
"""
22
2018.5.147 by Andrew Bennetts
Merge rename-SmartTransport branch.
23
__all__ = ['RemoteTransport', 'RemoteTCPTransport', 'RemoteSSHTransport']
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
24
25
from cStringIO import StringIO
26
1910.19.13 by Andrew Bennetts
Address various review comments.
27
from bzrlib import (
1551.18.17 by Aaron Bentley
Introduce bzr_remote_path configuration variable
28
    config,
2655.1.1 by John Arbash Meinel
Add some more hpss logging.
29
    debug,
1910.19.13 by Andrew Bennetts
Address various review comments.
30
    errors,
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
31
    remote,
2655.1.1 by John Arbash Meinel
Add some more hpss logging.
32
    trace,
1910.19.13 by Andrew Bennetts
Address various review comments.
33
    transport,
34
    urlutils,
35
    )
3245.4.37 by Andrew Bennetts
Add test for sending ProtocolThreeResponder.send_error(UnknownSmartMethod(...)).
36
from bzrlib.smart import client, medium
3313.2.3 by Andrew Bennetts
Deprecate Transport.get_shared_medium.
37
from bzrlib.symbol_versioning import (deprecated_method, one_four)
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
38
39
2018.5.19 by Andrew Bennetts
Add docstrings to all the new modules, and a few other places.
40
class _SmartStat(object):
1752.2.48 by Andrew Bennetts
Support stat
41
42
    def __init__(self, size, mode):
43
        self.st_size = size
44
        self.st_mode = mode
45
46
3734.2.3 by Vincent Ladeuil
Don't use multiple inheritance for http smart medium since we
47
class RemoteTransport(transport.ConnectedTransport):
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
48
    """Connection to a smart server.
49
2018.5.4 by Andrew Bennetts
Split smart server VFS logic out into a new file, and start using the command pattern in the SmartServerRequestHandler.
50
    The connection holds references to the medium that can be used to send
51
    requests to the server.
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
52
53
    The connection has a notion of the current directory to which it's
54
    connected; this is incorporated in filenames passed to the server.
55
    
56
    This supports some higher-level RPC operations and can also be treated 
57
    like a Transport to do file-like operations.
58
2018.5.4 by Andrew Bennetts
Split smart server VFS logic out into a new file, and start using the command pattern in the SmartServerRequestHandler.
59
    The connection can be made over a tcp socket, an ssh pipe or a series of
60
    http requests.  There are concrete subclasses for each type:
2018.5.147 by Andrew Bennetts
Merge rename-SmartTransport branch.
61
    RemoteTCPTransport, etc.
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
62
    """
63
2018.5.20 by Andrew Bennetts
Move bzrlib/transport/smart/_smart.py to bzrlib/transport/remote.py and rename SmartTransport to RemoteTransport (Robert Collins, Andrew Bennetts)
64
    # IMPORTANT FOR IMPLEMENTORS: RemoteTransport MUST NOT be given encoding
1910.19.22 by Robert Collins
Rearrange the readv patch to put the serialise offsets method into the correct class, and document the structure of the classes somewhat better to hint to people writing patches where code should go. Also alter the test so that the client and server components are tested in one place preventing possible encoding skew from occuring.
65
    # responsibilities: Put those on SmartClient or similar. This is vital for
66
    # the ability to support multiple versions of the smart protocol over time:
2018.5.20 by Andrew Bennetts
Move bzrlib/transport/smart/_smart.py to bzrlib/transport/remote.py and rename SmartTransport to RemoteTransport (Robert Collins, Andrew Bennetts)
67
    # RemoteTransport is an adapter from the Transport object model to the 
1910.19.22 by Robert Collins
Rearrange the readv patch to put the serialise offsets method into the correct class, and document the structure of the classes somewhat better to hint to people writing patches where code should go. Also alter the test so that the client and server components are tested in one place preventing possible encoding skew from occuring.
68
    # SmartClient model, not an encoder.
69
2485.8.42 by Vincent Ladeuil
Finish (almost) remote refactoring. Test suite passing.
70
    # FIXME: the medium parameter should be private, only the tests requires
71
    # it. It may be even clearer to define a TestRemoteTransport that handles
72
    # the specific cases of providing a _client and/or a _medium, and leave
73
    # RemoteTransport as an abstract class.
2485.8.59 by Vincent Ladeuil
Update from review comments.
74
    def __init__(self, url, _from_transport=None, medium=None, _client=None):
1910.19.11 by Andrew Bennetts
General code cleanup based on review comments and other observations.
75
        """Constructor.
76
2485.8.59 by Vincent Ladeuil
Update from review comments.
77
        :param _from_transport: Another RemoteTransport instance that this
2485.8.26 by Vincent Ladeuil
Finish remote refactoring. Test suite passing.
78
            one is being cloned from.  Attributes such as the medium will
79
            be reused.
80
3431.3.6 by Andrew Bennetts
Update RemoteTransport.__init__ docstring to reflect reality, and disallow passing of both medium and _from_transport.
81
        :param medium: The medium to use for this RemoteTransport.  If None,
82
            the medium from the _from_transport is shared.  If both this
83
            and _from_transport are None, a new medium will be built.
84
            _from_transport and medium cannot both be specified.
2485.8.26 by Vincent Ladeuil
Finish remote refactoring. Test suite passing.
85
2466.2.4 by Andrew Bennetts
Tweaks asked for by Robert.
86
        :param _client: Override the _SmartClient used by this transport.  This
87
            should only be used for testing purposes; normally this is
88
            determined from the medium.
1910.19.11 by Andrew Bennetts
General code cleanup based on review comments and other observations.
89
        """
2485.8.59 by Vincent Ladeuil
Update from review comments.
90
        super(RemoteTransport, self).__init__(url,
91
                                              _from_transport=_from_transport)
2485.8.42 by Vincent Ladeuil
Finish (almost) remote refactoring. Test suite passing.
92
2485.8.54 by Vincent Ladeuil
Refactor medium uses by making a distinction betweem shared and real medium.
93
        # The medium is the connection, except when we need to share it with
94
        # other objects (RemoteBzrDir, RemoteRepository etc). In these cases
95
        # what we want to share is really the shared connection.
96
2485.8.59 by Vincent Ladeuil
Update from review comments.
97
        if _from_transport is None:
98
            # If no _from_transport is specified, we need to intialize the
2485.8.54 by Vincent Ladeuil
Refactor medium uses by making a distinction betweem shared and real medium.
99
            # shared medium.
100
            credentials = None
101
            if medium is None:
102
                medium, credentials = self._build_medium()
2655.1.1 by John Arbash Meinel
Add some more hpss logging.
103
                if 'hpss' in debug.debug_flags:
104
                    trace.mutter('hpss: Built a new medium: %s',
105
                                 medium.__class__.__name__)
106
            self._shared_connection = transport._SharedConnection(medium,
3104.4.1 by Andrew Bennetts
Fix paths sent by bzr+http client to correctly adjust for shared medium.
107
                                                                  credentials,
108
                                                                  self.base)
3431.3.6 by Andrew Bennetts
Update RemoteTransport.__init__ docstring to reflect reality, and disallow passing of both medium and _from_transport.
109
        elif medium is None:
110
            # No medium was specified, so share the medium from the
111
            # _from_transport.
112
            medium = self._shared_connection.connection
3313.2.1 by Andrew Bennetts
Change _SmartClient's API to accept a medium and a base, rather than a _SharedConnection.
113
        else:
3431.3.6 by Andrew Bennetts
Update RemoteTransport.__init__ docstring to reflect reality, and disallow passing of both medium and _from_transport.
114
            raise AssertionError(
115
                "Both _from_transport (%r) and medium (%r) passed to "
116
                "RemoteTransport.__init__, but these parameters are mutally "
117
                "exclusive." % (_from_transport, medium))
2485.8.54 by Vincent Ladeuil
Refactor medium uses by making a distinction betweem shared and real medium.
118
2466.2.2 by Andrew Bennetts
Add tests for RemoteTransport.is_readonly in the style of the other remote object tests.
119
        if _client is None:
3431.3.2 by Andrew Bennetts
Remove 'base' from _SmartClient entirely, now that the medium has it.
120
            self._client = client._SmartClient(medium)
2466.2.2 by Andrew Bennetts
Add tests for RemoteTransport.is_readonly in the style of the other remote object tests.
121
        else:
122
            self._client = _client
1752.2.73 by Andrew Bennetts
Define (and register as bzr+ssh://) SmartSSHTransport, factor out an SSHSubprocess from SFTPSubprocess, and make SmartTransport connect lazily rather than in the constructor.
123
2485.8.54 by Vincent Ladeuil
Refactor medium uses by making a distinction betweem shared and real medium.
124
    def _build_medium(self):
2485.8.59 by Vincent Ladeuil
Update from review comments.
125
        """Create the medium if _from_transport does not provide one.
2485.8.42 by Vincent Ladeuil
Finish (almost) remote refactoring. Test suite passing.
126
127
        The medium is analogous to the connection for ConnectedTransport: it
2485.8.26 by Vincent Ladeuil
Finish remote refactoring. Test suite passing.
128
        allows connection sharing.
1752.2.4 by Martin Pool
Refactor SFTP transport to allow code sharing with SSH.
129
        """
2485.8.54 by Vincent Ladeuil
Refactor medium uses by making a distinction betweem shared and real medium.
130
        # No credentials
131
        return None, None
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
132
133
    def is_readonly(self):
134
        """Smart server transport can do read/write file operations."""
3297.3.3 by Andrew Bennetts
SmartClientRequestProtocol*.read_response_tuple can now raise UnknownSmartMethod. Callers no longer need to do their own ad hoc unknown smart method error detection.
135
        try:
136
            resp = self._call2('Transport.is_readonly')
137
        except errors.UnknownSmartMethod:
2466.2.4 by Andrew Bennetts
Tweaks asked for by Robert.
138
            # XXX: nasty hack: servers before 0.16 don't have a
139
            # 'Transport.is_readonly' verb, so we do what clients before 0.16
140
            # did: assume False.
2466.2.1 by Andrew Bennetts
Fix incompatibility with < 0.16 smart servers.
141
            return False
3297.3.3 by Andrew Bennetts
SmartClientRequestProtocol*.read_response_tuple can now raise UnknownSmartMethod. Callers no longer need to do their own ad hoc unknown smart method error detection.
142
        if resp == ('yes', ):
143
            return True
144
        elif resp == ('no', ):
145
            return False
2018.5.95 by Andrew Bennetts
Add a Transport.is_readonly remote call, let {Branch,Repository}.lock_write remote call return UnlockableTransport, and miscellaneous test fixes.
146
        else:
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
147
            raise errors.UnexpectedSmartServerResponse(resp)
2018.5.95 by Andrew Bennetts
Add a Transport.is_readonly remote call, let {Branch,Repository}.lock_write remote call return UnlockableTransport, and miscellaneous test fixes.
148
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
149
    def get_smart_client(self):
2485.8.42 by Vincent Ladeuil
Finish (almost) remote refactoring. Test suite passing.
150
        return self._get_connection()
2018.2.3 by Andrew Bennetts
Starting factoring out the smart server client "medium" from the protocol.
151
152
    def get_smart_medium(self):
2485.8.42 by Vincent Ladeuil
Finish (almost) remote refactoring. Test suite passing.
153
        return self._get_connection()
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
154
3313.2.3 by Andrew Bennetts
Deprecate Transport.get_shared_medium.
155
    @deprecated_method(one_four)
2485.8.54 by Vincent Ladeuil
Refactor medium uses by making a distinction betweem shared and real medium.
156
    def get_shared_medium(self):
157
        return self._get_shared_connection()
158
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
159
    def _remote_path(self, relpath):
1910.19.14 by Robert Collins
Fix up all tests to pass, remove a couple more deprecated function calls, and break the dependency on sftp for the smart transport.
160
        """Returns the Unicode version of the absolute path for relpath."""
3104.4.2 by Andrew Bennetts
All tests passing.
161
        return self._combine_paths(self._path, relpath)
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
162
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
163
    def _call(self, method, *args):
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
164
        resp = self._call2(method, *args)
165
        self._ensure_ok(resp)
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
166
167
    def _call2(self, method, *args):
168
        """Call a method on the remote server."""
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
169
        try:
170
            return self._client.call(method, *args)
171
        except errors.ErrorFromSmartServer, err:
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
172
            self._translate_error(err)
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
173
174
    def _call_with_body_bytes(self, method, args, body):
175
        """Call a method on the remote server with body bytes."""
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
176
        try:
177
            return self._client.call_with_body_bytes(method, args, body)
178
        except errors.ErrorFromSmartServer, err:
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
179
            self._translate_error(err)
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
180
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
181
    def has(self, relpath):
182
        """Indicate whether a remote file of the given name exists or not.
183
184
        :see: Transport.has()
185
        """
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
186
        resp = self._call2('has', self._remote_path(relpath))
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
187
        if resp == ('yes', ):
188
            return True
189
        elif resp == ('no', ):
190
            return False
191
        else:
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
192
            raise errors.UnexpectedSmartServerResponse(resp)
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
193
1752.2.2 by Martin Pool
SSH get method; more development of framework.
194
    def get(self, relpath):
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
195
        """Return file-like object reading the contents of a remote file.
196
        
1910.19.13 by Andrew Bennetts
Address various review comments.
197
        :see: Transport.get_bytes()/get_file()
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
198
        """
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
199
        return StringIO(self.get_bytes(relpath))
200
201
    def get_bytes(self, relpath):
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
202
        remote = self._remote_path(relpath)
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
203
        try:
204
            resp, response_handler = self._client.call_expecting_body('get', remote)
205
        except errors.ErrorFromSmartServer, err:
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
206
            self._translate_error(err, relpath)
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
207
        if resp != ('ok', ):
3245.4.37 by Andrew Bennetts
Add test for sending ProtocolThreeResponder.send_error(UnknownSmartMethod(...)).
208
            response_handler.cancel_read_body()
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
209
            raise errors.UnexpectedSmartServerResponse(resp)
210
        return response_handler.read_body_bytes()
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
211
1910.19.13 by Andrew Bennetts
Address various review comments.
212
    def _serialise_optional_mode(self, mode):
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
213
        if mode is None:
214
            return ''
215
        else:
216
            return '%d' % mode
217
218
    def mkdir(self, relpath, mode=None):
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
219
        resp = self._call2('mkdir', self._remote_path(relpath),
220
            self._serialise_optional_mode(mode))
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
221
2671.3.9 by Robert Collins
Review feedback and fix VFat emulated transports to not claim to have unix permissions.
222
    def open_write_stream(self, relpath, mode=None):
223
        """See Transport.open_write_stream."""
2671.3.6 by Robert Collins
Review feedback.
224
        self.put_bytes(relpath, "", mode)
225
        result = transport.AppendBasedFileStream(self, relpath)
226
        transport._file_streams[self.abspath(relpath)] = result
227
        return result
2671.3.2 by Robert Collins
Start open_file_stream logic.
228
1910.19.13 by Andrew Bennetts
Address various review comments.
229
    def put_bytes(self, relpath, upload_contents, mode=None):
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
230
        # FIXME: upload_file is probably not safe for non-ascii characters -
231
        # should probably just pass all parameters as length-delimited
232
        # strings?
2018.5.131 by Andrew Bennetts
Be strict about unicode passed to transport.put_{bytes,file} and SmartClient.call_with_body_bytes, fixing part of TestLockableFiles_RemoteLockDir.test_read_write.
233
        if type(upload_contents) is unicode:
234
            # Although not strictly correct, we raise UnicodeEncodeError to be
235
            # compatible with other transports.
236
            raise UnicodeEncodeError(
237
                'undefined', upload_contents, 0, 1,
238
                'put_bytes must be given bytes, not unicode.')
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
239
        resp = self._call_with_body_bytes('put',
1910.19.13 by Andrew Bennetts
Address various review comments.
240
            (self._remote_path(relpath), self._serialise_optional_mode(mode)),
241
            upload_contents)
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
242
        self._ensure_ok(resp)
2745.5.2 by Robert Collins
* ``bzrlib.transport.Transport.put_file`` now returns the number of bytes
243
        return len(upload_contents)
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
244
2017.2.1 by John Arbash Meinel
Implement put_bytes_non_atomic for the smart transport
245
    def put_bytes_non_atomic(self, relpath, bytes, mode=None,
246
                             create_parent_dir=False,
247
                             dir_mode=None):
1910.19.24 by Robert Collins
Touchup method order.
248
        """See Transport.put_bytes_non_atomic."""
249
        # FIXME: no encoding in the transport!
2017.2.1 by John Arbash Meinel
Implement put_bytes_non_atomic for the smart transport
250
        create_parent_str = 'F'
251
        if create_parent_dir:
252
            create_parent_str = 'T'
253
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
254
        resp = self._call_with_body_bytes(
2017.2.1 by John Arbash Meinel
Implement put_bytes_non_atomic for the smart transport
255
            'put_non_atomic',
256
            (self._remote_path(relpath), self._serialise_optional_mode(mode),
257
             create_parent_str, self._serialise_optional_mode(dir_mode)),
258
            bytes)
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
259
        self._ensure_ok(resp)
2017.2.1 by John Arbash Meinel
Implement put_bytes_non_atomic for the smart transport
260
1910.19.24 by Robert Collins
Touchup method order.
261
    def put_file(self, relpath, upload_file, mode=None):
262
        # its not ideal to seek back, but currently put_non_atomic_file depends
263
        # on transports not reading before failing - which is a faulty
264
        # assumption I think - RBC 20060915
265
        pos = upload_file.tell()
266
        try:
267
            return self.put_bytes(relpath, upload_file.read(), mode)
268
        except:
269
            upload_file.seek(pos)
270
            raise
271
272
    def put_file_non_atomic(self, relpath, f, mode=None,
273
                            create_parent_dir=False,
274
                            dir_mode=None):
275
        return self.put_bytes_non_atomic(relpath, f.read(), mode=mode,
276
                                         create_parent_dir=create_parent_dir,
277
                                         dir_mode=dir_mode)
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
278
1910.19.13 by Andrew Bennetts
Address various review comments.
279
    def append_file(self, relpath, from_file, mode=None):
1910.19.14 by Robert Collins
Fix up all tests to pass, remove a couple more deprecated function calls, and break the dependency on sftp for the smart transport.
280
        return self.append_bytes(relpath, from_file.read(), mode)
1910.19.13 by Andrew Bennetts
Address various review comments.
281
        
282
    def append_bytes(self, relpath, bytes, mode=None):
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
283
        resp = self._call_with_body_bytes(
1910.19.13 by Andrew Bennetts
Address various review comments.
284
            'append',
285
            (self._remote_path(relpath), self._serialise_optional_mode(mode)),
286
            bytes)
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
287
        if resp[0] == 'appended':
288
            return int(resp[1])
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
289
        raise errors.UnexpectedSmartServerResponse(resp)
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
290
291
    def delete(self, relpath):
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
292
        resp = self._call2('delete', self._remote_path(relpath))
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
293
        self._ensure_ok(resp)
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
294
2634.1.1 by Robert Collins
(robertc) Reinstate the accidentally backed out external_url patch.
295
    def external_url(self):
296
        """See bzrlib.transport.Transport.external_url."""
297
        # the external path for RemoteTransports is the base
298
        return self.base
299
3183.2.1 by Andrew Bennetts
Set the recommended page size for RemoteTransport to 64k.
300
    def recommended_page_size(self):
301
        """Return the recommended page size for this transport."""
302
        return 64 * 1024
303
        
2745.5.1 by Robert Collins
* New parameter on ``bzrlib.transport.Transport.readv``
304
    def _readv(self, relpath, offsets):
1910.19.17 by John Arbash Meinel
Implement readv() for the SmartServer
305
        if not offsets:
306
            return
307
308
        offsets = list(offsets)
1910.19.20 by John Arbash Meinel
Update the client-side requests, so that we collapse nearby ranges, rather than requesting lots of small chunks
309
310
        sorted_offsets = sorted(offsets)
311
        coalesced = list(self._coalesce_offsets(sorted_offsets,
312
                               limit=self._max_readv_combine,
313
                               fudge_factor=self._bytes_to_read_before_seek))
314
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
315
        try:
316
            result = self._client.call_with_body_readv_array(
317
                ('readv', self._remote_path(relpath),),
318
                [(c.start, c.length) for c in coalesced])
319
            resp, response_handler = result
320
        except errors.ErrorFromSmartServer, err:
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
321
            self._translate_error(err)
1910.19.17 by John Arbash Meinel
Implement readv() for the SmartServer
322
323
        if resp[0] != 'readv':
1910.19.20 by John Arbash Meinel
Update the client-side requests, so that we collapse nearby ranges, rather than requesting lots of small chunks
324
            # This should raise an exception
3245.4.37 by Andrew Bennetts
Add test for sending ProtocolThreeResponder.send_error(UnknownSmartMethod(...)).
325
            response_handler.cancel_read_body()
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
326
            raise errors.UnexpectedSmartServerResponse(resp)
1910.19.20 by John Arbash Meinel
Update the client-side requests, so that we collapse nearby ranges, rather than requesting lots of small chunks
327
3649.5.1 by John Arbash Meinel
Change _StatefulDecoder._in_bytes into a _in_bytes_list
328
        return self._handle_response(offsets, coalesced, response_handler)
329
330
    def _handle_response(self, offsets, coalesced, response_handler):
331
        # turn the list of offsets into a stack
332
        offset_stack = iter(offsets)
333
        cur_offset_and_size = offset_stack.next()
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
334
        # FIXME: this should know how many bytes are needed, for clarity.
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
335
        data = response_handler.read_body_bytes()
1910.19.20 by John Arbash Meinel
Update the client-side requests, so that we collapse nearby ranges, rather than requesting lots of small chunks
336
        # Cache the results, but only until they have been fulfilled
337
        data_map = {}
3649.5.3 by John Arbash Meinel
Don't downsize the data buffer while reading.
338
        data_offset = 0
1910.19.20 by John Arbash Meinel
Update the client-side requests, so that we collapse nearby ranges, rather than requesting lots of small chunks
339
        for c_offset in coalesced:
340
            if len(data) < c_offset.length:
341
                raise errors.ShortReadvError(relpath, c_offset.start,
342
                            c_offset.length, actual=len(data))
343
            for suboffset, subsize in c_offset.ranges:
344
                key = (c_offset.start+suboffset, subsize)
3649.5.3 by John Arbash Meinel
Don't downsize the data buffer while reading.
345
                this_data = data[data_offset+suboffset:
346
                                 data_offset+suboffset+subsize]
347
                # Special case when the data is in-order, rather than packing
348
                # into a map and then back out again. Benchmarking shows that
349
                # this has 100% hit rate, but leave in the data_map work just
350
                # in case.
351
                # TODO: Could we get away with using buffer() to avoid the
352
                #       memory copy?  Callers would need to realize they may
353
                #       not have a real string.
354
                if key == cur_offset_and_size:
355
                    yield cur_offset_and_size[0], this_data
356
                    cur_offset_and_size = offset_stack.next()
357
                else:
358
                    data_map[key] = this_data
359
            data_offset += c_offset.length
1910.19.20 by John Arbash Meinel
Update the client-side requests, so that we collapse nearby ranges, rather than requesting lots of small chunks
360
361
            # Now that we've read some data, see if we can yield anything back
362
            while cur_offset_and_size in data_map:
363
                this_data = data_map.pop(cur_offset_and_size)
364
                yield cur_offset_and_size[0], this_data
365
                cur_offset_and_size = offset_stack.next()
1910.19.17 by John Arbash Meinel
Implement readv() for the SmartServer
366
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
367
    def rename(self, rel_from, rel_to):
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
368
        self._call('rename',
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
369
                   self._remote_path(rel_from),
370
                   self._remote_path(rel_to))
371
372
    def move(self, rel_from, rel_to):
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
373
        self._call('move',
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
374
                   self._remote_path(rel_from),
375
                   self._remote_path(rel_to))
376
377
    def rmdir(self, relpath):
378
        resp = self._call('rmdir', self._remote_path(relpath))
379
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
380
    def _ensure_ok(self, resp):
381
        if resp[0] != 'ok':
382
            raise errors.UnexpectedSmartServerResponse(resp)
383
        
384
    def _translate_error(self, err, orig_path=None):
385
        remote._translate_error(err, path=orig_path)
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
386
387
    def disconnect(self):
2485.8.54 by Vincent Ladeuil
Refactor medium uses by making a distinction betweem shared and real medium.
388
        self.get_smart_medium().disconnect()
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
389
390
    def stat(self, relpath):
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
391
        resp = self._call2('stat', self._remote_path(relpath))
1752.2.48 by Andrew Bennetts
Support stat
392
        if resp[0] == 'stat':
2018.5.19 by Andrew Bennetts
Add docstrings to all the new modules, and a few other places.
393
            return _SmartStat(int(resp[1]), int(resp[2], 8))
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
394
        raise errors.UnexpectedSmartServerResponse(resp)
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
395
396
    ## def lock_read(self, relpath):
397
    ##     """Lock the given file for shared (read) access.
398
    ##     :return: A lock object, which should be passed to Transport.unlock()
399
    ##     """
400
    ##     # The old RemoteBranch ignore lock for reading, so we will
401
    ##     # continue that tradition and return a bogus lock object.
402
    ##     class BogusLock(object):
403
    ##         def __init__(self, path):
404
    ##             self.path = path
405
    ##         def unlock(self):
406
    ##             pass
407
    ##     return BogusLock(relpath)
408
1752.2.42 by Andrew Bennetts
Add list_dir and iter_files_recursive smart transport
409
    def listable(self):
410
        return True
411
412
    def list_dir(self, relpath):
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
413
        resp = self._call2('list_dir', self._remote_path(relpath))
1752.2.42 by Andrew Bennetts
Add list_dir and iter_files_recursive smart transport
414
        if resp[0] == 'names':
1752.2.47 by Andrew Bennetts
Fix SmartTransport.list_dir to return ascii.
415
            return [name.encode('ascii') for name in resp[1:]]
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
416
        raise errors.UnexpectedSmartServerResponse(resp)
1752.2.42 by Andrew Bennetts
Add list_dir and iter_files_recursive smart transport
417
418
    def iter_files_recursive(self):
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
419
        resp = self._call2('iter_files_recursive', self._remote_path(''))
1752.2.42 by Andrew Bennetts
Add list_dir and iter_files_recursive smart transport
420
        if resp[0] == 'names':
421
            return resp[1:]
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
422
        raise errors.UnexpectedSmartServerResponse(resp)
1752.2.42 by Andrew Bennetts
Add list_dir and iter_files_recursive smart transport
423
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
424
2413.2.1 by Andrew Bennetts
Rename Smart.*Transport classes to RemoteTransport, RemoteTCPTransport, etc.
425
class RemoteTCPTransport(RemoteTransport):
2018.2.3 by Andrew Bennetts
Starting factoring out the smart server client "medium" from the protocol.
426
    """Connection to smart server over plain tcp.
427
    
428
    This is essentially just a factory to get 'RemoteTransport(url,
429
        SmartTCPClientMedium).
430
    """
431
2485.8.54 by Vincent Ladeuil
Refactor medium uses by making a distinction betweem shared and real medium.
432
    def _build_medium(self):
3431.3.1 by Andrew Bennetts
First rough cut of a fix for bug #230550, by adding .base to SmartClientMedia rather than relying on other objects to track this accurately while reusing client media.
433
        client_medium = medium.SmartTCPClientMedium(
434
            self._host, self._port, self.base)
435
        return client_medium, None
2413.2.1 by Andrew Bennetts
Rename Smart.*Transport classes to RemoteTransport, RemoteTCPTransport, etc.
436
437
3453.5.1 by Andrew Bennetts
Add {bzrdir,repository,branch}_implementations tests for Remote objects using protocol v2 and pre-1.6 RPCs.
438
class RemoteTCPTransportV2Only(RemoteTransport):
439
    """Connection to smart server over plain tcp with the client hard-coded to
440
    assume protocol v2 and remote server version <= 1.6.
441
442
    This should only be used for testing.
443
    """
444
445
    def _build_medium(self):
446
        client_medium = medium.SmartTCPClientMedium(
447
            self._host, self._port, self.base)
448
        client_medium._protocol_version = 2
3453.5.7 by Andrew Bennetts
Fix error introduced by merge.
449
        client_medium._remember_remote_is_before((1, 6))
3453.5.1 by Andrew Bennetts
Add {bzrdir,repository,branch}_implementations tests for Remote objects using protocol v2 and pre-1.6 RPCs.
450
        return client_medium, None
451
452
2413.2.1 by Andrew Bennetts
Rename Smart.*Transport classes to RemoteTransport, RemoteTCPTransport, etc.
453
class RemoteSSHTransport(RemoteTransport):
2018.2.27 by Andrew Bennetts
Merge from bzr.dev
454
    """Connection to smart server over SSH.
455
456
    This is essentially just a factory to get 'RemoteTransport(url,
457
        SmartSSHClientMedium).
458
    """
459
2485.8.54 by Vincent Ladeuil
Refactor medium uses by making a distinction betweem shared and real medium.
460
    def _build_medium(self):
1551.18.17 by Aaron Bentley
Introduce bzr_remote_path configuration variable
461
        location_config = config.LocationConfig(self.base)
462
        bzr_remote_path = location_config.get_bzr_remote_path()
3777.1.3 by Aaron Bentley
Use SSH default username from authentication.conf
463
        user = self._user
464
        if user is None:
465
            auth = config.AuthenticationConfig()
466
            user = auth.get_user('ssh', self._host, self._port)
3431.3.1 by Andrew Bennetts
First rough cut of a fix for bug #230550, by adding .base to SmartClientMedia rather than relying on other objects to track this accurately while reusing client media.
467
        client_medium = medium.SmartSSHClientMedium(self._host, self._port,
3777.1.3 by Aaron Bentley
Use SSH default username from authentication.conf
468
            user, self._password, self.base,
3431.3.1 by Andrew Bennetts
First rough cut of a fix for bug #230550, by adding .base to SmartClientMedia rather than relying on other objects to track this accurately while reusing client media.
469
            bzr_remote_path=bzr_remote_path)
3777.1.3 by Aaron Bentley
Use SSH default username from authentication.conf
470
        return client_medium, (user, self._password)
2413.2.1 by Andrew Bennetts
Rename Smart.*Transport classes to RemoteTransport, RemoteTCPTransport, etc.
471
472
473
class RemoteHTTPTransport(RemoteTransport):
2190.1.3 by John Arbash Meinel
Implement bzr+http://
474
    """Just a way to connect between a bzr+http:// url and http://.
475
    
2413.2.1 by Andrew Bennetts
Rename Smart.*Transport classes to RemoteTransport, RemoteTCPTransport, etc.
476
    This connection operates slightly differently than the RemoteSSHTransport.
2190.1.3 by John Arbash Meinel
Implement bzr+http://
477
    It uses a plain http:// transport underneath, which defines what remote
478
    .bzr/smart URL we are connected to. From there, all paths that are sent are
479
    sent as relative paths, this way, the remote side can properly
2190.1.5 by John Arbash Meinel
Typo fix from Martin
480
    de-reference them, since it is likely doing rewrite rules to translate an
2190.1.3 by John Arbash Meinel
Implement bzr+http://
481
    HTTP path into a local path.
482
    """
483
2485.8.59 by Vincent Ladeuil
Update from review comments.
484
    def __init__(self, base, _from_transport=None, http_transport=None):
2190.1.3 by John Arbash Meinel
Implement bzr+http://
485
        if http_transport is None:
2485.8.46 by Vincent Ladeuil
Add some remarks about current limitations in connection sharing.
486
            # FIXME: the password may be lost here because it appears in the
487
            # url only for an intial construction (when the url came from the
488
            # command-line).
2485.8.26 by Vincent Ladeuil
Finish remote refactoring. Test suite passing.
489
            http_url = base[len('bzr+'):]
2190.1.3 by John Arbash Meinel
Implement bzr+http://
490
            self._http_transport = transport.get_transport(http_url)
491
        else:
492
            self._http_transport = http_transport
2485.8.59 by Vincent Ladeuil
Update from review comments.
493
        super(RemoteHTTPTransport, self).__init__(
494
            base, _from_transport=_from_transport)
2485.8.26 by Vincent Ladeuil
Finish remote refactoring. Test suite passing.
495
2485.8.54 by Vincent Ladeuil
Refactor medium uses by making a distinction betweem shared and real medium.
496
    def _build_medium(self):
497
        # We let http_transport take care of the credentials
498
        return self._http_transport.get_smart_medium(), None
2190.1.3 by John Arbash Meinel
Implement bzr+http://
499
3104.4.2 by Andrew Bennetts
All tests passing.
500
    def _remote_path(self, relpath):
2485.8.29 by Vincent Ladeuil
Cometic changes (and a typo).
501
        """After connecting, HTTP Transport only deals in relative URLs."""
2208.4.2 by Andrew Bennetts
Always POST to the same .bzr/smart URL for a given branch, even when accessing files in subdirectories.
502
        # Adjust the relpath based on which URL this smart transport is
503
        # connected to.
3104.4.1 by Andrew Bennetts
Fix paths sent by bzr+http client to correctly adjust for shared medium.
504
        http_base = urlutils.normalize_url(self.get_smart_medium().base)
2208.4.2 by Andrew Bennetts
Always POST to the same .bzr/smart URL for a given branch, even when accessing files in subdirectories.
505
        url = urlutils.join(self.base[len('bzr+'):], relpath)
506
        url = urlutils.normalize_url(url)
2485.8.26 by Vincent Ladeuil
Finish remote refactoring. Test suite passing.
507
        return urlutils.relative_url(http_base, url)
2190.1.3 by John Arbash Meinel
Implement bzr+http://
508
509
    def clone(self, relative_url):
2413.2.1 by Andrew Bennetts
Rename Smart.*Transport classes to RemoteTransport, RemoteTCPTransport, etc.
510
        """Make a new RemoteHTTPTransport related to me.
2190.1.3 by John Arbash Meinel
Implement bzr+http://
511
512
        This is re-implemented rather than using the default
2413.2.1 by Andrew Bennetts
Rename Smart.*Transport classes to RemoteTransport, RemoteTCPTransport, etc.
513
        RemoteTransport.clone() because we must be careful about the underlying
2190.1.3 by John Arbash Meinel
Implement bzr+http://
514
        http transport.
2208.4.2 by Andrew Bennetts
Always POST to the same .bzr/smart URL for a given branch, even when accessing files in subdirectories.
515
516
        Also, the cloned smart transport will POST to the same .bzr/smart
517
        location as this transport (although obviously the relative paths in the
518
        smart requests may be different).  This is so that the server doesn't
2208.4.3 by Andrew Bennetts
Let SmartHTTPTransport.clone('..') continue to POST to the cloned URL (unlike clone('child')).
519
        have to handle .bzr/smart requests at arbitrary places inside .bzr
520
        directories, just at the initial URL the user uses.
2190.1.3 by John Arbash Meinel
Implement bzr+http://
521
        """
522
        if relative_url:
523
            abs_url = self.abspath(relative_url)
524
        else:
525
            abs_url = self.base
2485.8.59 by Vincent Ladeuil
Update from review comments.
526
        return RemoteHTTPTransport(abs_url,
527
                                   _from_transport=self,
3104.4.2 by Andrew Bennetts
All tests passing.
528
                                   http_transport=self._http_transport)
2190.1.3 by John Arbash Meinel
Implement bzr+http://
529
530
2018.5.20 by Andrew Bennetts
Move bzrlib/transport/smart/_smart.py to bzrlib/transport/remote.py and rename SmartTransport to RemoteTransport (Robert Collins, Andrew Bennetts)
531
def get_test_permutations():
532
    """Return (transport, server) permutations for testing."""
533
    ### We may need a little more test framework support to construct an
534
    ### appropriate RemoteTransport in the future.
2018.5.21 by Andrew Bennetts
Move bzrlib.transport.smart to bzrlib.smart
535
    from bzrlib.smart import server
2413.2.1 by Andrew Bennetts
Rename Smart.*Transport classes to RemoteTransport, RemoteTCPTransport, etc.
536
    return [(RemoteTCPTransport, server.SmartTCPServer_for_testing)]