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