/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
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,
2655.1.1 by John Arbash Meinel
Add some more hpss logging.
31
    trace,
1910.19.13 by Andrew Bennetts
Address various review comments.
32
    transport,
33
    urlutils,
34
    )
3245.4.37 by Andrew Bennetts
Add test for sending ProtocolThreeResponder.send_error(UnknownSmartMethod(...)).
35
from bzrlib.smart import client, medium
3313.2.3 by Andrew Bennetts
Deprecate Transport.get_shared_medium.
36
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
37
38
2018.5.19 by Andrew Bennetts
Add docstrings to all the new modules, and a few other places.
39
class _SmartStat(object):
1752.2.48 by Andrew Bennetts
Support stat
40
41
    def __init__(self, size, mode):
42
        self.st_size = size
43
        self.st_mode = mode
44
45
2485.8.16 by Vincent Ladeuil
Create a new, empty, ConnectedTransport class.
46
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
47
    """Connection to a smart server.
48
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.
49
    The connection holds references to the medium that can be used to send
50
    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
51
52
    The connection has a notion of the current directory to which it's
53
    connected; this is incorporated in filenames passed to the server.
54
    
55
    This supports some higher-level RPC operations and can also be treated 
56
    like a Transport to do file-like operations.
57
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.
58
    The connection can be made over a tcp socket, an ssh pipe or a series of
59
    http requests.  There are concrete subclasses for each type:
2018.5.147 by Andrew Bennetts
Merge rename-SmartTransport branch.
60
    RemoteTCPTransport, etc.
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
61
    """
62
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)
63
    # 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.
64
    # responsibilities: Put those on SmartClient or similar. This is vital for
65
    # 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)
66
    # 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.
67
    # SmartClient model, not an encoder.
68
2485.8.42 by Vincent Ladeuil
Finish (almost) remote refactoring. Test suite passing.
69
    # FIXME: the medium parameter should be private, only the tests requires
70
    # it. It may be even clearer to define a TestRemoteTransport that handles
71
    # the specific cases of providing a _client and/or a _medium, and leave
72
    # RemoteTransport as an abstract class.
2485.8.59 by Vincent Ladeuil
Update from review comments.
73
    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.
74
        """Constructor.
75
2485.8.59 by Vincent Ladeuil
Update from review comments.
76
        :param _from_transport: Another RemoteTransport instance that this
2485.8.26 by Vincent Ladeuil
Finish remote refactoring. Test suite passing.
77
            one is being cloned from.  Attributes such as the medium will
78
            be reused.
79
3431.3.6 by Andrew Bennetts
Update RemoteTransport.__init__ docstring to reflect reality, and disallow passing of both medium and _from_transport.
80
        :param medium: The medium to use for this RemoteTransport.  If None,
81
            the medium from the _from_transport is shared.  If both this
82
            and _from_transport are None, a new medium will be built.
83
            _from_transport and medium cannot both be specified.
2485.8.26 by Vincent Ladeuil
Finish remote refactoring. Test suite passing.
84
2466.2.4 by Andrew Bennetts
Tweaks asked for by Robert.
85
        :param _client: Override the _SmartClient used by this transport.  This
86
            should only be used for testing purposes; normally this is
87
            determined from the medium.
1910.19.11 by Andrew Bennetts
General code cleanup based on review comments and other observations.
88
        """
2485.8.59 by Vincent Ladeuil
Update from review comments.
89
        super(RemoteTransport, self).__init__(url,
90
                                              _from_transport=_from_transport)
2485.8.42 by Vincent Ladeuil
Finish (almost) remote refactoring. Test suite passing.
91
2485.8.54 by Vincent Ladeuil
Refactor medium uses by making a distinction betweem shared and real medium.
92
        # The medium is the connection, except when we need to share it with
93
        # other objects (RemoteBzrDir, RemoteRepository etc). In these cases
94
        # what we want to share is really the shared connection.
95
2485.8.59 by Vincent Ladeuil
Update from review comments.
96
        if _from_transport is None:
97
            # 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.
98
            # shared medium.
99
            credentials = None
100
            if medium is None:
101
                medium, credentials = self._build_medium()
2655.1.1 by John Arbash Meinel
Add some more hpss logging.
102
                if 'hpss' in debug.debug_flags:
103
                    trace.mutter('hpss: Built a new medium: %s',
104
                                 medium.__class__.__name__)
105
            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.
106
                                                                  credentials,
107
                                                                  self.base)
3431.3.6 by Andrew Bennetts
Update RemoteTransport.__init__ docstring to reflect reality, and disallow passing of both medium and _from_transport.
108
        elif medium is None:
109
            # No medium was specified, so share the medium from the
110
            # _from_transport.
111
            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.
112
        else:
3431.3.6 by Andrew Bennetts
Update RemoteTransport.__init__ docstring to reflect reality, and disallow passing of both medium and _from_transport.
113
            raise AssertionError(
114
                "Both _from_transport (%r) and medium (%r) passed to "
115
                "RemoteTransport.__init__, but these parameters are mutally "
116
                "exclusive." % (_from_transport, medium))
2485.8.54 by Vincent Ladeuil
Refactor medium uses by making a distinction betweem shared and real medium.
117
2466.2.2 by Andrew Bennetts
Add tests for RemoteTransport.is_readonly in the style of the other remote object tests.
118
        if _client is None:
3431.3.2 by Andrew Bennetts
Remove 'base' from _SmartClient entirely, now that the medium has it.
119
            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.
120
        else:
121
            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.
122
2485.8.54 by Vincent Ladeuil
Refactor medium uses by making a distinction betweem shared and real medium.
123
    def _build_medium(self):
2485.8.59 by Vincent Ladeuil
Update from review comments.
124
        """Create the medium if _from_transport does not provide one.
2485.8.42 by Vincent Ladeuil
Finish (almost) remote refactoring. Test suite passing.
125
126
        The medium is analogous to the connection for ConnectedTransport: it
2485.8.26 by Vincent Ladeuil
Finish remote refactoring. Test suite passing.
127
        allows connection sharing.
1752.2.4 by Martin Pool
Refactor SFTP transport to allow code sharing with SSH.
128
        """
2485.8.54 by Vincent Ladeuil
Refactor medium uses by making a distinction betweem shared and real medium.
129
        # No credentials
130
        return None, None
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
131
132
    def is_readonly(self):
133
        """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.
134
        try:
135
            resp = self._call2('Transport.is_readonly')
136
        except errors.UnknownSmartMethod:
2466.2.4 by Andrew Bennetts
Tweaks asked for by Robert.
137
            # XXX: nasty hack: servers before 0.16 don't have a
138
            # 'Transport.is_readonly' verb, so we do what clients before 0.16
139
            # did: assume False.
2466.2.1 by Andrew Bennetts
Fix incompatibility with < 0.16 smart servers.
140
            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.
141
        if resp == ('yes', ):
142
            return True
143
        elif resp == ('no', ):
144
            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.
145
        else:
146
            self._translate_error(resp)
2555.1.1 by Martin Pool
Remove use of 'assert False' to raise an exception unconditionally
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):
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
164
        try:
165
            resp = self._call2(method, *args)
166
        except errors.ErrorFromSmartServer, err:
167
            self._translate_error(err.error_tuple)
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
168
        self._translate_error(resp)
169
170
    def _call2(self, method, *args):
171
        """Call a method on the remote server."""
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
172
        try:
173
            return self._client.call(method, *args)
174
        except errors.ErrorFromSmartServer, err:
175
            self._translate_error(err.error_tuple)
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
176
177
    def _call_with_body_bytes(self, method, args, body):
178
        """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.
179
        try:
180
            return self._client.call_with_body_bytes(method, args, body)
181
        except errors.ErrorFromSmartServer, err:
182
            self._translate_error(err.error_tuple)
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
183
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
184
    def has(self, relpath):
185
        """Indicate whether a remote file of the given name exists or not.
186
187
        :see: Transport.has()
188
        """
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
189
        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
190
        if resp == ('yes', ):
191
            return True
192
        elif resp == ('no', ):
193
            return False
194
        else:
195
            self._translate_error(resp)
196
1752.2.2 by Martin Pool
SSH get method; more development of framework.
197
    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
198
        """Return file-like object reading the contents of a remote file.
199
        
1910.19.13 by Andrew Bennetts
Address various review comments.
200
        :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
201
        """
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
202
        return StringIO(self.get_bytes(relpath))
203
204
    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
205
        remote = self._remote_path(relpath)
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
206
        try:
207
            resp, response_handler = self._client.call_expecting_body('get', remote)
208
        except errors.ErrorFromSmartServer, err:
209
            self._translate_error(err.error_tuple, relpath)
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
210
        if resp != ('ok', ):
3245.4.37 by Andrew Bennetts
Add test for sending ProtocolThreeResponder.send_error(UnknownSmartMethod(...)).
211
            response_handler.cancel_read_body()
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
212
            raise errors.UnexpectedSmartServerResponse(resp)
213
        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
214
1910.19.13 by Andrew Bennetts
Address various review comments.
215
    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
216
        if mode is None:
217
            return ''
218
        else:
219
            return '%d' % mode
220
221
    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.
222
        resp = self._call2('mkdir', self._remote_path(relpath),
223
            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
224
        self._translate_error(resp)
225
2671.3.9 by Robert Collins
Review feedback and fix VFat emulated transports to not claim to have unix permissions.
226
    def open_write_stream(self, relpath, mode=None):
227
        """See Transport.open_write_stream."""
2671.3.6 by Robert Collins
Review feedback.
228
        self.put_bytes(relpath, "", mode)
229
        result = transport.AppendBasedFileStream(self, relpath)
230
        transport._file_streams[self.abspath(relpath)] = result
231
        return result
2671.3.2 by Robert Collins
Start open_file_stream logic.
232
1910.19.13 by Andrew Bennetts
Address various review comments.
233
    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
234
        # FIXME: upload_file is probably not safe for non-ascii characters -
235
        # should probably just pass all parameters as length-delimited
236
        # 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.
237
        if type(upload_contents) is unicode:
238
            # Although not strictly correct, we raise UnicodeEncodeError to be
239
            # compatible with other transports.
240
            raise UnicodeEncodeError(
241
                'undefined', upload_contents, 0, 1,
242
                '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.
243
        resp = self._call_with_body_bytes('put',
1910.19.13 by Andrew Bennetts
Address various review comments.
244
            (self._remote_path(relpath), self._serialise_optional_mode(mode)),
245
            upload_contents)
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
246
        self._translate_error(resp)
2745.5.2 by Robert Collins
* ``bzrlib.transport.Transport.put_file`` now returns the number of bytes
247
        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
248
2017.2.1 by John Arbash Meinel
Implement put_bytes_non_atomic for the smart transport
249
    def put_bytes_non_atomic(self, relpath, bytes, mode=None,
250
                             create_parent_dir=False,
251
                             dir_mode=None):
1910.19.24 by Robert Collins
Touchup method order.
252
        """See Transport.put_bytes_non_atomic."""
253
        # FIXME: no encoding in the transport!
2017.2.1 by John Arbash Meinel
Implement put_bytes_non_atomic for the smart transport
254
        create_parent_str = 'F'
255
        if create_parent_dir:
256
            create_parent_str = 'T'
257
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
258
        resp = self._call_with_body_bytes(
2017.2.1 by John Arbash Meinel
Implement put_bytes_non_atomic for the smart transport
259
            'put_non_atomic',
260
            (self._remote_path(relpath), self._serialise_optional_mode(mode),
261
             create_parent_str, self._serialise_optional_mode(dir_mode)),
262
            bytes)
263
        self._translate_error(resp)
264
1910.19.24 by Robert Collins
Touchup method order.
265
    def put_file(self, relpath, upload_file, mode=None):
266
        # its not ideal to seek back, but currently put_non_atomic_file depends
267
        # on transports not reading before failing - which is a faulty
268
        # assumption I think - RBC 20060915
269
        pos = upload_file.tell()
270
        try:
271
            return self.put_bytes(relpath, upload_file.read(), mode)
272
        except:
273
            upload_file.seek(pos)
274
            raise
275
276
    def put_file_non_atomic(self, relpath, f, mode=None,
277
                            create_parent_dir=False,
278
                            dir_mode=None):
279
        return self.put_bytes_non_atomic(relpath, f.read(), mode=mode,
280
                                         create_parent_dir=create_parent_dir,
281
                                         dir_mode=dir_mode)
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
282
1910.19.13 by Andrew Bennetts
Address various review comments.
283
    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.
284
        return self.append_bytes(relpath, from_file.read(), mode)
1910.19.13 by Andrew Bennetts
Address various review comments.
285
        
286
    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.
287
        resp = self._call_with_body_bytes(
1910.19.13 by Andrew Bennetts
Address various review comments.
288
            'append',
289
            (self._remote_path(relpath), self._serialise_optional_mode(mode)),
290
            bytes)
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
291
        if resp[0] == 'appended':
292
            return int(resp[1])
293
        self._translate_error(resp)
294
295
    def delete(self, relpath):
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
296
        resp = self._call2('delete', 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
297
        self._translate_error(resp)
298
2634.1.1 by Robert Collins
(robertc) Reinstate the accidentally backed out external_url patch.
299
    def external_url(self):
300
        """See bzrlib.transport.Transport.external_url."""
301
        # the external path for RemoteTransports is the base
302
        return self.base
303
3183.2.1 by Andrew Bennetts
Set the recommended page size for RemoteTransport to 64k.
304
    def recommended_page_size(self):
305
        """Return the recommended page size for this transport."""
306
        return 64 * 1024
307
        
2745.5.1 by Robert Collins
* New parameter on ``bzrlib.transport.Transport.readv``
308
    def _readv(self, relpath, offsets):
1910.19.17 by John Arbash Meinel
Implement readv() for the SmartServer
309
        if not offsets:
310
            return
311
312
        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
313
314
        sorted_offsets = sorted(offsets)
315
        # turn the list of offsets into a stack
316
        offset_stack = iter(offsets)
317
        cur_offset_and_size = offset_stack.next()
318
        coalesced = list(self._coalesce_offsets(sorted_offsets,
319
                               limit=self._max_readv_combine,
320
                               fudge_factor=self._bytes_to_read_before_seek))
321
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
322
        try:
323
            result = self._client.call_with_body_readv_array(
324
                ('readv', self._remote_path(relpath),),
325
                [(c.start, c.length) for c in coalesced])
326
            resp, response_handler = result
327
        except errors.ErrorFromSmartServer, err:
328
            self._translate_error(err.error_tuple)
1910.19.17 by John Arbash Meinel
Implement readv() for the SmartServer
329
330
        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
331
            # This should raise an exception
3245.4.37 by Andrew Bennetts
Add test for sending ProtocolThreeResponder.send_error(UnknownSmartMethod(...)).
332
            response_handler.cancel_read_body()
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
333
            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
334
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
335
        # 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.
336
        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
337
        # Cache the results, but only until they have been fulfilled
338
        data_map = {}
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)
345
                data_map[key] = data[suboffset:suboffset+subsize]
346
            data = data[c_offset.length:]
347
348
            # Now that we've read some data, see if we can yield anything back
349
            while cur_offset_and_size in data_map:
350
                this_data = data_map.pop(cur_offset_and_size)
351
                yield cur_offset_and_size[0], this_data
352
                cur_offset_and_size = offset_stack.next()
1910.19.17 by John Arbash Meinel
Implement readv() for the SmartServer
353
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
354
    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.
355
        self._call('rename',
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
356
                   self._remote_path(rel_from),
357
                   self._remote_path(rel_to))
358
359
    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.
360
        self._call('move',
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
361
                   self._remote_path(rel_from),
362
                   self._remote_path(rel_to))
363
364
    def rmdir(self, relpath):
365
        resp = self._call('rmdir', self._remote_path(relpath))
366
1752.2.81 by Andrew Bennetts
Merge cleaned up underlying dependencies for remote bzrdir.
367
    def _translate_error(self, resp, orig_path=None):
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
368
        """Raise an exception from a response"""
2018.1.1 by Andrew Bennetts
Make bzr+ssh:// actually work (at least with absolute paths).
369
        if resp is None:
370
            what = None
371
        else:
372
            what = resp[0]
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
373
        if what == 'ok':
374
            return
375
        elif what == 'NoSuchFile':
1752.2.81 by Andrew Bennetts
Merge cleaned up underlying dependencies for remote bzrdir.
376
            if orig_path is not None:
377
                error_path = orig_path
378
            else:
379
                error_path = resp[1]
380
            raise errors.NoSuchFile(error_path)
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
381
        elif what == 'error':
1910.19.13 by Andrew Bennetts
Address various review comments.
382
            raise errors.SmartProtocolError(unicode(resp[1]))
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
383
        elif what == 'FileExists':
384
            raise errors.FileExists(resp[1])
385
        elif what == 'DirectoryNotEmpty':
386
            raise errors.DirectoryNotEmpty(resp[1])
1910.19.18 by John Arbash Meinel
[merge] short-read code, implement for Smart readv
387
        elif what == 'ShortReadvError':
388
            raise errors.ShortReadvError(resp[1], int(resp[2]),
389
                                         int(resp[3]), int(resp[4]))
1910.19.16 by John Arbash Meinel
Translate UnicodeErrors across the smart server
390
        elif what in ('UnicodeEncodeError', 'UnicodeDecodeError'):
391
            encoding = str(resp[1]) # encoding must always be a string
392
            val = resp[2]
393
            start = int(resp[3])
394
            end = int(resp[4])
395
            reason = str(resp[5]) # reason must always be a string
396
            if val.startswith('u:'):
2018.2.36 by Andrew Bennetts
Don't UTF-8 decode paths in requests. They should be url-quoted (and thus
397
                val = val[2:].decode('utf-8')
1910.19.16 by John Arbash Meinel
Translate UnicodeErrors across the smart server
398
            elif val.startswith('s:'):
399
                val = val[2:].decode('base64')
400
            if what == 'UnicodeDecodeError':
401
                raise UnicodeDecodeError(encoding, val, start, end, reason)
402
            elif what == 'UnicodeEncodeError':
403
                raise UnicodeEncodeError(encoding, val, start, end, reason)
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
404
        elif what == "ReadOnlyError":
405
            raise errors.TransportNotPossible('readonly transport')
2052.6.1 by Robert Collins
``Transport.get`` has had its interface made more clear for ease of use.
406
        elif what == "ReadError":
407
            if orig_path is not None:
408
                error_path = orig_path
409
            else:
410
                error_path = resp[1]
411
            raise errors.ReadError(error_path)
3146.4.10 by Aaron Bentley
Add handling of PermissionDenied errors to smart protocol VFS layer
412
        elif what == "PermissionDenied":
413
            if orig_path is not None:
414
                error_path = orig_path
415
            else:
416
                error_path = resp[1]
417
            raise errors.PermissionDenied(error_path)
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
418
        else:
1910.19.13 by Andrew Bennetts
Address various review comments.
419
            raise errors.SmartProtocolError('unexpected smart server error: %r' % (resp,))
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
420
421
    def disconnect(self):
2485.8.54 by Vincent Ladeuil
Refactor medium uses by making a distinction betweem shared and real medium.
422
        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
423
424
    def delete_tree(self, relpath):
425
        raise errors.TransportNotPossible('readonly transport')
426
427
    def stat(self, relpath):
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
428
        resp = self._call2('stat', self._remote_path(relpath))
1752.2.48 by Andrew Bennetts
Support stat
429
        if resp[0] == 'stat':
2018.5.19 by Andrew Bennetts
Add docstrings to all the new modules, and a few other places.
430
            return _SmartStat(int(resp[1]), int(resp[2], 8))
1752.2.48 by Andrew Bennetts
Support stat
431
        else:
432
            self._translate_error(resp)
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
433
434
    ## def lock_read(self, relpath):
435
    ##     """Lock the given file for shared (read) access.
436
    ##     :return: A lock object, which should be passed to Transport.unlock()
437
    ##     """
438
    ##     # The old RemoteBranch ignore lock for reading, so we will
439
    ##     # continue that tradition and return a bogus lock object.
440
    ##     class BogusLock(object):
441
    ##         def __init__(self, path):
442
    ##             self.path = path
443
    ##         def unlock(self):
444
    ##             pass
445
    ##     return BogusLock(relpath)
446
1752.2.42 by Andrew Bennetts
Add list_dir and iter_files_recursive smart transport
447
    def listable(self):
448
        return True
449
450
    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.
451
        resp = self._call2('list_dir', self._remote_path(relpath))
1752.2.42 by Andrew Bennetts
Add list_dir and iter_files_recursive smart transport
452
        if resp[0] == 'names':
1752.2.47 by Andrew Bennetts
Fix SmartTransport.list_dir to return ascii.
453
            return [name.encode('ascii') for name in resp[1:]]
1752.2.42 by Andrew Bennetts
Add list_dir and iter_files_recursive smart transport
454
        else:
455
            self._translate_error(resp)
456
457
    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.
458
        resp = self._call2('iter_files_recursive', self._remote_path(''))
1752.2.42 by Andrew Bennetts
Add list_dir and iter_files_recursive smart transport
459
        if resp[0] == 'names':
460
            return resp[1:]
461
        else:
462
            self._translate_error(resp)
463
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
464
2413.2.1 by Andrew Bennetts
Rename Smart.*Transport classes to RemoteTransport, RemoteTCPTransport, etc.
465
class RemoteTCPTransport(RemoteTransport):
2018.2.3 by Andrew Bennetts
Starting factoring out the smart server client "medium" from the protocol.
466
    """Connection to smart server over plain tcp.
467
    
468
    This is essentially just a factory to get 'RemoteTransport(url,
469
        SmartTCPClientMedium).
470
    """
471
2485.8.54 by Vincent Ladeuil
Refactor medium uses by making a distinction betweem shared and real medium.
472
    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.
473
        client_medium = medium.SmartTCPClientMedium(
474
            self._host, self._port, self.base)
475
        return client_medium, None
2413.2.1 by Andrew Bennetts
Rename Smart.*Transport classes to RemoteTransport, RemoteTCPTransport, etc.
476
477
3453.5.1 by Andrew Bennetts
Add {bzrdir,repository,branch}_implementations tests for Remote objects using protocol v2 and pre-1.6 RPCs.
478
class RemoteTCPTransportV2Only(RemoteTransport):
479
    """Connection to smart server over plain tcp with the client hard-coded to
480
    assume protocol v2 and remote server version <= 1.6.
481
482
    This should only be used for testing.
483
    """
484
485
    def _build_medium(self):
486
        client_medium = medium.SmartTCPClientMedium(
487
            self._host, self._port, self.base)
488
        client_medium._protocol_version = 2
3453.5.7 by Andrew Bennetts
Fix error introduced by merge.
489
        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.
490
        return client_medium, None
491
492
2413.2.1 by Andrew Bennetts
Rename Smart.*Transport classes to RemoteTransport, RemoteTCPTransport, etc.
493
class RemoteSSHTransport(RemoteTransport):
2018.2.27 by Andrew Bennetts
Merge from bzr.dev
494
    """Connection to smart server over SSH.
495
496
    This is essentially just a factory to get 'RemoteTransport(url,
497
        SmartSSHClientMedium).
498
    """
499
2485.8.54 by Vincent Ladeuil
Refactor medium uses by making a distinction betweem shared and real medium.
500
    def _build_medium(self):
501
        # ssh will prompt the user for a password if needed and if none is
502
        # provided but it will not give it back, so no credentials can be
503
        # stored.
1551.18.17 by Aaron Bentley
Introduce bzr_remote_path configuration variable
504
        location_config = config.LocationConfig(self.base)
505
        bzr_remote_path = location_config.get_bzr_remote_path()
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.
506
        client_medium = medium.SmartSSHClientMedium(self._host, self._port,
507
            self._user, self._password, self.base,
508
            bzr_remote_path=bzr_remote_path)
509
        return client_medium, None
2413.2.1 by Andrew Bennetts
Rename Smart.*Transport classes to RemoteTransport, RemoteTCPTransport, etc.
510
511
512
class RemoteHTTPTransport(RemoteTransport):
2190.1.3 by John Arbash Meinel
Implement bzr+http://
513
    """Just a way to connect between a bzr+http:// url and http://.
514
    
2413.2.1 by Andrew Bennetts
Rename Smart.*Transport classes to RemoteTransport, RemoteTCPTransport, etc.
515
    This connection operates slightly differently than the RemoteSSHTransport.
2190.1.3 by John Arbash Meinel
Implement bzr+http://
516
    It uses a plain http:// transport underneath, which defines what remote
517
    .bzr/smart URL we are connected to. From there, all paths that are sent are
518
    sent as relative paths, this way, the remote side can properly
2190.1.5 by John Arbash Meinel
Typo fix from Martin
519
    de-reference them, since it is likely doing rewrite rules to translate an
2190.1.3 by John Arbash Meinel
Implement bzr+http://
520
    HTTP path into a local path.
521
    """
522
2485.8.59 by Vincent Ladeuil
Update from review comments.
523
    def __init__(self, base, _from_transport=None, http_transport=None):
2190.1.3 by John Arbash Meinel
Implement bzr+http://
524
        if http_transport is None:
2485.8.46 by Vincent Ladeuil
Add some remarks about current limitations in connection sharing.
525
            # FIXME: the password may be lost here because it appears in the
526
            # url only for an intial construction (when the url came from the
527
            # command-line).
2485.8.26 by Vincent Ladeuil
Finish remote refactoring. Test suite passing.
528
            http_url = base[len('bzr+'):]
2190.1.3 by John Arbash Meinel
Implement bzr+http://
529
            self._http_transport = transport.get_transport(http_url)
530
        else:
531
            self._http_transport = http_transport
2485.8.59 by Vincent Ladeuil
Update from review comments.
532
        super(RemoteHTTPTransport, self).__init__(
533
            base, _from_transport=_from_transport)
2485.8.26 by Vincent Ladeuil
Finish remote refactoring. Test suite passing.
534
2485.8.54 by Vincent Ladeuil
Refactor medium uses by making a distinction betweem shared and real medium.
535
    def _build_medium(self):
536
        # We let http_transport take care of the credentials
537
        return self._http_transport.get_smart_medium(), None
2190.1.3 by John Arbash Meinel
Implement bzr+http://
538
3104.4.2 by Andrew Bennetts
All tests passing.
539
    def _remote_path(self, relpath):
2485.8.29 by Vincent Ladeuil
Cometic changes (and a typo).
540
        """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.
541
        # Adjust the relpath based on which URL this smart transport is
542
        # connected to.
3104.4.1 by Andrew Bennetts
Fix paths sent by bzr+http client to correctly adjust for shared medium.
543
        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.
544
        url = urlutils.join(self.base[len('bzr+'):], relpath)
545
        url = urlutils.normalize_url(url)
2485.8.26 by Vincent Ladeuil
Finish remote refactoring. Test suite passing.
546
        return urlutils.relative_url(http_base, url)
2190.1.3 by John Arbash Meinel
Implement bzr+http://
547
548
    def clone(self, relative_url):
2413.2.1 by Andrew Bennetts
Rename Smart.*Transport classes to RemoteTransport, RemoteTCPTransport, etc.
549
        """Make a new RemoteHTTPTransport related to me.
2190.1.3 by John Arbash Meinel
Implement bzr+http://
550
551
        This is re-implemented rather than using the default
2413.2.1 by Andrew Bennetts
Rename Smart.*Transport classes to RemoteTransport, RemoteTCPTransport, etc.
552
        RemoteTransport.clone() because we must be careful about the underlying
2190.1.3 by John Arbash Meinel
Implement bzr+http://
553
        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.
554
555
        Also, the cloned smart transport will POST to the same .bzr/smart
556
        location as this transport (although obviously the relative paths in the
557
        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')).
558
        have to handle .bzr/smart requests at arbitrary places inside .bzr
559
        directories, just at the initial URL the user uses.
2190.1.3 by John Arbash Meinel
Implement bzr+http://
560
        """
561
        if relative_url:
562
            abs_url = self.abspath(relative_url)
563
        else:
564
            abs_url = self.base
2485.8.59 by Vincent Ladeuil
Update from review comments.
565
        return RemoteHTTPTransport(abs_url,
566
                                   _from_transport=self,
3104.4.2 by Andrew Bennetts
All tests passing.
567
                                   http_transport=self._http_transport)
2190.1.3 by John Arbash Meinel
Implement bzr+http://
568
569
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)
570
def get_test_permutations():
571
    """Return (transport, server) permutations for testing."""
572
    ### We may need a little more test framework support to construct an
573
    ### appropriate RemoteTransport in the future.
2018.5.21 by Andrew Bennetts
Move bzrlib.transport.smart to bzrlib.smart
574
    from bzrlib.smart import server
2413.2.1 by Andrew Bennetts
Rename Smart.*Transport classes to RemoteTransport, RemoteTCPTransport, etc.
575
    return [(RemoteTCPTransport, server.SmartTCPServer_for_testing)]