/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
1
# Copyright (C) 2006 Canonical Ltd
2
#
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
#
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
12
#
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
2018.5.20 by Andrew Bennetts
Move bzrlib/transport/smart/_smart.py to bzrlib/transport/remote.py and rename SmartTransport to RemoteTransport (Robert Collins, Andrew Bennetts)
17
"""RemoteTransport client for the smart-server.
2018.5.19 by Andrew Bennetts
Add docstrings to all the new modules, and a few other places.
18
19
This module shouldn't be accessed directly.  The classes defined here should be
2018.5.21 by Andrew Bennetts
Move bzrlib.transport.smart to bzrlib.smart
20
imported from bzrlib.smart.
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
21
"""
22
2018.5.147 by Andrew Bennetts
Merge rename-SmartTransport branch.
23
__all__ = ['RemoteTransport', 'RemoteTCPTransport', 'RemoteSSHTransport']
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
24
25
from cStringIO import StringIO
26
1910.19.13 by Andrew Bennetts
Address various review comments.
27
from bzrlib import (
1551.18.17 by Aaron Bentley
Introduce bzr_remote_path configuration variable
28
    config,
2655.1.1 by John Arbash Meinel
Add some more hpss logging.
29
    debug,
1910.19.13 by Andrew Bennetts
Address various review comments.
30
    errors,
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
31
    remote,
2655.1.1 by John Arbash Meinel
Add some more hpss logging.
32
    trace,
1910.19.13 by Andrew Bennetts
Address various review comments.
33
    transport,
34
    urlutils,
35
    )
3245.4.37 by Andrew Bennetts
Add test for sending ProtocolThreeResponder.send_error(UnknownSmartMethod(...)).
36
from bzrlib.smart import client, medium
3313.2.3 by Andrew Bennetts
Deprecate Transport.get_shared_medium.
37
from bzrlib.symbol_versioning import (deprecated_method, one_four)
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
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
3734.2.3 by Vincent Ladeuil
Don't use multiple inheritance for http smart medium since we
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
3805.4.4 by John Arbash Meinel
Change to a 5MB request chunk, and add a bit more debug logging.
64
    # When making a readv request, cap it at requesting 5MB of data
65
    _max_readv_bytes = 5*1024*1024
3805.4.3 by John Arbash Meinel
Reorganize the new code, add some debugging.
66
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
    # 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.
68
    # responsibilities: Put those on SmartClient or similar. This is vital for
69
    # 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)
70
    # 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.
71
    # SmartClient model, not an encoder.
72
2485.8.42 by Vincent Ladeuil
Finish (almost) remote refactoring. Test suite passing.
73
    # FIXME: the medium parameter should be private, only the tests requires
74
    # it. It may be even clearer to define a TestRemoteTransport that handles
75
    # the specific cases of providing a _client and/or a _medium, and leave
76
    # RemoteTransport as an abstract class.
2485.8.59 by Vincent Ladeuil
Update from review comments.
77
    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.
78
        """Constructor.
79
2485.8.59 by Vincent Ladeuil
Update from review comments.
80
        :param _from_transport: Another RemoteTransport instance that this
2485.8.26 by Vincent Ladeuil
Finish remote refactoring. Test suite passing.
81
            one is being cloned from.  Attributes such as the medium will
82
            be reused.
83
3431.3.6 by Andrew Bennetts
Update RemoteTransport.__init__ docstring to reflect reality, and disallow passing of both medium and _from_transport.
84
        :param medium: The medium to use for this RemoteTransport.  If None,
85
            the medium from the _from_transport is shared.  If both this
86
            and _from_transport are None, a new medium will be built.
87
            _from_transport and medium cannot both be specified.
2485.8.26 by Vincent Ladeuil
Finish remote refactoring. Test suite passing.
88
2466.2.4 by Andrew Bennetts
Tweaks asked for by Robert.
89
        :param _client: Override the _SmartClient used by this transport.  This
90
            should only be used for testing purposes; normally this is
91
            determined from the medium.
1910.19.11 by Andrew Bennetts
General code cleanup based on review comments and other observations.
92
        """
2485.8.59 by Vincent Ladeuil
Update from review comments.
93
        super(RemoteTransport, self).__init__(url,
94
                                              _from_transport=_from_transport)
2485.8.42 by Vincent Ladeuil
Finish (almost) remote refactoring. Test suite passing.
95
2485.8.54 by Vincent Ladeuil
Refactor medium uses by making a distinction betweem shared and real medium.
96
        # The medium is the connection, except when we need to share it with
97
        # other objects (RemoteBzrDir, RemoteRepository etc). In these cases
98
        # what we want to share is really the shared connection.
99
2485.8.59 by Vincent Ladeuil
Update from review comments.
100
        if _from_transport is None:
101
            # 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.
102
            # shared medium.
103
            credentials = None
104
            if medium is None:
105
                medium, credentials = self._build_medium()
2655.1.1 by John Arbash Meinel
Add some more hpss logging.
106
                if 'hpss' in debug.debug_flags:
107
                    trace.mutter('hpss: Built a new medium: %s',
108
                                 medium.__class__.__name__)
109
            self._shared_connection = transport._SharedConnection(medium,
3104.4.1 by Andrew Bennetts
Fix paths sent by bzr+http client to correctly adjust for shared medium.
110
                                                                  credentials,
111
                                                                  self.base)
3431.3.6 by Andrew Bennetts
Update RemoteTransport.__init__ docstring to reflect reality, and disallow passing of both medium and _from_transport.
112
        elif medium is None:
113
            # No medium was specified, so share the medium from the
114
            # _from_transport.
115
            medium = self._shared_connection.connection
3313.2.1 by Andrew Bennetts
Change _SmartClient's API to accept a medium and a base, rather than a _SharedConnection.
116
        else:
3431.3.6 by Andrew Bennetts
Update RemoteTransport.__init__ docstring to reflect reality, and disallow passing of both medium and _from_transport.
117
            raise AssertionError(
118
                "Both _from_transport (%r) and medium (%r) passed to "
119
                "RemoteTransport.__init__, but these parameters are mutally "
120
                "exclusive." % (_from_transport, medium))
2485.8.54 by Vincent Ladeuil
Refactor medium uses by making a distinction betweem shared and real medium.
121
2466.2.2 by Andrew Bennetts
Add tests for RemoteTransport.is_readonly in the style of the other remote object tests.
122
        if _client is None:
3431.3.2 by Andrew Bennetts
Remove 'base' from _SmartClient entirely, now that the medium has it.
123
            self._client = client._SmartClient(medium)
2466.2.2 by Andrew Bennetts
Add tests for RemoteTransport.is_readonly in the style of the other remote object tests.
124
        else:
125
            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.
126
2485.8.54 by Vincent Ladeuil
Refactor medium uses by making a distinction betweem shared and real medium.
127
    def _build_medium(self):
2485.8.59 by Vincent Ladeuil
Update from review comments.
128
        """Create the medium if _from_transport does not provide one.
2485.8.42 by Vincent Ladeuil
Finish (almost) remote refactoring. Test suite passing.
129
130
        The medium is analogous to the connection for ConnectedTransport: it
2485.8.26 by Vincent Ladeuil
Finish remote refactoring. Test suite passing.
131
        allows connection sharing.
1752.2.4 by Martin Pool
Refactor SFTP transport to allow code sharing with SSH.
132
        """
2485.8.54 by Vincent Ladeuil
Refactor medium uses by making a distinction betweem shared and real medium.
133
        # No credentials
134
        return None, None
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
135
136
    def is_readonly(self):
137
        """Smart server transport can do read/write file operations."""
3297.3.3 by Andrew Bennetts
SmartClientRequestProtocol*.read_response_tuple can now raise UnknownSmartMethod. Callers no longer need to do their own ad hoc unknown smart method error detection.
138
        try:
139
            resp = self._call2('Transport.is_readonly')
140
        except errors.UnknownSmartMethod:
2466.2.4 by Andrew Bennetts
Tweaks asked for by Robert.
141
            # XXX: nasty hack: servers before 0.16 don't have a
142
            # 'Transport.is_readonly' verb, so we do what clients before 0.16
143
            # did: assume False.
2466.2.1 by Andrew Bennetts
Fix incompatibility with < 0.16 smart servers.
144
            return False
3297.3.3 by Andrew Bennetts
SmartClientRequestProtocol*.read_response_tuple can now raise UnknownSmartMethod. Callers no longer need to do their own ad hoc unknown smart method error detection.
145
        if resp == ('yes', ):
146
            return True
147
        elif resp == ('no', ):
148
            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.
149
        else:
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
150
            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.
151
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
152
    def get_smart_client(self):
2485.8.42 by Vincent Ladeuil
Finish (almost) remote refactoring. Test suite passing.
153
        return self._get_connection()
2018.2.3 by Andrew Bennetts
Starting factoring out the smart server client "medium" from the protocol.
154
155
    def get_smart_medium(self):
2485.8.42 by Vincent Ladeuil
Finish (almost) remote refactoring. Test suite passing.
156
        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
157
3313.2.3 by Andrew Bennetts
Deprecate Transport.get_shared_medium.
158
    @deprecated_method(one_four)
2485.8.54 by Vincent Ladeuil
Refactor medium uses by making a distinction betweem shared and real medium.
159
    def get_shared_medium(self):
160
        return self._get_shared_connection()
161
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
162
    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.
163
        """Returns the Unicode version of the absolute path for relpath."""
3104.4.2 by Andrew Bennetts
All tests passing.
164
        return self._combine_paths(self._path, relpath)
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
165
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
166
    def _call(self, method, *args):
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
167
        resp = self._call2(method, *args)
168
        self._ensure_ok(resp)
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
169
170
    def _call2(self, method, *args):
171
        """Call a method on the remote server."""
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
172
        try:
173
            return self._client.call(method, *args)
174
        except errors.ErrorFromSmartServer, err:
3840.1.1 by Andrew Bennetts
Fix RemoteTransport's translation of errors involving paths; it wasn't passing orig_path to _translate_error.
175
            # The first argument, if present, is always a path.
176
            if args:
3840.1.2 by Andrew Bennetts
Improvements suggested by review.
177
                context = {'relpath': args[0]}
3840.1.1 by Andrew Bennetts
Fix RemoteTransport's translation of errors involving paths; it wasn't passing orig_path to _translate_error.
178
            else:
179
                context = {}
180
            self._translate_error(err, **context)
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
181
182
    def _call_with_body_bytes(self, method, args, body):
183
        """Call a method on the remote server with body bytes."""
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
184
        try:
185
            return self._client.call_with_body_bytes(method, args, body)
186
        except errors.ErrorFromSmartServer, err:
3840.1.2 by Andrew Bennetts
Improvements suggested by review.
187
            # The first argument, if present, is always a path.
188
            if args:
189
                context = {'relpath': args[0]}
190
            else:
191
                context = {}
192
            self._translate_error(err, **context)
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
193
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
194
    def has(self, relpath):
195
        """Indicate whether a remote file of the given name exists or not.
196
197
        :see: Transport.has()
198
        """
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
199
        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
200
        if resp == ('yes', ):
201
            return True
202
        elif resp == ('no', ):
203
            return False
204
        else:
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
205
            raise errors.UnexpectedSmartServerResponse(resp)
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
206
1752.2.2 by Martin Pool
SSH get method; more development of framework.
207
    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
208
        """Return file-like object reading the contents of a remote file.
209
        
1910.19.13 by Andrew Bennetts
Address various review comments.
210
        :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
211
        """
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
212
        return StringIO(self.get_bytes(relpath))
213
214
    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
215
        remote = self._remote_path(relpath)
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
216
        try:
217
            resp, response_handler = self._client.call_expecting_body('get', remote)
218
        except errors.ErrorFromSmartServer, err:
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
219
            self._translate_error(err, relpath)
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
220
        if resp != ('ok', ):
3245.4.37 by Andrew Bennetts
Add test for sending ProtocolThreeResponder.send_error(UnknownSmartMethod(...)).
221
            response_handler.cancel_read_body()
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
222
            raise errors.UnexpectedSmartServerResponse(resp)
223
        return response_handler.read_body_bytes()
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
224
1910.19.13 by Andrew Bennetts
Address various review comments.
225
    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
226
        if mode is None:
227
            return ''
228
        else:
229
            return '%d' % mode
230
231
    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.
232
        resp = self._call2('mkdir', self._remote_path(relpath),
233
            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
234
2671.3.9 by Robert Collins
Review feedback and fix VFat emulated transports to not claim to have unix permissions.
235
    def open_write_stream(self, relpath, mode=None):
236
        """See Transport.open_write_stream."""
2671.3.6 by Robert Collins
Review feedback.
237
        self.put_bytes(relpath, "", mode)
238
        result = transport.AppendBasedFileStream(self, relpath)
239
        transport._file_streams[self.abspath(relpath)] = result
240
        return result
2671.3.2 by Robert Collins
Start open_file_stream logic.
241
1910.19.13 by Andrew Bennetts
Address various review comments.
242
    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
243
        # FIXME: upload_file is probably not safe for non-ascii characters -
244
        # should probably just pass all parameters as length-delimited
245
        # 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.
246
        if type(upload_contents) is unicode:
247
            # Although not strictly correct, we raise UnicodeEncodeError to be
248
            # compatible with other transports.
249
            raise UnicodeEncodeError(
250
                'undefined', upload_contents, 0, 1,
251
                '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.
252
        resp = self._call_with_body_bytes('put',
1910.19.13 by Andrew Bennetts
Address various review comments.
253
            (self._remote_path(relpath), self._serialise_optional_mode(mode)),
254
            upload_contents)
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
255
        self._ensure_ok(resp)
2745.5.2 by Robert Collins
* ``bzrlib.transport.Transport.put_file`` now returns the number of bytes
256
        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
257
2017.2.1 by John Arbash Meinel
Implement put_bytes_non_atomic for the smart transport
258
    def put_bytes_non_atomic(self, relpath, bytes, mode=None,
259
                             create_parent_dir=False,
260
                             dir_mode=None):
1910.19.24 by Robert Collins
Touchup method order.
261
        """See Transport.put_bytes_non_atomic."""
262
        # FIXME: no encoding in the transport!
2017.2.1 by John Arbash Meinel
Implement put_bytes_non_atomic for the smart transport
263
        create_parent_str = 'F'
264
        if create_parent_dir:
265
            create_parent_str = 'T'
266
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
267
        resp = self._call_with_body_bytes(
2017.2.1 by John Arbash Meinel
Implement put_bytes_non_atomic for the smart transport
268
            'put_non_atomic',
269
            (self._remote_path(relpath), self._serialise_optional_mode(mode),
270
             create_parent_str, self._serialise_optional_mode(dir_mode)),
271
            bytes)
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
272
        self._ensure_ok(resp)
2017.2.1 by John Arbash Meinel
Implement put_bytes_non_atomic for the smart transport
273
1910.19.24 by Robert Collins
Touchup method order.
274
    def put_file(self, relpath, upload_file, mode=None):
275
        # its not ideal to seek back, but currently put_non_atomic_file depends
276
        # on transports not reading before failing - which is a faulty
277
        # assumption I think - RBC 20060915
278
        pos = upload_file.tell()
279
        try:
280
            return self.put_bytes(relpath, upload_file.read(), mode)
281
        except:
282
            upload_file.seek(pos)
283
            raise
284
285
    def put_file_non_atomic(self, relpath, f, mode=None,
286
                            create_parent_dir=False,
287
                            dir_mode=None):
288
        return self.put_bytes_non_atomic(relpath, f.read(), mode=mode,
289
                                         create_parent_dir=create_parent_dir,
290
                                         dir_mode=dir_mode)
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
291
1910.19.13 by Andrew Bennetts
Address various review comments.
292
    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.
293
        return self.append_bytes(relpath, from_file.read(), mode)
1910.19.13 by Andrew Bennetts
Address various review comments.
294
        
295
    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.
296
        resp = self._call_with_body_bytes(
1910.19.13 by Andrew Bennetts
Address various review comments.
297
            'append',
298
            (self._remote_path(relpath), self._serialise_optional_mode(mode)),
299
            bytes)
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
300
        if resp[0] == 'appended':
301
            return int(resp[1])
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
302
        raise errors.UnexpectedSmartServerResponse(resp)
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
303
304
    def delete(self, relpath):
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
305
        resp = self._call2('delete', self._remote_path(relpath))
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
306
        self._ensure_ok(resp)
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
307
2634.1.1 by Robert Collins
(robertc) Reinstate the accidentally backed out external_url patch.
308
    def external_url(self):
309
        """See bzrlib.transport.Transport.external_url."""
310
        # the external path for RemoteTransports is the base
311
        return self.base
312
3183.2.1 by Andrew Bennetts
Set the recommended page size for RemoteTransport to 64k.
313
    def recommended_page_size(self):
314
        """Return the recommended page size for this transport."""
315
        return 64 * 1024
316
        
2745.5.1 by Robert Collins
* New parameter on ``bzrlib.transport.Transport.readv``
317
    def _readv(self, relpath, offsets):
1910.19.17 by John Arbash Meinel
Implement readv() for the SmartServer
318
        if not offsets:
319
            return
320
321
        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
322
323
        sorted_offsets = sorted(offsets)
324
        coalesced = list(self._coalesce_offsets(sorted_offsets,
325
                               limit=self._max_readv_combine,
3876.1.1 by John Arbash Meinel
Fix bug #303538 by capping the max per-hunk read size at 100MB.
326
                               fudge_factor=self._bytes_to_read_before_seek,
327
                               max_size=self._max_readv_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
328
3805.4.3 by John Arbash Meinel
Reorganize the new code, add some debugging.
329
        # now that we've coallesced things, avoid making enormous requests
3805.4.1 by John Arbash Meinel
Change the default readv() packing rules.
330
        requests = []
331
        cur_request = []
332
        cur_len = 0
333
        for c in coalesced:
3805.4.4 by John Arbash Meinel
Change to a 5MB request chunk, and add a bit more debug logging.
334
            if c.length + cur_len > self._max_readv_bytes:
3805.4.1 by John Arbash Meinel
Change the default readv() packing rules.
335
                requests.append(cur_request)
3805.4.8 by John Arbash Meinel
When starting a new list, we need to start it with the current entry
336
                cur_request = [c]
337
                cur_len = c.length
3805.4.1 by John Arbash Meinel
Change the default readv() packing rules.
338
                continue
339
            cur_request.append(c)
340
            cur_len += c.length
3805.4.5 by John Arbash Meinel
when splitting a readv, we need to start at the last offset,
341
        if cur_request:
342
            requests.append(cur_request)
3805.4.3 by John Arbash Meinel
Reorganize the new code, add some debugging.
343
        if 'hpss' in debug.debug_flags:
3805.4.5 by John Arbash Meinel
when splitting a readv, we need to start at the last offset,
344
            trace.mutter('%s.readv %s offsets => %s coalesced'
345
                         ' => %s requests (%s)',
3805.4.4 by John Arbash Meinel
Change to a 5MB request chunk, and add a bit more debug logging.
346
                         self.__class__.__name__, len(offsets), len(coalesced),
3805.4.5 by John Arbash Meinel
when splitting a readv, we need to start at the last offset,
347
                         len(requests), sum(map(len, requests)))
3805.4.1 by John Arbash Meinel
Change the default readv() packing rules.
348
        # Cache the results, but only until they have been fulfilled
349
        data_map = {}
3805.4.5 by John Arbash Meinel
when splitting a readv, we need to start at the last offset,
350
        # turn the list of offsets into a single stack to iterate
3649.5.1 by John Arbash Meinel
Change _StatefulDecoder._in_bytes into a _in_bytes_list
351
        offset_stack = iter(offsets)
3805.4.5 by John Arbash Meinel
when splitting a readv, we need to start at the last offset,
352
        # using a list so it can be modified when passing down and coming back
3805.4.7 by John Arbash Meinel
Fix a typo.
353
        next_offset = [offset_stack.next()]
3805.4.1 by John Arbash Meinel
Change the default readv() packing rules.
354
        for cur_request in requests:
355
            try:
356
                result = self._client.call_with_body_readv_array(
357
                    ('readv', self._remote_path(relpath),),
358
                    [(c.start, c.length) for c in cur_request])
359
                resp, response_handler = result
360
            except errors.ErrorFromSmartServer, err:
3840.1.2 by Andrew Bennetts
Improvements suggested by review.
361
                self._translate_error(err, relpath)
3805.4.1 by John Arbash Meinel
Change the default readv() packing rules.
362
363
            if resp[0] != 'readv':
364
                # This should raise an exception
365
                response_handler.cancel_read_body()
366
                raise errors.UnexpectedSmartServerResponse(resp)
367
368
            for res in self._handle_response(offset_stack, cur_request,
369
                                             response_handler,
3805.4.5 by John Arbash Meinel
when splitting a readv, we need to start at the last offset,
370
                                             data_map,
371
                                             next_offset):
3805.4.1 by John Arbash Meinel
Change the default readv() packing rules.
372
                yield res
373
374
    def _handle_response(self, offset_stack, coalesced, response_handler,
3805.4.5 by John Arbash Meinel
when splitting a readv, we need to start at the last offset,
375
                         data_map, next_offset):
376
        cur_offset_and_size = next_offset[0]
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
377
        # FIXME: this should know how many bytes are needed, for clarity.
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
378
        data = response_handler.read_body_bytes()
3649.5.3 by John Arbash Meinel
Don't downsize the data buffer while reading.
379
        data_offset = 0
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
380
        for c_offset in coalesced:
381
            if len(data) < c_offset.length:
382
                raise errors.ShortReadvError(relpath, c_offset.start,
383
                            c_offset.length, actual=len(data))
384
            for suboffset, subsize in c_offset.ranges:
385
                key = (c_offset.start+suboffset, subsize)
3649.5.3 by John Arbash Meinel
Don't downsize the data buffer while reading.
386
                this_data = data[data_offset+suboffset:
387
                                 data_offset+suboffset+subsize]
388
                # Special case when the data is in-order, rather than packing
389
                # into a map and then back out again. Benchmarking shows that
390
                # this has 100% hit rate, but leave in the data_map work just
391
                # in case.
392
                # TODO: Could we get away with using buffer() to avoid the
393
                #       memory copy?  Callers would need to realize they may
394
                #       not have a real string.
395
                if key == cur_offset_and_size:
396
                    yield cur_offset_and_size[0], this_data
3805.4.5 by John Arbash Meinel
when splitting a readv, we need to start at the last offset,
397
                    cur_offset_and_size = next_offset[0] = offset_stack.next()
3649.5.3 by John Arbash Meinel
Don't downsize the data buffer while reading.
398
                else:
399
                    data_map[key] = this_data
400
            data_offset += c_offset.length
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
401
402
            # Now that we've read some data, see if we can yield anything back
403
            while cur_offset_and_size in data_map:
404
                this_data = data_map.pop(cur_offset_and_size)
405
                yield cur_offset_and_size[0], this_data
3805.4.5 by John Arbash Meinel
when splitting a readv, we need to start at the last offset,
406
                cur_offset_and_size = next_offset[0] = offset_stack.next()
1910.19.17 by John Arbash Meinel
Implement readv() for the SmartServer
407
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
408
    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.
409
        self._call('rename',
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
410
                   self._remote_path(rel_from),
411
                   self._remote_path(rel_to))
412
413
    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.
414
        self._call('move',
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
415
                   self._remote_path(rel_from),
416
                   self._remote_path(rel_to))
417
418
    def rmdir(self, relpath):
419
        resp = self._call('rmdir', self._remote_path(relpath))
420
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
421
    def _ensure_ok(self, resp):
422
        if resp[0] != 'ok':
423
            raise errors.UnexpectedSmartServerResponse(resp)
424
        
3840.1.2 by Andrew Bennetts
Improvements suggested by review.
425
    def _translate_error(self, err, relpath=None):
426
        remote._translate_error(err, path=relpath)
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
427
428
    def disconnect(self):
2485.8.54 by Vincent Ladeuil
Refactor medium uses by making a distinction betweem shared and real medium.
429
        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
430
431
    def stat(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('stat', self._remote_path(relpath))
1752.2.48 by Andrew Bennetts
Support stat
433
        if resp[0] == 'stat':
2018.5.19 by Andrew Bennetts
Add docstrings to all the new modules, and a few other places.
434
            return _SmartStat(int(resp[1]), int(resp[2], 8))
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
435
        raise errors.UnexpectedSmartServerResponse(resp)
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
436
437
    ## def lock_read(self, relpath):
438
    ##     """Lock the given file for shared (read) access.
439
    ##     :return: A lock object, which should be passed to Transport.unlock()
440
    ##     """
441
    ##     # The old RemoteBranch ignore lock for reading, so we will
442
    ##     # continue that tradition and return a bogus lock object.
443
    ##     class BogusLock(object):
444
    ##         def __init__(self, path):
445
    ##             self.path = path
446
    ##         def unlock(self):
447
    ##             pass
448
    ##     return BogusLock(relpath)
449
1752.2.42 by Andrew Bennetts
Add list_dir and iter_files_recursive smart transport
450
    def listable(self):
451
        return True
452
453
    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.
454
        resp = self._call2('list_dir', self._remote_path(relpath))
1752.2.42 by Andrew Bennetts
Add list_dir and iter_files_recursive smart transport
455
        if resp[0] == 'names':
1752.2.47 by Andrew Bennetts
Fix SmartTransport.list_dir to return ascii.
456
            return [name.encode('ascii') for name in resp[1:]]
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
457
        raise errors.UnexpectedSmartServerResponse(resp)
1752.2.42 by Andrew Bennetts
Add list_dir and iter_files_recursive smart transport
458
459
    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.
460
        resp = self._call2('iter_files_recursive', self._remote_path(''))
1752.2.42 by Andrew Bennetts
Add list_dir and iter_files_recursive smart transport
461
        if resp[0] == 'names':
462
            return resp[1:]
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
463
        raise errors.UnexpectedSmartServerResponse(resp)
1752.2.42 by Andrew Bennetts
Add list_dir and iter_files_recursive smart transport
464
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
465
2413.2.1 by Andrew Bennetts
Rename Smart.*Transport classes to RemoteTransport, RemoteTCPTransport, etc.
466
class RemoteTCPTransport(RemoteTransport):
2018.2.3 by Andrew Bennetts
Starting factoring out the smart server client "medium" from the protocol.
467
    """Connection to smart server over plain tcp.
468
    
469
    This is essentially just a factory to get 'RemoteTransport(url,
470
        SmartTCPClientMedium).
471
    """
472
2485.8.54 by Vincent Ladeuil
Refactor medium uses by making a distinction betweem shared and real medium.
473
    def _build_medium(self):
3431.3.1 by Andrew Bennetts
First rough cut of a fix for bug #230550, by adding .base to SmartClientMedia rather than relying on other objects to track this accurately while reusing client media.
474
        client_medium = medium.SmartTCPClientMedium(
475
            self._host, self._port, self.base)
476
        return client_medium, None
2413.2.1 by Andrew Bennetts
Rename Smart.*Transport classes to RemoteTransport, RemoteTCPTransport, etc.
477
478
3453.5.1 by Andrew Bennetts
Add {bzrdir,repository,branch}_implementations tests for Remote objects using protocol v2 and pre-1.6 RPCs.
479
class RemoteTCPTransportV2Only(RemoteTransport):
480
    """Connection to smart server over plain tcp with the client hard-coded to
481
    assume protocol v2 and remote server version <= 1.6.
482
483
    This should only be used for testing.
484
    """
485
486
    def _build_medium(self):
487
        client_medium = medium.SmartTCPClientMedium(
488
            self._host, self._port, self.base)
489
        client_medium._protocol_version = 2
3453.5.7 by Andrew Bennetts
Fix error introduced by merge.
490
        client_medium._remember_remote_is_before((1, 6))
3453.5.1 by Andrew Bennetts
Add {bzrdir,repository,branch}_implementations tests for Remote objects using protocol v2 and pre-1.6 RPCs.
491
        return client_medium, None
492
493
2413.2.1 by Andrew Bennetts
Rename Smart.*Transport classes to RemoteTransport, RemoteTCPTransport, etc.
494
class RemoteSSHTransport(RemoteTransport):
2018.2.27 by Andrew Bennetts
Merge from bzr.dev
495
    """Connection to smart server over SSH.
496
497
    This is essentially just a factory to get 'RemoteTransport(url,
498
        SmartSSHClientMedium).
499
    """
500
2485.8.54 by Vincent Ladeuil
Refactor medium uses by making a distinction betweem shared and real medium.
501
    def _build_medium(self):
1551.18.17 by Aaron Bentley
Introduce bzr_remote_path configuration variable
502
        location_config = config.LocationConfig(self.base)
503
        bzr_remote_path = location_config.get_bzr_remote_path()
3777.1.3 by Aaron Bentley
Use SSH default username from authentication.conf
504
        user = self._user
505
        if user is None:
506
            auth = config.AuthenticationConfig()
507
            user = auth.get_user('ssh', self._host, self._port)
3431.3.1 by Andrew Bennetts
First rough cut of a fix for bug #230550, by adding .base to SmartClientMedia rather than relying on other objects to track this accurately while reusing client media.
508
        client_medium = medium.SmartSSHClientMedium(self._host, self._port,
3777.1.3 by Aaron Bentley
Use SSH default username from authentication.conf
509
            user, self._password, self.base,
3431.3.1 by Andrew Bennetts
First rough cut of a fix for bug #230550, by adding .base to SmartClientMedia rather than relying on other objects to track this accurately while reusing client media.
510
            bzr_remote_path=bzr_remote_path)
3777.1.3 by Aaron Bentley
Use SSH default username from authentication.conf
511
        return client_medium, (user, self._password)
2413.2.1 by Andrew Bennetts
Rename Smart.*Transport classes to RemoteTransport, RemoteTCPTransport, etc.
512
513
514
class RemoteHTTPTransport(RemoteTransport):
2190.1.3 by John Arbash Meinel
Implement bzr+http://
515
    """Just a way to connect between a bzr+http:// url and http://.
516
    
2413.2.1 by Andrew Bennetts
Rename Smart.*Transport classes to RemoteTransport, RemoteTCPTransport, etc.
517
    This connection operates slightly differently than the RemoteSSHTransport.
2190.1.3 by John Arbash Meinel
Implement bzr+http://
518
    It uses a plain http:// transport underneath, which defines what remote
519
    .bzr/smart URL we are connected to. From there, all paths that are sent are
520
    sent as relative paths, this way, the remote side can properly
2190.1.5 by John Arbash Meinel
Typo fix from Martin
521
    de-reference them, since it is likely doing rewrite rules to translate an
2190.1.3 by John Arbash Meinel
Implement bzr+http://
522
    HTTP path into a local path.
523
    """
524
2485.8.59 by Vincent Ladeuil
Update from review comments.
525
    def __init__(self, base, _from_transport=None, http_transport=None):
2190.1.3 by John Arbash Meinel
Implement bzr+http://
526
        if http_transport is None:
2485.8.46 by Vincent Ladeuil
Add some remarks about current limitations in connection sharing.
527
            # FIXME: the password may be lost here because it appears in the
528
            # url only for an intial construction (when the url came from the
529
            # command-line).
2485.8.26 by Vincent Ladeuil
Finish remote refactoring. Test suite passing.
530
            http_url = base[len('bzr+'):]
2190.1.3 by John Arbash Meinel
Implement bzr+http://
531
            self._http_transport = transport.get_transport(http_url)
532
        else:
533
            self._http_transport = http_transport
2485.8.59 by Vincent Ladeuil
Update from review comments.
534
        super(RemoteHTTPTransport, self).__init__(
535
            base, _from_transport=_from_transport)
2485.8.26 by Vincent Ladeuil
Finish remote refactoring. Test suite passing.
536
2485.8.54 by Vincent Ladeuil
Refactor medium uses by making a distinction betweem shared and real medium.
537
    def _build_medium(self):
538
        # We let http_transport take care of the credentials
539
        return self._http_transport.get_smart_medium(), None
2190.1.3 by John Arbash Meinel
Implement bzr+http://
540
3104.4.2 by Andrew Bennetts
All tests passing.
541
    def _remote_path(self, relpath):
2485.8.29 by Vincent Ladeuil
Cometic changes (and a typo).
542
        """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.
543
        # Adjust the relpath based on which URL this smart transport is
544
        # connected to.
3104.4.1 by Andrew Bennetts
Fix paths sent by bzr+http client to correctly adjust for shared medium.
545
        http_base = urlutils.normalize_url(self.get_smart_medium().base)
2208.4.2 by Andrew Bennetts
Always POST to the same .bzr/smart URL for a given branch, even when accessing files in subdirectories.
546
        url = urlutils.join(self.base[len('bzr+'):], relpath)
547
        url = urlutils.normalize_url(url)
2485.8.26 by Vincent Ladeuil
Finish remote refactoring. Test suite passing.
548
        return urlutils.relative_url(http_base, url)
2190.1.3 by John Arbash Meinel
Implement bzr+http://
549
550
    def clone(self, relative_url):
2413.2.1 by Andrew Bennetts
Rename Smart.*Transport classes to RemoteTransport, RemoteTCPTransport, etc.
551
        """Make a new RemoteHTTPTransport related to me.
2190.1.3 by John Arbash Meinel
Implement bzr+http://
552
553
        This is re-implemented rather than using the default
2413.2.1 by Andrew Bennetts
Rename Smart.*Transport classes to RemoteTransport, RemoteTCPTransport, etc.
554
        RemoteTransport.clone() because we must be careful about the underlying
2190.1.3 by John Arbash Meinel
Implement bzr+http://
555
        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.
556
557
        Also, the cloned smart transport will POST to the same .bzr/smart
558
        location as this transport (although obviously the relative paths in the
559
        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')).
560
        have to handle .bzr/smart requests at arbitrary places inside .bzr
561
        directories, just at the initial URL the user uses.
2190.1.3 by John Arbash Meinel
Implement bzr+http://
562
        """
563
        if relative_url:
564
            abs_url = self.abspath(relative_url)
565
        else:
566
            abs_url = self.base
2485.8.59 by Vincent Ladeuil
Update from review comments.
567
        return RemoteHTTPTransport(abs_url,
568
                                   _from_transport=self,
3104.4.2 by Andrew Bennetts
All tests passing.
569
                                   http_transport=self._http_transport)
2190.1.3 by John Arbash Meinel
Implement bzr+http://
570
3878.4.6 by Vincent Ladeuil
Fix bug #270863 by preserving 'bzr+http[s]' decorator.
571
    def _redirected_to(self, source, target):
572
        """See transport._redirected_to"""
573
        redirected = self._http_transport._redirected_to(source, target)
574
        if (redirected is not None
575
            and isinstance(redirected, type(self._http_transport))):
576
            return RemoteHTTPTransport('bzr+' + redirected.external_url(),
577
                                       http_transport=redirected)
578
        else:
579
            # Either None or a transport for a different protocol
580
            return redirected
581
2190.1.3 by John Arbash Meinel
Implement bzr+http://
582
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)
583
def get_test_permutations():
584
    """Return (transport, server) permutations for testing."""
585
    ### We may need a little more test framework support to construct an
586
    ### appropriate RemoteTransport in the future.
2018.5.21 by Andrew Bennetts
Move bzrlib.transport.smart to bzrlib.smart
587
    from bzrlib.smart import server
2413.2.1 by Andrew Bennetts
Rename Smart.*Transport classes to RemoteTransport, RemoteTCPTransport, etc.
588
    return [(RemoteTCPTransport, server.SmartTCPServer_for_testing)]