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