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