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