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