/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
6609.2.1 by Vincent Ladeuil
Make all transport put_bytes() raises TypeError when given unicode strings rather than bytes.
1
# Copyright (C) 2006-2012, 2016 Canonical Ltd
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
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
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
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
6670.4.16 by Jelmer Vernooij
Move smart to breezy.bzr.
20
imported from breezy.bzr.smart.
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
21
"""
22
6379.6.7 by Jelmer Vernooij
Move importing from future until after doc string, otherwise the doc string will disappear.
23
from __future__ import absolute_import
24
2018.5.147 by Andrew Bennetts
Merge rename-SmartTransport branch.
25
__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
26
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
27
from .. 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,
2655.1.1 by John Arbash Meinel
Add some more hpss logging.
31
    trace,
1910.19.13 by Andrew Bennetts
Address various review comments.
32
    transport,
33
    urlutils,
34
    )
6670.4.14 by Jelmer Vernooij
Move remote to breezy.bzr.
35
from ..bzr import (
36
    remote,
37
    )
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
38
from ..sixish import (
6621.22.2 by Martin
Use BytesIO or StringIO from bzrlib.sixish
39
    BytesIO,
40
    )
6670.4.16 by Jelmer Vernooij
Move smart to breezy.bzr.
41
from ..bzr.smart import client, medium
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
42
43
2018.5.19 by Andrew Bennetts
Add docstrings to all the new modules, and a few other places.
44
class _SmartStat(object):
1752.2.48 by Andrew Bennetts
Support stat
45
46
    def __init__(self, size, mode):
47
        self.st_size = size
48
        self.st_mode = mode
49
50
3734.2.3 by Vincent Ladeuil
Don't use multiple inheritance for http smart medium since we
51
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
52
    """Connection to a smart server.
53
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.
54
    The connection holds references to the medium that can be used to send
55
    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
56
57
    The connection has a notion of the current directory to which it's
58
    connected; this is incorporated in filenames passed to the server.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
59
60
    This supports some higher-level RPC operations and can also be treated
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
61
    like a Transport to do file-like operations.
62
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.
63
    The connection can be made over a tcp socket, an ssh pipe or a series of
64
    http requests.  There are concrete subclasses for each type:
2018.5.147 by Andrew Bennetts
Merge rename-SmartTransport branch.
65
    RemoteTCPTransport, etc.
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
66
    """
67
3805.4.4 by John Arbash Meinel
Change to a 5MB request chunk, and add a bit more debug logging.
68
    # When making a readv request, cap it at requesting 5MB of data
69
    _max_readv_bytes = 5*1024*1024
3805.4.3 by John Arbash Meinel
Reorganize the new code, add some debugging.
70
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)
71
    # 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.
72
    # responsibilities: Put those on SmartClient or similar. This is vital for
73
    # the ability to support multiple versions of the smart protocol over time:
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
74
    # 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.
75
    # SmartClient model, not an encoder.
76
2485.8.42 by Vincent Ladeuil
Finish (almost) remote refactoring. Test suite passing.
77
    # FIXME: the medium parameter should be private, only the tests requires
78
    # it. It may be even clearer to define a TestRemoteTransport that handles
79
    # the specific cases of providing a _client and/or a _medium, and leave
80
    # RemoteTransport as an abstract class.
2485.8.59 by Vincent Ladeuil
Update from review comments.
81
    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.
82
        """Constructor.
83
2485.8.59 by Vincent Ladeuil
Update from review comments.
84
        :param _from_transport: Another RemoteTransport instance that this
2485.8.26 by Vincent Ladeuil
Finish remote refactoring. Test suite passing.
85
            one is being cloned from.  Attributes such as the medium will
86
            be reused.
87
3431.3.6 by Andrew Bennetts
Update RemoteTransport.__init__ docstring to reflect reality, and disallow passing of both medium and _from_transport.
88
        :param medium: The medium to use for this RemoteTransport.  If None,
89
            the medium from the _from_transport is shared.  If both this
90
            and _from_transport are None, a new medium will be built.
91
            _from_transport and medium cannot both be specified.
2485.8.26 by Vincent Ladeuil
Finish remote refactoring. Test suite passing.
92
2466.2.4 by Andrew Bennetts
Tweaks asked for by Robert.
93
        :param _client: Override the _SmartClient used by this transport.  This
94
            should only be used for testing purposes; normally this is
95
            determined from the medium.
1910.19.11 by Andrew Bennetts
General code cleanup based on review comments and other observations.
96
        """
4053.1.1 by Robert Collins
New version of the BzrDir.find_repository verb supporting _network_name to support removing more _ensure_real calls.
97
        super(RemoteTransport, self).__init__(
98
            url, _from_transport=_from_transport)
2485.8.42 by Vincent Ladeuil
Finish (almost) remote refactoring. Test suite passing.
99
2485.8.54 by Vincent Ladeuil
Refactor medium uses by making a distinction betweem shared and real medium.
100
        # The medium is the connection, except when we need to share it with
101
        # other objects (RemoteBzrDir, RemoteRepository etc). In these cases
102
        # what we want to share is really the shared connection.
103
4053.1.1 by Robert Collins
New version of the BzrDir.find_repository verb supporting _network_name to support removing more _ensure_real calls.
104
        if (_from_transport is not None
105
            and isinstance(_from_transport, RemoteTransport)):
106
            _client = _from_transport._client
107
        elif _from_transport is None:
2485.8.59 by Vincent Ladeuil
Update from review comments.
108
            # 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.
109
            # shared medium.
110
            credentials = None
111
            if medium is None:
112
                medium, credentials = self._build_medium()
2655.1.1 by John Arbash Meinel
Add some more hpss logging.
113
                if 'hpss' in debug.debug_flags:
114
                    trace.mutter('hpss: Built a new medium: %s',
115
                                 medium.__class__.__name__)
116
            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.
117
                                                                  credentials,
118
                                                                  self.base)
3431.3.6 by Andrew Bennetts
Update RemoteTransport.__init__ docstring to reflect reality, and disallow passing of both medium and _from_transport.
119
        elif medium is None:
120
            # No medium was specified, so share the medium from the
121
            # _from_transport.
122
            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.
123
        else:
3431.3.6 by Andrew Bennetts
Update RemoteTransport.__init__ docstring to reflect reality, and disallow passing of both medium and _from_transport.
124
            raise AssertionError(
125
                "Both _from_transport (%r) and medium (%r) passed to "
126
                "RemoteTransport.__init__, but these parameters are mutally "
127
                "exclusive." % (_from_transport, medium))
2485.8.54 by Vincent Ladeuil
Refactor medium uses by making a distinction betweem shared and real medium.
128
2466.2.2 by Andrew Bennetts
Add tests for RemoteTransport.is_readonly in the style of the other remote object tests.
129
        if _client is None:
3431.3.2 by Andrew Bennetts
Remove 'base' from _SmartClient entirely, now that the medium has it.
130
            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.
131
        else:
132
            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.
133
2485.8.54 by Vincent Ladeuil
Refactor medium uses by making a distinction betweem shared and real medium.
134
    def _build_medium(self):
2485.8.59 by Vincent Ladeuil
Update from review comments.
135
        """Create the medium if _from_transport does not provide one.
2485.8.42 by Vincent Ladeuil
Finish (almost) remote refactoring. Test suite passing.
136
137
        The medium is analogous to the connection for ConnectedTransport: it
2485.8.26 by Vincent Ladeuil
Finish remote refactoring. Test suite passing.
138
        allows connection sharing.
1752.2.4 by Martin Pool
Refactor SFTP transport to allow code sharing with SSH.
139
        """
2485.8.54 by Vincent Ladeuil
Refactor medium uses by making a distinction betweem shared and real medium.
140
        # No credentials
141
        return None, None
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
142
3958.1.1 by Andrew Bennetts
Report traffic on smart media as transport activity.
143
    def _report_activity(self, bytes, direction):
144
        """See Transport._report_activity.
145
146
        Does nothing; the smart medium will report activity triggered by a
147
        RemoteTransport.
148
        """
149
        pass
150
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
151
    def is_readonly(self):
152
        """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.
153
        try:
154
            resp = self._call2('Transport.is_readonly')
155
        except errors.UnknownSmartMethod:
2466.2.4 by Andrew Bennetts
Tweaks asked for by Robert.
156
            # XXX: nasty hack: servers before 0.16 don't have a
157
            # 'Transport.is_readonly' verb, so we do what clients before 0.16
158
            # did: assume False.
2466.2.1 by Andrew Bennetts
Fix incompatibility with < 0.16 smart servers.
159
            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.
160
        if resp == ('yes', ):
161
            return True
162
        elif resp == ('no', ):
163
            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.
164
        else:
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
165
            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.
166
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
167
    def get_smart_client(self):
2485.8.42 by Vincent Ladeuil
Finish (almost) remote refactoring. Test suite passing.
168
        return self._get_connection()
2018.2.3 by Andrew Bennetts
Starting factoring out the smart server client "medium" from the protocol.
169
170
    def get_smart_medium(self):
2485.8.42 by Vincent Ladeuil
Finish (almost) remote refactoring. Test suite passing.
171
        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
172
173
    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.
174
        """Returns the Unicode version of the absolute path for relpath."""
6055.2.16 by Jelmer Vernooij
Move _combine_paths to URL.
175
        return urlutils.URL._combine_paths(self._parsed_url.path, relpath)
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
176
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
177
    def _call(self, method, *args):
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
178
        resp = self._call2(method, *args)
179
        self._ensure_ok(resp)
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
180
181
    def _call2(self, method, *args):
182
        """Call a method on the remote server."""
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
183
        try:
184
            return self._client.call(method, *args)
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
185
        except errors.ErrorFromSmartServer as err:
3840.1.1 by Andrew Bennetts
Fix RemoteTransport's translation of errors involving paths; it wasn't passing orig_path to _translate_error.
186
            # The first argument, if present, is always a path.
187
            if args:
3840.1.2 by Andrew Bennetts
Improvements suggested by review.
188
                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.
189
            else:
190
                context = {}
191
            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.
192
193
    def _call_with_body_bytes(self, method, args, body):
194
        """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.
195
        try:
196
            return self._client.call_with_body_bytes(method, args, body)
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
197
        except errors.ErrorFromSmartServer as err:
3840.1.2 by Andrew Bennetts
Improvements suggested by review.
198
            # The first argument, if present, is always a path.
199
            if args:
200
                context = {'relpath': args[0]}
201
            else:
202
                context = {}
203
            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.
204
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
205
    def has(self, relpath):
206
        """Indicate whether a remote file of the given name exists or not.
207
208
        :see: Transport.has()
209
        """
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
210
        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
211
        if resp == ('yes', ):
212
            return True
213
        elif resp == ('no', ):
214
            return False
215
        else:
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
216
            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
217
1752.2.2 by Martin Pool
SSH get method; more development of framework.
218
    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
219
        """Return file-like object reading the contents of a remote file.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
220
1910.19.13 by Andrew Bennetts
Address various review comments.
221
        :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
222
        """
6621.22.2 by Martin
Use BytesIO or StringIO from bzrlib.sixish
223
        return BytesIO(self.get_bytes(relpath))
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
224
225
    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
226
        remote = self._remote_path(relpath)
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
227
        try:
228
            resp, response_handler = self._client.call_expecting_body('get', remote)
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
229
        except errors.ErrorFromSmartServer as err:
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
230
            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
231
        if resp != ('ok', ):
3245.4.37 by Andrew Bennetts
Add test for sending ProtocolThreeResponder.send_error(UnknownSmartMethod(...)).
232
            response_handler.cancel_read_body()
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
233
            raise errors.UnexpectedSmartServerResponse(resp)
234
        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
235
1910.19.13 by Andrew Bennetts
Address various review comments.
236
    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
237
        if mode is None:
238
            return ''
239
        else:
240
            return '%d' % mode
241
242
    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.
243
        resp = self._call2('mkdir', self._remote_path(relpath),
244
            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
245
2671.3.9 by Robert Collins
Review feedback and fix VFat emulated transports to not claim to have unix permissions.
246
    def open_write_stream(self, relpath, mode=None):
247
        """See Transport.open_write_stream."""
2671.3.6 by Robert Collins
Review feedback.
248
        self.put_bytes(relpath, "", mode)
249
        result = transport.AppendBasedFileStream(self, relpath)
250
        transport._file_streams[self.abspath(relpath)] = result
251
        return result
2671.3.2 by Robert Collins
Start open_file_stream logic.
252
6609.2.1 by Vincent Ladeuil
Make all transport put_bytes() raises TypeError when given unicode strings rather than bytes.
253
    def put_bytes(self, relpath, raw_bytes, mode=None):
254
        if not isinstance(raw_bytes, str):
255
            raise TypeError(
256
                'raw_bytes must be a plain string, not %s' % type(raw_bytes))
257
        resp = self._call_with_body_bytes(
258
            'put',
1910.19.13 by Andrew Bennetts
Address various review comments.
259
            (self._remote_path(relpath), self._serialise_optional_mode(mode)),
6609.2.1 by Vincent Ladeuil
Make all transport put_bytes() raises TypeError when given unicode strings rather than bytes.
260
            raw_bytes)
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
261
        self._ensure_ok(resp)
6609.2.1 by Vincent Ladeuil
Make all transport put_bytes() raises TypeError when given unicode strings rather than bytes.
262
        return len(raw_bytes)
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
263
6609.2.1 by Vincent Ladeuil
Make all transport put_bytes() raises TypeError when given unicode strings rather than bytes.
264
    def put_bytes_non_atomic(self, relpath, raw_bytes, mode=None,
2017.2.1 by John Arbash Meinel
Implement put_bytes_non_atomic for the smart transport
265
                             create_parent_dir=False,
266
                             dir_mode=None):
1910.19.24 by Robert Collins
Touchup method order.
267
        """See Transport.put_bytes_non_atomic."""
268
        # FIXME: no encoding in the transport!
2017.2.1 by John Arbash Meinel
Implement put_bytes_non_atomic for the smart transport
269
        create_parent_str = 'F'
270
        if create_parent_dir:
271
            create_parent_str = 'T'
272
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
273
        resp = self._call_with_body_bytes(
2017.2.1 by John Arbash Meinel
Implement put_bytes_non_atomic for the smart transport
274
            'put_non_atomic',
275
            (self._remote_path(relpath), self._serialise_optional_mode(mode),
276
             create_parent_str, self._serialise_optional_mode(dir_mode)),
6609.2.1 by Vincent Ladeuil
Make all transport put_bytes() raises TypeError when given unicode strings rather than bytes.
277
            raw_bytes)
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
278
        self._ensure_ok(resp)
2017.2.1 by John Arbash Meinel
Implement put_bytes_non_atomic for the smart transport
279
1910.19.24 by Robert Collins
Touchup method order.
280
    def put_file(self, relpath, upload_file, mode=None):
281
        # its not ideal to seek back, but currently put_non_atomic_file depends
282
        # on transports not reading before failing - which is a faulty
283
        # assumption I think - RBC 20060915
284
        pos = upload_file.tell()
285
        try:
286
            return self.put_bytes(relpath, upload_file.read(), mode)
287
        except:
288
            upload_file.seek(pos)
289
            raise
290
291
    def put_file_non_atomic(self, relpath, f, mode=None,
292
                            create_parent_dir=False,
293
                            dir_mode=None):
294
        return self.put_bytes_non_atomic(relpath, f.read(), mode=mode,
295
                                         create_parent_dir=create_parent_dir,
296
                                         dir_mode=dir_mode)
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
297
1910.19.13 by Andrew Bennetts
Address various review comments.
298
    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.
299
        return self.append_bytes(relpath, from_file.read(), mode)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
300
1910.19.13 by Andrew Bennetts
Address various review comments.
301
    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.
302
        resp = self._call_with_body_bytes(
1910.19.13 by Andrew Bennetts
Address various review comments.
303
            'append',
304
            (self._remote_path(relpath), self._serialise_optional_mode(mode)),
305
            bytes)
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
306
        if resp[0] == 'appended':
307
            return int(resp[1])
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
308
        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
309
310
    def delete(self, relpath):
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
311
        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.
312
        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
313
2634.1.1 by Robert Collins
(robertc) Reinstate the accidentally backed out external_url patch.
314
    def external_url(self):
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
315
        """See breezy.transport.Transport.external_url."""
2634.1.1 by Robert Collins
(robertc) Reinstate the accidentally backed out external_url patch.
316
        # the external path for RemoteTransports is the base
317
        return self.base
318
3183.2.1 by Andrew Bennetts
Set the recommended page size for RemoteTransport to 64k.
319
    def recommended_page_size(self):
320
        """Return the recommended page size for this transport."""
321
        return 64 * 1024
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
322
2745.5.1 by Robert Collins
* New parameter on ``bzrlib.transport.Transport.readv``
323
    def _readv(self, relpath, offsets):
1910.19.17 by John Arbash Meinel
Implement readv() for the SmartServer
324
        if not offsets:
325
            return
326
327
        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
328
329
        sorted_offsets = sorted(offsets)
330
        coalesced = list(self._coalesce_offsets(sorted_offsets,
331
                               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.
332
                               fudge_factor=self._bytes_to_read_before_seek,
333
                               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
334
3805.4.3 by John Arbash Meinel
Reorganize the new code, add some debugging.
335
        # now that we've coallesced things, avoid making enormous requests
3805.4.1 by John Arbash Meinel
Change the default readv() packing rules.
336
        requests = []
337
        cur_request = []
338
        cur_len = 0
339
        for c in coalesced:
3805.4.4 by John Arbash Meinel
Change to a 5MB request chunk, and add a bit more debug logging.
340
            if c.length + cur_len > self._max_readv_bytes:
3805.4.1 by John Arbash Meinel
Change the default readv() packing rules.
341
                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
342
                cur_request = [c]
343
                cur_len = c.length
3805.4.1 by John Arbash Meinel
Change the default readv() packing rules.
344
                continue
345
            cur_request.append(c)
346
            cur_len += c.length
3805.4.5 by John Arbash Meinel
when splitting a readv, we need to start at the last offset,
347
        if cur_request:
348
            requests.append(cur_request)
3805.4.3 by John Arbash Meinel
Reorganize the new code, add some debugging.
349
        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,
350
            trace.mutter('%s.readv %s offsets => %s coalesced'
351
                         ' => %s requests (%s)',
3805.4.4 by John Arbash Meinel
Change to a 5MB request chunk, and add a bit more debug logging.
352
                         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,
353
                         len(requests), sum(map(len, requests)))
3805.4.1 by John Arbash Meinel
Change the default readv() packing rules.
354
        # Cache the results, but only until they have been fulfilled
355
        data_map = {}
3805.4.5 by John Arbash Meinel
when splitting a readv, we need to start at the last offset,
356
        # 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
357
        offset_stack = iter(offsets)
3805.4.5 by John Arbash Meinel
when splitting a readv, we need to start at the last offset,
358
        # using a list so it can be modified when passing down and coming back
6634.2.1 by Martin
Apply 2to3 next fixer and make compatible
359
        next_offset = [next(offset_stack)]
3805.4.1 by John Arbash Meinel
Change the default readv() packing rules.
360
        for cur_request in requests:
361
            try:
362
                result = self._client.call_with_body_readv_array(
363
                    ('readv', self._remote_path(relpath),),
364
                    [(c.start, c.length) for c in cur_request])
365
                resp, response_handler = result
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
366
            except errors.ErrorFromSmartServer as err:
3840.1.2 by Andrew Bennetts
Improvements suggested by review.
367
                self._translate_error(err, relpath)
3805.4.1 by John Arbash Meinel
Change the default readv() packing rules.
368
369
            if resp[0] != 'readv':
370
                # This should raise an exception
371
                response_handler.cancel_read_body()
372
                raise errors.UnexpectedSmartServerResponse(resp)
373
374
            for res in self._handle_response(offset_stack, cur_request,
375
                                             response_handler,
3805.4.5 by John Arbash Meinel
when splitting a readv, we need to start at the last offset,
376
                                             data_map,
377
                                             next_offset):
3805.4.1 by John Arbash Meinel
Change the default readv() packing rules.
378
                yield res
379
380
    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,
381
                         data_map, next_offset):
382
        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.
383
        # 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.
384
        data = response_handler.read_body_bytes()
3649.5.3 by John Arbash Meinel
Don't downsize the data buffer while reading.
385
        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
386
        for c_offset in coalesced:
387
            if len(data) < c_offset.length:
388
                raise errors.ShortReadvError(relpath, c_offset.start,
389
                            c_offset.length, actual=len(data))
390
            for suboffset, subsize in c_offset.ranges:
391
                key = (c_offset.start+suboffset, subsize)
3649.5.3 by John Arbash Meinel
Don't downsize the data buffer while reading.
392
                this_data = data[data_offset+suboffset:
393
                                 data_offset+suboffset+subsize]
394
                # Special case when the data is in-order, rather than packing
395
                # into a map and then back out again. Benchmarking shows that
396
                # this has 100% hit rate, but leave in the data_map work just
397
                # in case.
398
                # TODO: Could we get away with using buffer() to avoid the
399
                #       memory copy?  Callers would need to realize they may
400
                #       not have a real string.
401
                if key == cur_offset_and_size:
402
                    yield cur_offset_and_size[0], this_data
6634.2.1 by Martin
Apply 2to3 next fixer and make compatible
403
                    cur_offset_and_size = next_offset[0] = next(offset_stack)
3649.5.3 by John Arbash Meinel
Don't downsize the data buffer while reading.
404
                else:
405
                    data_map[key] = this_data
406
            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
407
408
            # Now that we've read some data, see if we can yield anything back
409
            while cur_offset_and_size in data_map:
410
                this_data = data_map.pop(cur_offset_and_size)
411
                yield cur_offset_and_size[0], this_data
6634.2.1 by Martin
Apply 2to3 next fixer and make compatible
412
                cur_offset_and_size = next_offset[0] = next(offset_stack)
1910.19.17 by John Arbash Meinel
Implement readv() for the SmartServer
413
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
414
    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.
415
        self._call('rename',
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
416
                   self._remote_path(rel_from),
417
                   self._remote_path(rel_to))
418
419
    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.
420
        self._call('move',
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
421
                   self._remote_path(rel_from),
422
                   self._remote_path(rel_to))
423
424
    def rmdir(self, relpath):
425
        resp = self._call('rmdir', self._remote_path(relpath))
426
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
427
    def _ensure_ok(self, resp):
428
        if resp[0] != 'ok':
429
            raise errors.UnexpectedSmartServerResponse(resp)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
430
3840.1.2 by Andrew Bennetts
Improvements suggested by review.
431
    def _translate_error(self, err, relpath=None):
432
        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
433
434
    def disconnect(self):
5247.2.12 by Vincent Ladeuil
Ensure that all transports close their underlying connection.
435
        m = self.get_smart_medium()
436
        if m is not None:
437
            m.disconnect()
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
438
439
    def stat(self, relpath):
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
440
        resp = self._call2('stat', self._remote_path(relpath))
1752.2.48 by Andrew Bennetts
Support stat
441
        if resp[0] == 'stat':
2018.5.19 by Andrew Bennetts
Add docstrings to all the new modules, and a few other places.
442
            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.
443
        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
444
445
    ## def lock_read(self, relpath):
446
    ##     """Lock the given file for shared (read) access.
447
    ##     :return: A lock object, which should be passed to Transport.unlock()
448
    ##     """
449
    ##     # The old RemoteBranch ignore lock for reading, so we will
450
    ##     # continue that tradition and return a bogus lock object.
451
    ##     class BogusLock(object):
452
    ##         def __init__(self, path):
453
    ##             self.path = path
454
    ##         def unlock(self):
455
    ##             pass
456
    ##     return BogusLock(relpath)
457
1752.2.42 by Andrew Bennetts
Add list_dir and iter_files_recursive smart transport
458
    def listable(self):
459
        return True
460
461
    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.
462
        resp = self._call2('list_dir', self._remote_path(relpath))
1752.2.42 by Andrew Bennetts
Add list_dir and iter_files_recursive smart transport
463
        if resp[0] == 'names':
1752.2.47 by Andrew Bennetts
Fix SmartTransport.list_dir to return ascii.
464
            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.
465
        raise errors.UnexpectedSmartServerResponse(resp)
1752.2.42 by Andrew Bennetts
Add list_dir and iter_files_recursive smart transport
466
467
    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.
468
        resp = self._call2('iter_files_recursive', self._remote_path(''))
1752.2.42 by Andrew Bennetts
Add list_dir and iter_files_recursive smart transport
469
        if resp[0] == 'names':
470
            return resp[1:]
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
471
        raise errors.UnexpectedSmartServerResponse(resp)
1752.2.42 by Andrew Bennetts
Add list_dir and iter_files_recursive smart transport
472
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
473
2413.2.1 by Andrew Bennetts
Rename Smart.*Transport classes to RemoteTransport, RemoteTCPTransport, etc.
474
class RemoteTCPTransport(RemoteTransport):
2018.2.3 by Andrew Bennetts
Starting factoring out the smart server client "medium" from the protocol.
475
    """Connection to smart server over plain tcp.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
476
2018.2.3 by Andrew Bennetts
Starting factoring out the smart server client "medium" from the protocol.
477
    This is essentially just a factory to get 'RemoteTransport(url,
478
        SmartTCPClientMedium).
479
    """
480
2485.8.54 by Vincent Ladeuil
Refactor medium uses by making a distinction betweem shared and real medium.
481
    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.
482
        client_medium = medium.SmartTCPClientMedium(
6055.2.1 by Jelmer Vernooij
Add UnparsedUrl.
483
            self._parsed_url.host, self._parsed_url.port, 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.
484
        return client_medium, None
2413.2.1 by Andrew Bennetts
Rename Smart.*Transport classes to RemoteTransport, RemoteTCPTransport, etc.
485
486
3453.5.1 by Andrew Bennetts
Add {bzrdir,repository,branch}_implementations tests for Remote objects using protocol v2 and pre-1.6 RPCs.
487
class RemoteTCPTransportV2Only(RemoteTransport):
488
    """Connection to smart server over plain tcp with the client hard-coded to
489
    assume protocol v2 and remote server version <= 1.6.
490
491
    This should only be used for testing.
492
    """
493
494
    def _build_medium(self):
495
        client_medium = medium.SmartTCPClientMedium(
6055.2.1 by Jelmer Vernooij
Add UnparsedUrl.
496
            self._parsed_url.host, self._parsed_url.port, self.base)
3453.5.1 by Andrew Bennetts
Add {bzrdir,repository,branch}_implementations tests for Remote objects using protocol v2 and pre-1.6 RPCs.
497
        client_medium._protocol_version = 2
3453.5.7 by Andrew Bennetts
Fix error introduced by merge.
498
        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.
499
        return client_medium, None
500
501
2413.2.1 by Andrew Bennetts
Rename Smart.*Transport classes to RemoteTransport, RemoteTCPTransport, etc.
502
class RemoteSSHTransport(RemoteTransport):
2018.2.27 by Andrew Bennetts
Merge from bzr.dev
503
    """Connection to smart server over SSH.
504
505
    This is essentially just a factory to get 'RemoteTransport(url,
506
        SmartSSHClientMedium).
507
    """
508
2485.8.54 by Vincent Ladeuil
Refactor medium uses by making a distinction betweem shared and real medium.
509
    def _build_medium(self):
1551.18.17 by Aaron Bentley
Introduce bzr_remote_path configuration variable
510
        location_config = config.LocationConfig(self.base)
511
        bzr_remote_path = location_config.get_bzr_remote_path()
6055.2.1 by Jelmer Vernooij
Add UnparsedUrl.
512
        user = self._parsed_url.user
3777.1.3 by Aaron Bentley
Use SSH default username from authentication.conf
513
        if user is None:
514
            auth = config.AuthenticationConfig()
6055.2.1 by Jelmer Vernooij
Add UnparsedUrl.
515
            user = auth.get_user('ssh', self._parsed_url.host,
516
                self._parsed_url.port)
517
        ssh_params = medium.SSHParams(self._parsed_url.host,
518
                self._parsed_url.port, user, self._parsed_url.password,
519
                bzr_remote_path)
5284.5.1 by Andrew Bennetts
Use socketpairs (rather than pipes) for SSH subprocesses where possible, and formalise some internal APIs a little more.
520
        client_medium = medium.SmartSSHClientMedium(self.base, ssh_params)
6055.2.1 by Jelmer Vernooij
Add UnparsedUrl.
521
        return client_medium, (user, self._parsed_url.password)
2413.2.1 by Andrew Bennetts
Rename Smart.*Transport classes to RemoteTransport, RemoteTCPTransport, etc.
522
523
524
class RemoteHTTPTransport(RemoteTransport):
2190.1.3 by John Arbash Meinel
Implement bzr+http://
525
    """Just a way to connect between a bzr+http:// url and http://.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
526
2413.2.1 by Andrew Bennetts
Rename Smart.*Transport classes to RemoteTransport, RemoteTCPTransport, etc.
527
    This connection operates slightly differently than the RemoteSSHTransport.
2190.1.3 by John Arbash Meinel
Implement bzr+http://
528
    It uses a plain http:// transport underneath, which defines what remote
529
    .bzr/smart URL we are connected to. From there, all paths that are sent are
530
    sent as relative paths, this way, the remote side can properly
2190.1.5 by John Arbash Meinel
Typo fix from Martin
531
    de-reference them, since it is likely doing rewrite rules to translate an
2190.1.3 by John Arbash Meinel
Implement bzr+http://
532
    HTTP path into a local path.
533
    """
534
2485.8.59 by Vincent Ladeuil
Update from review comments.
535
    def __init__(self, base, _from_transport=None, http_transport=None):
2190.1.3 by John Arbash Meinel
Implement bzr+http://
536
        if http_transport is None:
2485.8.46 by Vincent Ladeuil
Add some remarks about current limitations in connection sharing.
537
            # FIXME: the password may be lost here because it appears in the
538
            # url only for an intial construction (when the url came from the
539
            # command-line).
2485.8.26 by Vincent Ladeuil
Finish remote refactoring. Test suite passing.
540
            http_url = base[len('bzr+'):]
6083.1.1 by Jelmer Vernooij
Use get_transport_from_{url,path} in more places.
541
            self._http_transport = transport.get_transport_from_url(http_url)
2190.1.3 by John Arbash Meinel
Implement bzr+http://
542
        else:
543
            self._http_transport = http_transport
2485.8.59 by Vincent Ladeuil
Update from review comments.
544
        super(RemoteHTTPTransport, self).__init__(
545
            base, _from_transport=_from_transport)
2485.8.26 by Vincent Ladeuil
Finish remote refactoring. Test suite passing.
546
2485.8.54 by Vincent Ladeuil
Refactor medium uses by making a distinction betweem shared and real medium.
547
    def _build_medium(self):
548
        # We let http_transport take care of the credentials
549
        return self._http_transport.get_smart_medium(), None
2190.1.3 by John Arbash Meinel
Implement bzr+http://
550
3104.4.2 by Andrew Bennetts
All tests passing.
551
    def _remote_path(self, relpath):
2485.8.29 by Vincent Ladeuil
Cometic changes (and a typo).
552
        """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.
553
        # Adjust the relpath based on which URL this smart transport is
554
        # connected to.
3104.4.1 by Andrew Bennetts
Fix paths sent by bzr+http client to correctly adjust for shared medium.
555
        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.
556
        url = urlutils.join(self.base[len('bzr+'):], relpath)
557
        url = urlutils.normalize_url(url)
2485.8.26 by Vincent Ladeuil
Finish remote refactoring. Test suite passing.
558
        return urlutils.relative_url(http_base, url)
2190.1.3 by John Arbash Meinel
Implement bzr+http://
559
560
    def clone(self, relative_url):
2413.2.1 by Andrew Bennetts
Rename Smart.*Transport classes to RemoteTransport, RemoteTCPTransport, etc.
561
        """Make a new RemoteHTTPTransport related to me.
2190.1.3 by John Arbash Meinel
Implement bzr+http://
562
563
        This is re-implemented rather than using the default
2413.2.1 by Andrew Bennetts
Rename Smart.*Transport classes to RemoteTransport, RemoteTCPTransport, etc.
564
        RemoteTransport.clone() because we must be careful about the underlying
2190.1.3 by John Arbash Meinel
Implement bzr+http://
565
        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.
566
567
        Also, the cloned smart transport will POST to the same .bzr/smart
568
        location as this transport (although obviously the relative paths in the
569
        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')).
570
        have to handle .bzr/smart requests at arbitrary places inside .bzr
571
        directories, just at the initial URL the user uses.
2190.1.3 by John Arbash Meinel
Implement bzr+http://
572
        """
573
        if relative_url:
574
            abs_url = self.abspath(relative_url)
575
        else:
576
            abs_url = self.base
2485.8.59 by Vincent Ladeuil
Update from review comments.
577
        return RemoteHTTPTransport(abs_url,
578
                                   _from_transport=self,
3104.4.2 by Andrew Bennetts
All tests passing.
579
                                   http_transport=self._http_transport)
2190.1.3 by John Arbash Meinel
Implement bzr+http://
580
3878.4.6 by Vincent Ladeuil
Fix bug #270863 by preserving 'bzr+http[s]' decorator.
581
    def _redirected_to(self, source, target):
582
        """See transport._redirected_to"""
583
        redirected = self._http_transport._redirected_to(source, target)
584
        if (redirected is not None
585
            and isinstance(redirected, type(self._http_transport))):
586
            return RemoteHTTPTransport('bzr+' + redirected.external_url(),
587
                                       http_transport=redirected)
588
        else:
589
            # Either None or a transport for a different protocol
590
            return redirected
591
2190.1.3 by John Arbash Meinel
Implement bzr+http://
592
4011.4.1 by Jelmer Vernooij
Point out bzr+ssh:// to the user when they use ssh://.
593
class HintingSSHTransport(transport.Transport):
594
    """Simple transport that handles ssh:// and points out bzr+ssh://."""
595
596
    def __init__(self, url):
4032.1.2 by John Arbash Meinel
Track down a few more files that have trailing whitespace.
597
        raise errors.UnsupportedProtocol(url,
4011.4.2 by Jelmer Vernooij
Register ssh: rather than ssh://, avoid referring to smart server, which users may not be familiar with.
598
            'bzr supports bzr+ssh to operate over ssh, use "bzr+%s".' % url)
4011.4.1 by Jelmer Vernooij
Point out bzr+ssh:// to the user when they use ssh://.
599
600
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)
601
def get_test_permutations():
602
    """Return (transport, server) permutations for testing."""
603
    ### We may need a little more test framework support to construct an
604
    ### appropriate RemoteTransport in the future.
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
605
    from ..tests import test_server
5017.3.18 by Vincent Ladeuil
Move SmartTCPServer_for_testing and friends to bzrlib.tests.test_server
606
    return [(RemoteTCPTransport, test_server.SmartTCPServer_for_testing)]