/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
4763.2.4 by John Arbash Meinel
merge bzr.2.1 in preparation for NEWS entry.
1
# Copyright (C) 2005-2010 Canonical Ltd
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
2
#
1185.11.19 by John Arbash Meinel
Testing put and append, also testing agaist file-like objects as well as strings.
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.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
7
#
1185.11.19 by John Arbash Meinel
Testing put and append, also testing agaist file-like objects as well as strings.
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.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
12
#
1185.11.19 by John Arbash Meinel
Testing put and append, also testing agaist file-like objects as well as strings.
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
1540.3.1 by Martin Pool
First-cut implementation of pycurl. Substantially faster than using urllib.
16
1185.11.19 by John Arbash Meinel
Testing put and append, also testing agaist file-like objects as well as strings.
17
"""Transport is an abstraction layer to handle file access.
18
19
The abstraction is to allow access from the local filesystem, as well
20
as remote (such as http or sftp).
1540.3.12 by Martin Pool
Multiple transports can be registered for any protocol, and they are
21
22
Transports are constructed from a string, being a URL or (as a degenerate
23
case) a local filesystem path.  This is typically the top directory of
24
a bzrdir, repository, or similar object we are interested in working with.
25
The Transport returned has methods to read, write and manipulate files within
26
it.
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
27
"""
28
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
29
from cStringIO import StringIO
30
import sys
31
32
from bzrlib.lazy_import import lazy_import
33
lazy_import(globals(), """
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
34
import errno
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
35
from stat import S_ISDIR
1685.1.70 by Wouter van Heyst
working on get_parent, set_parent and relative urls, broken
36
import urllib
1636.1.1 by Robert Collins
Fix calling relpath() and abspath() on transports at their root.
37
import urlparse
1530.1.1 by Robert Collins
Minimal infrastructure to test TransportTestProviderAdapter.
38
1955.3.6 by John Arbash Meinel
Lots of deprecation warnings, but no errors
39
from bzrlib import (
40
    errors,
41
    osutils,
42
    symbol_versioning,
3882.7.5 by Martin Pool
Further mockup of transport-based activity indicator.
43
    ui,
1955.3.6 by John Arbash Meinel
Lots of deprecation warnings, but no errors
44
    urlutils,
45
    )
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
46
""")
47
1955.3.6 by John Arbash Meinel
Lots of deprecation warnings, but no errors
48
from bzrlib.symbol_versioning import (
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
49
        DEPRECATED_PARAMETER,
1955.3.6 by John Arbash Meinel
Lots of deprecation warnings, but no errors
50
        )
2164.2.21 by Vincent Ladeuil
Take bundles into account.
51
from bzrlib.trace import (
52
    mutter,
53
    )
2241.2.1 by ghigo
Add the TransportRegistry class
54
from bzrlib import registry
2018.5.104 by Andrew Bennetts
Completely rework chrooted transports.
55
56
2671.3.2 by Robert Collins
Start open_file_stream logic.
57
# a dictionary of open file streams. Keys are absolute paths, values are
58
# transport defined.
59
_file_streams = {}
60
61
1530.1.11 by Robert Collins
Push the transport permutations list into each transport module allowing for automatic testing of new modules that are registered as transports.
62
def _get_protocol_handlers():
1540.3.12 by Martin Pool
Multiple transports can be registered for any protocol, and they are
63
    """Return a dictionary of {urlprefix: [factory]}"""
2241.2.3 by ghigo
removed the the registration of the 'None' transport, instead we use the set_default_transport function
64
    return transport_list_registry
1530.1.11 by Robert Collins
Push the transport permutations list into each transport module allowing for automatic testing of new modules that are registered as transports.
65
2241.3.4 by ghigo
Updates on the basis of John Arbash Meinel comments
66
1530.1.11 by Robert Collins
Push the transport permutations list into each transport module allowing for automatic testing of new modules that are registered as transports.
67
def _set_protocol_handlers(new_handlers):
68
    """Replace the current protocol handlers dictionary.
69
70
    WARNING this will remove all build in protocols. Use with care.
71
    """
2241.2.3 by ghigo
removed the the registration of the 'None' transport, instead we use the set_default_transport function
72
    global transport_list_registry
73
    transport_list_registry = new_handlers
1530.1.11 by Robert Collins
Push the transport permutations list into each transport module allowing for automatic testing of new modules that are registered as transports.
74
2241.3.4 by ghigo
Updates on the basis of John Arbash Meinel comments
75
1540.3.12 by Martin Pool
Multiple transports can be registered for any protocol, and they are
76
def _clear_protocol_handlers():
2241.2.3 by ghigo
removed the the registration of the 'None' transport, instead we use the set_default_transport function
77
    global transport_list_registry
78
    transport_list_registry = TransportListRegistry()
1540.3.12 by Martin Pool
Multiple transports can be registered for any protocol, and they are
79
2241.3.4 by ghigo
Updates on the basis of John Arbash Meinel comments
80
1530.1.11 by Robert Collins
Push the transport permutations list into each transport module allowing for automatic testing of new modules that are registered as transports.
81
def _get_transport_modules():
82
    """Return a list of the modules providing transports."""
83
    modules = set()
3882.1.1 by Martin Pool
Don't call iteritems on transport_list_registry, because it may change during iteration
84
    for prefix, factory_list in transport_list_registry.items():
1540.3.12 by Martin Pool
Multiple transports can be registered for any protocol, and they are
85
        for factory in factory_list:
5676.1.6 by Jelmer Vernooij
Add _ObjGetter.get_module.
86
            modules.add(factory.get_module())
4634.44.1 by Andrew Bennetts
First draft of a generic path-filtering transport decorator.
87
    # Add chroot and pathfilter directly, because there is no handler
88
    # registered for it.
2018.5.104 by Andrew Bennetts
Completely rework chrooted transports.
89
    modules.add('bzrlib.transport.chroot')
4634.44.1 by Andrew Bennetts
First draft of a generic path-filtering transport decorator.
90
    modules.add('bzrlib.transport.pathfilter')
1530.1.19 by Robert Collins
Make transport test adapter tests reliable.
91
    result = list(modules)
92
    result.sort()
93
    return result
1530.1.11 by Robert Collins
Push the transport permutations list into each transport module allowing for automatic testing of new modules that are registered as transports.
94
2241.3.4 by ghigo
Updates on the basis of John Arbash Meinel comments
95
2241.2.3 by ghigo
removed the the registration of the 'None' transport, instead we use the set_default_transport function
96
class TransportListRegistry(registry.Registry):
2241.3.4 by ghigo
Updates on the basis of John Arbash Meinel comments
97
    """A registry which simplifies tracking available Transports.
98
3764.1.1 by Vincent Ladeuil
Fix typo
99
    A registration of a new protocol requires two steps:
2241.3.4 by ghigo
Updates on the basis of John Arbash Meinel comments
100
    1) register the prefix with the function register_transport( )
101
    2) register the protocol provider with the function
102
    register_transport_provider( ) ( and the "lazy" variant )
103
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
104
    This is needed because:
4764.1.1 by Vincent Ladeuil
Fix typos.
105
    a) a single provider can support multiple protocols ( like the ftp
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
106
    provider which supports both the ftp:// and the aftp:// protocols )
2241.3.4 by ghigo
Updates on the basis of John Arbash Meinel comments
107
    b) a single protocol can have multiple providers ( like the http://
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
108
    protocol which is supported by both the urllib and pycurl provider )
2241.3.4 by ghigo
Updates on the basis of John Arbash Meinel comments
109
    """
110
2241.2.3 by ghigo
removed the the registration of the 'None' transport, instead we use the set_default_transport function
111
    def register_transport_provider(self, key, obj):
112
        self.get(key).insert(0, registry._ObjectGetter(obj))
113
114
    def register_lazy_transport_provider(self, key, module_name, member_name):
2745.5.3 by Robert Collins
* Move transport logging into a new transport class
115
        self.get(key).insert(0,
2241.2.1 by ghigo
Add the TransportRegistry class
116
                registry._LazyObjectGetter(module_name, member_name))
117
3004.2.1 by Vincent Ladeuil
Fix 150860 by leaving port as user specified it.
118
    def register_transport(self, key, help=None):
119
        self.register(key, [], help)
2241.2.1 by ghigo
Add the TransportRegistry class
120
121
    def set_default_transport(self, key=None):
122
        """Return either 'key' or the default key if key is None"""
123
        self._default_key = key
124
2241.3.4 by ghigo
Updates on the basis of John Arbash Meinel comments
125
2745.5.3 by Robert Collins
* Move transport logging into a new transport class
126
transport_list_registry = TransportListRegistry()
2241.2.1 by ghigo
Add the TransportRegistry class
127
2241.3.4 by ghigo
Updates on the basis of John Arbash Meinel comments
128
3004.2.1 by Vincent Ladeuil
Fix 150860 by leaving port as user specified it.
129
def register_transport_proto(prefix, help=None, info=None,
2919.2.1 by John Arbash Meinel
Register netloc protocols as soon as the protocol is registered.
130
                             register_netloc=False):
3004.2.1 by Vincent Ladeuil
Fix 150860 by leaving port as user specified it.
131
    transport_list_registry.register_transport(prefix, help)
2919.2.1 by John Arbash Meinel
Register netloc protocols as soon as the protocol is registered.
132
    if register_netloc:
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
133
        if not prefix.endswith('://'):
134
            raise ValueError(prefix)
2919.2.1 by John Arbash Meinel
Register netloc protocols as soon as the protocol is registered.
135
        register_urlparse_netloc_protocol(prefix[:-3])
2241.2.1 by ghigo
Add the TransportRegistry class
136
2241.3.4 by ghigo
Updates on the basis of John Arbash Meinel comments
137
2241.2.1 by ghigo
Add the TransportRegistry class
138
def register_lazy_transport(prefix, module, classname):
2241.2.3 by ghigo
removed the the registration of the 'None' transport, instead we use the set_default_transport function
139
    if not prefix in transport_list_registry:
2241.2.2 by ghigo
Create the TransportList class
140
        register_transport_proto(prefix)
2241.2.3 by ghigo
removed the the registration of the 'None' transport, instead we use the set_default_transport function
141
    transport_list_registry.register_lazy_transport_provider(prefix, module, classname)
2241.3.4 by ghigo
Updates on the basis of John Arbash Meinel comments
142
143
2241.2.1 by ghigo
Add the TransportRegistry class
144
def register_transport(prefix, klass, override=DEPRECATED_PARAMETER):
2241.2.3 by ghigo
removed the the registration of the 'None' transport, instead we use the set_default_transport function
145
    if not prefix in transport_list_registry:
2241.2.2 by ghigo
Create the TransportList class
146
        register_transport_proto(prefix)
2241.2.3 by ghigo
removed the the registration of the 'None' transport, instead we use the set_default_transport function
147
    transport_list_registry.register_transport_provider(prefix, klass)
2241.2.1 by ghigo
Add the TransportRegistry class
148
2241.3.4 by ghigo
Updates on the basis of John Arbash Meinel comments
149
1636.1.2 by Robert Collins
More review fixen to the relpath at '/' fixes.
150
def register_urlparse_netloc_protocol(protocol):
1636.1.1 by Robert Collins
Fix calling relpath() and abspath() on transports at their root.
151
    """Ensure that protocol is setup to be used with urlparse netloc parsing."""
152
    if protocol not in urlparse.uses_netloc:
153
        urlparse.uses_netloc.append(protocol)
154
2241.3.4 by ghigo
Updates on the basis of John Arbash Meinel comments
155
2485.8.61 by Vincent Ladeuil
From review comments, use a private scheme for testing.
156
def _unregister_urlparse_netloc_protocol(protocol):
157
    """Remove protocol from urlparse netloc parsing.
158
159
    Except for tests, you should never use that function. Using it with 'http',
160
    for example, will break all http transports.
161
    """
162
    if protocol in urlparse.uses_netloc:
163
        urlparse.uses_netloc.remove(protocol)
164
165
2241.3.5 by ghigo
update to the latest bzr.dev
166
def unregister_transport(scheme, factory):
167
    """Unregister a transport."""
168
    l = transport_list_registry.get(scheme)
169
    for i in l:
170
        o = i.get_obj( )
171
        if o == factory:
172
            transport_list_registry.get(scheme).remove(i)
173
            break
174
    if len(l) == 0:
175
        transport_list_registry.remove(scheme)
176
177
1864.5.9 by John Arbash Meinel
Switch to returning an object to make the api more understandable.
178
class _CoalescedOffset(object):
179
    """A data container for keeping track of coalesced offsets."""
180
181
    __slots__ = ['start', 'length', 'ranges']
182
183
    def __init__(self, start, length, ranges):
184
        self.start = start
185
        self.length = length
186
        self.ranges = ranges
187
188
    def __cmp__(self, other):
189
        return cmp((self.start, self.length, self.ranges),
190
                   (other.start, other.length, other.ranges))
191
3059.2.2 by Vincent Ladeuil
Read http responses on demand without buffering the whole body
192
    def __repr__(self):
193
        return '%s(%r, %r, %r)' % (self.__class__.__name__,
194
            self.start, self.length, self.ranges)
195
1864.5.9 by John Arbash Meinel
Switch to returning an object to make the api more understandable.
196
2052.6.1 by Robert Collins
``Transport.get`` has had its interface made more clear for ease of use.
197
class LateReadError(object):
198
    """A helper for transports which pretends to be a readable file.
199
200
    When read() is called, errors.ReadError is raised.
201
    """
202
203
    def __init__(self, path):
204
        self._path = path
205
206
    def close(self):
207
        """a no-op - do nothing."""
208
2052.6.2 by Robert Collins
Merge bzr.dev.
209
    def _fail(self):
2052.6.1 by Robert Collins
``Transport.get`` has had its interface made more clear for ease of use.
210
        """Raise ReadError."""
211
        raise errors.ReadError(self._path)
212
2052.6.2 by Robert Collins
Merge bzr.dev.
213
    def __iter__(self):
214
        self._fail()
215
216
    def read(self, count=-1):
217
        self._fail()
218
219
    def readlines(self):
220
        self._fail()
221
2052.6.1 by Robert Collins
``Transport.get`` has had its interface made more clear for ease of use.
222
2671.3.6 by Robert Collins
Review feedback.
223
class FileStream(object):
224
    """Base class for FileStreams."""
225
226
    def __init__(self, transport, relpath):
227
        """Create a FileStream for relpath on transport."""
228
        self.transport = transport
229
        self.relpath = relpath
230
231
    def _close(self):
232
        """A hook point for subclasses that need to take action on close."""
233
234
    def close(self):
235
        self._close()
236
        del _file_streams[self.transport.abspath(self.relpath)]
237
238
239
class FileFileStream(FileStream):
2671.3.9 by Robert Collins
Review feedback and fix VFat emulated transports to not claim to have unix permissions.
240
    """A file stream object returned by open_write_stream.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
241
2671.3.6 by Robert Collins
Review feedback.
242
    This version uses a file like object to perform writes.
243
    """
244
245
    def __init__(self, transport, relpath, file_handle):
246
        FileStream.__init__(self, transport, relpath)
247
        self.file_handle = file_handle
248
249
    def _close(self):
250
        self.file_handle.close()
251
252
    def write(self, bytes):
3635.1.2 by Robert Collins
Add osutils.pump_string_file helper function.
253
        osutils.pump_string_file(bytes, self.file_handle)
2671.3.6 by Robert Collins
Review feedback.
254
255
256
class AppendBasedFileStream(FileStream):
2671.3.9 by Robert Collins
Review feedback and fix VFat emulated transports to not claim to have unix permissions.
257
    """A file stream object returned by open_write_stream.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
258
2671.3.6 by Robert Collins
Review feedback.
259
    This version uses append on a transport to perform writes.
260
    """
261
262
    def write(self, bytes):
263
        self.transport.append_bytes(self.relpath, bytes)
264
265
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
266
class Transport(object):
267
    """This class encapsulates methods for retrieving or putting a file
268
    from/to a storage location.
269
270
    Most functions have a _multi variant, which allows you to queue up
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
271
    multiple requests. They generally have a dumb base implementation
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
272
    which just iterates over the arguments, but smart Transport
273
    implementations can do pipelining.
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
274
    In general implementations should support having a generator or a list
275
    as an argument (ie always iterate, never index)
1910.7.17 by Andrew Bennetts
Various cosmetic changes.
276
277
    :ivar base: Base URL for the transport; should always end in a slash.
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
278
    """
279
1864.5.1 by John Arbash Meinel
Change the readv combining algorithm for one that is easier to test.
280
    # implementations can override this if it is more efficient
281
    # for them to combine larger read chunks together
1864.5.4 by John Arbash Meinel
play around with tuning the partial reads.
282
    _max_readv_combine = 50
1864.5.3 by John Arbash Meinel
Allow collapsing ranges even if they are just 'close'
283
    # It is better to read this much more data in order, rather
284
    # than doing another seek. Even for the local filesystem,
285
    # there is a benefit in just reading.
286
    # TODO: jam 20060714 Do some real benchmarking to figure out
287
    #       where the biggest benefit between combining reads and
1864.5.8 by John Arbash Meinel
Cleanup and NEWS
288
    #       and seeking is. Consider a runtime auto-tune.
1864.5.4 by John Arbash Meinel
play around with tuning the partial reads.
289
    _bytes_to_read_before_seek = 0
1864.5.1 by John Arbash Meinel
Change the readv combining algorithm for one that is easier to test.
290
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
291
    def __init__(self, base):
3734.2.3 by Vincent Ladeuil
Don't use multiple inheritance for http smart medium since we
292
        super(Transport, self).__init__()
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
293
        self.base = base
294
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
295
    def _translate_error(self, e, path, raise_generic=True):
296
        """Translate an IOError or OSError into an appropriate bzr error.
297
298
        This handles things like ENOENT, ENOTDIR, EEXIST, and EACCESS
299
        """
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
300
        if getattr(e, 'errno', None) is not None:
3146.4.1 by Aaron Bentley
Python 2.5 on win32 can emit errno.EINVAL when listing a non-directory
301
            if e.errno in (errno.ENOENT, errno.ENOTDIR, errno.EINVAL):
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
302
                raise errors.NoSuchFile(path, extra=e)
1185.31.58 by John Arbash Meinel
Updating for new transport tests so that they pass on win32
303
            # I would rather use errno.EFOO, but there doesn't seem to be
304
            # any matching for 267
305
            # This is the error when doing a listdir on a file:
306
            # WindowsError: [Errno 267] The directory name is invalid
307
            if sys.platform == 'win32' and e.errno in (errno.ESRCH, 267):
308
                raise errors.NoSuchFile(path, extra=e)
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
309
            if e.errno == errno.EEXIST:
310
                raise errors.FileExists(path, extra=e)
311
            if e.errno == errno.EACCES:
312
                raise errors.PermissionDenied(path, extra=e)
1553.5.10 by Martin Pool
New DirectoryNotEmpty exception, and raise this from local and memory
313
            if e.errno == errno.ENOTEMPTY:
314
                raise errors.DirectoryNotEmpty(path, extra=e)
1558.10.1 by Aaron Bentley
Handle lockdirs over NFS properly
315
            if e.errno == errno.EBUSY:
316
                raise errors.ResourceBusy(path, extra=e)
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
317
        if raise_generic:
318
            raise errors.TransportError(orig_error=e)
319
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
320
    def clone(self, offset=None):
321
        """Return a new Transport object, cloned from the current location,
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
322
        using a subdirectory or parent directory. This allows connections
1185.11.6 by John Arbash Meinel
Made HttpTransport handle a request for a parent directory differently.
323
        to be pooled, rather than a new one needed for each subdir.
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
324
        """
1540.3.1 by Martin Pool
First-cut implementation of pycurl. Substantially faster than using urllib.
325
        raise NotImplementedError(self.clone)
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
326
4294.2.1 by Robert Collins
Move directory checking for bzr push options into Branch.create_clone_on_transport.
327
    def create_prefix(self):
4294.2.10 by Robert Collins
Review feedback.
328
        """Create all the directories leading down to self.base."""
4294.2.1 by Robert Collins
Move directory checking for bzr push options into Branch.create_clone_on_transport.
329
        cur_transport = self
330
        needed = [cur_transport]
331
        # Recurse upwards until we can create a directory successfully
332
        while True:
333
            new_transport = cur_transport.clone('..')
334
            if new_transport.base == cur_transport.base:
335
                raise errors.BzrCommandError(
336
                    "Failed to create path prefix for %s."
337
                    % cur_transport.base)
338
            try:
339
                new_transport.mkdir('.')
340
            except errors.NoSuchFile:
341
                needed.append(new_transport)
342
                cur_transport = new_transport
343
            except errors.FileExists:
344
                break
345
            else:
346
                break
347
        # Now we only need to create child directories
348
        while needed:
349
            cur_transport = needed.pop()
350
            cur_transport.ensure_base()
351
2475.3.2 by John Arbash Meinel
Add Transport.ensure_base()
352
    def ensure_base(self):
353
        """Ensure that the directory this transport references exists.
354
355
        This will create a directory if it doesn't exist.
356
        :return: True if the directory was created, False otherwise.
357
        """
358
        # The default implementation just uses "Easier to ask for forgiveness
359
        # than permission". We attempt to create the directory, and just
2805.3.1 by Martin Pool
Transport.ensure_base should ignore PermissionDenied when trying to create the directory (Axel Kollmorgen)
360
        # suppress FileExists and PermissionDenied (for Windows) exceptions.
2475.3.2 by John Arbash Meinel
Add Transport.ensure_base()
361
        try:
362
            self.mkdir('.')
2805.3.1 by Martin Pool
Transport.ensure_base should ignore PermissionDenied when trying to create the directory (Axel Kollmorgen)
363
        except (errors.FileExists, errors.PermissionDenied):
2475.3.2 by John Arbash Meinel
Add Transport.ensure_base()
364
            return False
365
        else:
366
            return True
367
2634.1.1 by Robert Collins
(robertc) Reinstate the accidentally backed out external_url patch.
368
    def external_url(self):
369
        """Return a URL for self that can be given to an external process.
370
371
        There is no guarantee that the URL can be accessed from a different
372
        machine - e.g. file:/// urls are only usable on the local machine,
373
        sftp:/// urls when the server is only bound to localhost are only
374
        usable from localhost etc.
375
376
        NOTE: This method may remove security wrappers (e.g. on chroot
377
        transports) and thus should *only* be used when the result will not
378
        be used to obtain a new transport within bzrlib. Ideally chroot
379
        transports would know enough to cause the external url to be the exact
380
        one used that caused the chrooting in the first place, but that is not
381
        currently the case.
382
383
        :return: A URL that can be given to another process.
384
        :raises InProcessTransport: If the transport is one that cannot be
385
            accessed out of the current process (e.g. a MemoryTransport)
386
            then InProcessTransport is raised.
387
        """
388
        raise NotImplementedError(self.external_url)
389
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
390
    def _pump(self, from_file, to_file):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
391
        """Most children will need to copy from one file-like
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
392
        object or string to another one.
393
        This just gives them something easy to call.
394
        """
2745.5.2 by Robert Collins
* ``bzrlib.transport.Transport.put_file`` now returns the number of bytes
395
        return osutils.pumpfile(from_file, to_file)
1948.3.8 by Vincent LADEUIL
_pump accepts strings finally :)
396
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
397
    def _get_total(self, multi):
398
        """Try to figure out how many entries are in multi,
399
        but if not possible, return None.
400
        """
401
        try:
402
            return len(multi)
403
        except TypeError: # We can't tell how many, because relpaths is a generator
404
            return None
405
3882.7.1 by Martin Pool
Add stub _report_activity method as a transport callback
406
    def _report_activity(self, bytes, direction):
407
        """Notify that this transport has activity.
408
409
        Implementations should call this from all methods that actually do IO.
410
        Be careful that it's not called twice, if one method is implemented on
411
        top of another.
412
413
        :param bytes: Number of bytes read or written.
414
        :param direction: 'read' or 'write' or None.
415
        """
3882.7.5 by Martin Pool
Further mockup of transport-based activity indicator.
416
        ui.ui_factory.report_transport_activity(self, bytes, direction)
3882.7.1 by Martin Pool
Add stub _report_activity method as a transport callback
417
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
418
    def _update_pb(self, pb, msg, count, total):
419
        """Update the progress bar based on the current count
420
        and total available, total may be None if it was
421
        not possible to determine.
422
        """
907.1.14 by John Arbash Meinel
Handling some transport functions which take only a single argument.
423
        if pb is None:
424
            return
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
425
        if total is None:
426
            pb.update(msg, count, count+1)
427
        else:
428
            pb.update(msg, count, total)
429
907.1.14 by John Arbash Meinel
Handling some transport functions which take only a single argument.
430
    def _iterate_over(self, multi, func, pb, msg, expand=True):
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
431
        """Iterate over all entries in multi, passing them to func,
432
        and update the progress bar as you go along.
907.1.14 by John Arbash Meinel
Handling some transport functions which take only a single argument.
433
434
        :param expand:  If True, the entries will be passed to the function
435
                        by expanding the tuple. If False, it will be passed
436
                        as a single parameter.
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
437
        """
438
        total = self._get_total(multi)
1563.2.3 by Robert Collins
Change the return signature of transport.append and append_multi to return the length of the pre-append content.
439
        result = []
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
440
        count = 0
441
        for entry in multi:
442
            self._update_pb(pb, msg, count, total)
907.1.14 by John Arbash Meinel
Handling some transport functions which take only a single argument.
443
            if expand:
1563.2.3 by Robert Collins
Change the return signature of transport.append and append_multi to return the length of the pre-append content.
444
                result.append(func(*entry))
907.1.14 by John Arbash Meinel
Handling some transport functions which take only a single argument.
445
            else:
1563.2.3 by Robert Collins
Change the return signature of transport.append and append_multi to return the length of the pre-append content.
446
                result.append(func(entry))
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
447
            count += 1
1563.2.3 by Robert Collins
Change the return signature of transport.append and append_multi to return the length of the pre-append content.
448
        return tuple(result)
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
449
907.1.34 by John Arbash Meinel
Fixing append(), cleaning up function locations.
450
    def abspath(self, relpath):
451
        """Return the full url to the given relative path.
1910.16.6 by Andrew Bennetts
Update Transport.abspath docstring.
452
453
        :param relpath: a string of a relative path
1910.16.2 by Andrew Bennetts
Reduce transport code duplication by creating a '_combine_paths' method to Transport.
454
        """
1442.1.44 by Robert Collins
Many transport related tweaks:
455
1910.16.2 by Andrew Bennetts
Reduce transport code duplication by creating a '_combine_paths' method to Transport.
456
        # XXX: Robert Collins 20051016 - is this really needed in the public
457
        # interface ?
1540.3.1 by Martin Pool
First-cut implementation of pycurl. Substantially faster than using urllib.
458
        raise NotImplementedError(self.abspath)
907.1.34 by John Arbash Meinel
Fixing append(), cleaning up function locations.
459
1910.16.2 by Andrew Bennetts
Reduce transport code duplication by creating a '_combine_paths' method to Transport.
460
    def _combine_paths(self, base_path, relpath):
461
        """Transform a Transport-relative path to a remote absolute path.
462
463
        This does not handle substitution of ~ but does handle '..' and '.'
464
        components.
465
466
        Examples::
467
1996.3.20 by John Arbash Meinel
[merge] bzr.dev 2063
468
            t._combine_paths('/home/sarah', 'project/foo')
469
                => '/home/sarah/project/foo'
470
            t._combine_paths('/home/sarah', '../../etc')
471
                => '/etc'
2070.3.2 by Andrew Bennetts
Merge from bzr.dev
472
            t._combine_paths('/home/sarah', '/etc')
473
                => '/etc'
1910.16.2 by Andrew Bennetts
Reduce transport code duplication by creating a '_combine_paths' method to Transport.
474
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
475
        :param base_path: urlencoded path for the transport root; typically a
1910.16.2 by Andrew Bennetts
Reduce transport code duplication by creating a '_combine_paths' method to Transport.
476
             URL but need not contain scheme/host/etc.
477
        :param relpath: relative url string for relative part of remote path.
478
        :return: urlencoded string for final path.
479
        """
480
        if not isinstance(relpath, str):
2485.8.19 by Vincent Ladeuil
Add a new ConnectedTransport class refactored from [s]ftp and http.
481
            raise errors.InvalidURL(relpath)
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
482
        if relpath.startswith('/'):
483
            base_parts = []
484
        else:
485
            base_parts = base_path.split('/')
1910.16.2 by Andrew Bennetts
Reduce transport code duplication by creating a '_combine_paths' method to Transport.
486
        if len(base_parts) > 0 and base_parts[-1] == '':
487
            base_parts = base_parts[:-1]
488
        for p in relpath.split('/'):
489
            if p == '..':
490
                if len(base_parts) == 0:
491
                    # In most filesystems, a request for the parent
492
                    # of root, just returns root.
493
                    continue
494
                base_parts.pop()
495
            elif p == '.':
496
                continue # No-op
497
            elif p != '':
498
                base_parts.append(p)
499
        path = '/'.join(base_parts)
2070.3.1 by Andrew Bennetts
Fix memory_transport.abspath('/foo')
500
        if not path.startswith('/'):
501
            path = '/' + path
1910.16.2 by Andrew Bennetts
Reduce transport code duplication by creating a '_combine_paths' method to Transport.
502
        return path
503
2671.3.1 by Robert Collins
* New method ``bzrlib.transport.Transport.get_recommended_page_size``.
504
    def recommended_page_size(self):
505
        """Return the recommended page size for this transport.
506
507
        This is potentially different for every path in a given namespace.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
508
        For example, local transports might use an operating system call to
2671.3.1 by Robert Collins
* New method ``bzrlib.transport.Transport.get_recommended_page_size``.
509
        get the block size for a given path, which can vary due to mount
510
        points.
511
512
        :return: The page size in bytes.
513
        """
514
        return 4 * 1024
515
907.1.34 by John Arbash Meinel
Fixing append(), cleaning up function locations.
516
    def relpath(self, abspath):
517
        """Return the local path portion from a given absolute path.
1442.1.44 by Robert Collins
Many transport related tweaks:
518
519
        This default implementation is not suitable for filesystems with
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
520
        aliasing, such as that given by symlinks, where a path may not
521
        start with our base, but still be a relpath once aliasing is
1442.1.44 by Robert Collins
Many transport related tweaks:
522
        resolved.
907.1.34 by John Arbash Meinel
Fixing append(), cleaning up function locations.
523
        """
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
524
        # TODO: This might want to use bzrlib.osutils.relpath
525
        #       but we have to watch out because of the prefix issues
1530.1.3 by Robert Collins
transport implementations now tested consistently.
526
        if not (abspath == self.base[:-1] or abspath.startswith(self.base)):
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
527
            raise errors.PathNotChild(abspath, self.base)
1442.1.44 by Robert Collins
Many transport related tweaks:
528
        pl = len(self.base)
1530.1.3 by Robert Collins
transport implementations now tested consistently.
529
        return abspath[pl:].strip('/')
907.1.34 by John Arbash Meinel
Fixing append(), cleaning up function locations.
530
1685.1.9 by John Arbash Meinel
Updated LocalTransport so that it's base is now a URL rather than a local path. This helps consistency with all other functions. To do so, I added local_abspath() which returns the local path, and local_path_to/from_url
531
    def local_abspath(self, relpath):
532
        """Return the absolute path on the local filesystem.
533
534
        This function will only be defined for Transports which have a
535
        physical local filesystem representation.
5200.2.1 by Robert Collins
Minor local_abspath docstring improvement.
536
537
        :raises errors.NotLocalUrl: When no local path representation is
538
            available.
1685.1.9 by John Arbash Meinel
Updated LocalTransport so that it's base is now a URL rather than a local path. This helps consistency with all other functions. To do so, I added local_abspath() which returns the local path, and local_path_to/from_url
539
        """
2018.18.4 by Martin Pool
Change Transport.local_abspath to raise NotLocalUrl, and test.
540
        raise errors.NotLocalUrl(self.abspath(relpath))
1685.1.9 by John Arbash Meinel
Updated LocalTransport so that it's base is now a URL rather than a local path. This helps consistency with all other functions. To do so, I added local_abspath() which returns the local path, and local_path_to/from_url
541
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
542
    def has(self, relpath):
1442.1.44 by Robert Collins
Many transport related tweaks:
543
        """Does the file relpath exist?
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
544
1442.1.44 by Robert Collins
Many transport related tweaks:
545
        Note that some transports MAY allow querying on directories, but this
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
546
        is not part of the protocol.  In other words, the results of
1786.1.8 by John Arbash Meinel
[merge] Johan Rydberg test updates
547
        t.has("a_directory_name") are undefined.
1910.7.17 by Andrew Bennetts
Various cosmetic changes.
548
549
        :rtype: bool
1442.1.44 by Robert Collins
Many transport related tweaks:
550
        """
1540.3.1 by Martin Pool
First-cut implementation of pycurl. Substantially faster than using urllib.
551
        raise NotImplementedError(self.has)
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
552
907.1.36 by John Arbash Meinel
Moving the multi-get functionality higher up into the Branch class.
553
    def has_multi(self, relpaths, pb=None):
907.1.34 by John Arbash Meinel
Fixing append(), cleaning up function locations.
554
        """Return True/False for each entry in relpaths"""
555
        total = self._get_total(relpaths)
556
        count = 0
557
        for relpath in relpaths:
907.1.36 by John Arbash Meinel
Moving the multi-get functionality higher up into the Branch class.
558
            self._update_pb(pb, 'has', count, total)
907.1.34 by John Arbash Meinel
Fixing append(), cleaning up function locations.
559
            yield self.has(relpath)
560
            count += 1
561
1185.16.155 by John Arbash Meinel
Added a has_any function to the Transport API
562
    def has_any(self, relpaths):
563
        """Return True if any of the paths exist."""
564
        for relpath in relpaths:
565
            if self.has(relpath):
566
                return True
567
        return False
568
1442.1.44 by Robert Collins
Many transport related tweaks:
569
    def iter_files_recursive(self):
570
        """Iter the relative paths of files in the transports sub-tree.
1553.5.13 by Martin Pool
New Transport.rename that mustn't overwrite
571
572
        *NOTE*: This only lists *files*, not subdirectories!
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
573
1442.1.44 by Robert Collins
Many transport related tweaks:
574
        As with other listing functions, only some transports implement this,.
3484.1.1 by Vincent Ladeuil
Trivial drive-by cleanups.
575
        you may check via listable() to determine if it will.
1442.1.44 by Robert Collins
Many transport related tweaks:
576
        """
1530.1.4 by Robert Collins
integrate Memory tests into transport interface tests.
577
        raise errors.TransportNotPossible("This transport has not "
1530.1.21 by Robert Collins
Review feedback fixes.
578
                                          "implemented iter_files_recursive "
1530.1.4 by Robert Collins
integrate Memory tests into transport interface tests.
579
                                          "(but must claim to be listable "
580
                                          "to trigger this error).")
1442.1.44 by Robert Collins
Many transport related tweaks:
581
2164.2.15 by Vincent Ladeuil
Http redirections are not followed by default. Do not use hints
582
    def get(self, relpath):
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
583
        """Get the file at the given relative path.
907.1.20 by John Arbash Meinel
Removed Transport.open(), making get + put encode/decode to utf-8
584
2052.6.1 by Robert Collins
``Transport.get`` has had its interface made more clear for ease of use.
585
        This may fail in a number of ways:
586
         - HTTP servers may return content for a directory. (unexpected
587
           content failure)
588
         - FTP servers may indicate NoSuchFile for a directory.
589
         - SFTP servers may give a file handle for a directory that will
590
           fail on read().
591
592
        For correct use of the interface, be sure to catch errors.PathError
593
        when calling it and catch errors.ReadError when reading from the
594
        returned object.
595
907.1.20 by John Arbash Meinel
Removed Transport.open(), making get + put encode/decode to utf-8
596
        :param relpath: The relative path to the file
1910.19.2 by Andrew Bennetts
Add a new method ``Transport.get_smart_client()``. This is provided to allow
597
        :rtype: File-like object.
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
598
        """
1540.3.1 by Martin Pool
First-cut implementation of pycurl. Substantially faster than using urllib.
599
        raise NotImplementedError(self.get)
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
600
1955.3.3 by John Arbash Meinel
Implement and test 'get_bytes'
601
    def get_bytes(self, relpath):
602
        """Get a raw string of the bytes for a file at the given location.
603
604
        :param relpath: The relative path to the file
605
        """
3882.7.3 by Martin Pool
transport.get should specifically close the file handle
606
        f = self.get(relpath)
607
        try:
608
            return f.read()
609
        finally:
610
            f.close()
1910.19.2 by Andrew Bennetts
Add a new method ``Transport.get_smart_client()``. This is provided to allow
611
2018.2.3 by Andrew Bennetts
Starting factoring out the smart server client "medium" from the protocol.
612
    def get_smart_medium(self):
613
        """Return a smart client medium for this transport if possible.
614
615
        A smart medium doesn't imply the presence of a smart server: it implies
616
        that the smart protocol can be tunnelled via this transport.
617
618
        :raises NoSmartMedium: if no smart server medium is available.
619
        """
620
        raise errors.NoSmartMedium(self)
621
2745.5.3 by Robert Collins
* Move transport logging into a new transport class
622
    def readv(self, relpath, offsets, adjust_for_latency=False,
623
        upper_limit=None):
2745.5.1 by Robert Collins
* New parameter on ``bzrlib.transport.Transport.readv``
624
        """Get parts of the file at the given relative path.
625
626
        :param relpath: The path to read data from.
627
        :param offsets: A list of (offset, size) tuples.
3024.2.1 by Vincent Ladeuil
Fix 165061 by using the correct _max_readv_combine attribute.
628
        :param adjust_for_latency: Adjust the requested offsets to accomodate
2745.5.1 by Robert Collins
* New parameter on ``bzrlib.transport.Transport.readv``
629
            transport latency. This may re-order the offsets, expand them to
630
            grab adjacent data when there is likely a high cost to requesting
631
            data relative to delivering it.
2745.5.3 by Robert Collins
* Move transport logging into a new transport class
632
        :param upper_limit: When adjust_for_latency is True setting upper_limit
633
            allows the caller to tell the transport about the length of the
634
            file, so that requests are not issued for ranges beyond the end of
635
            the file. This matters because some servers and/or transports error
636
            in such a case rather than just satisfying the available ranges.
637
            upper_limit should always be provided when adjust_for_latency is
638
            True, and should be the size of the file in bytes.
2745.5.1 by Robert Collins
* New parameter on ``bzrlib.transport.Transport.readv``
639
        :return: A list or generator of (offset, data) tuples
640
        """
641
        if adjust_for_latency:
2890.1.3 by Robert Collins
Review feedback and discussion with Martin - split out the readv offset adjustment into a new helper and document where the design might/should go next.
642
            # Design note: We may wish to have different algorithms for the
643
            # expansion of the offsets per-transport. E.g. for local disk to
3024.2.1 by Vincent Ladeuil
Fix 165061 by using the correct _max_readv_combine attribute.
644
            # use page-aligned expansion. If that is the case consider the
645
            # following structure:
646
            #  - a test that transport.readv uses self._offset_expander or some
647
            #    similar attribute, to do the expansion
648
            #  - a test for each transport that it has some known-good offset
649
            #    expander
2890.1.3 by Robert Collins
Review feedback and discussion with Martin - split out the readv offset adjustment into a new helper and document where the design might/should go next.
650
            #  - unit tests for each offset expander
651
            #  - a set of tests for the offset expander interface, giving
652
            #    baseline behaviour (which the current transport
653
            #    adjust_for_latency tests could be repurposed to).
654
            offsets = self._sort_expand_and_combine(offsets, upper_limit)
2745.5.1 by Robert Collins
* New parameter on ``bzrlib.transport.Transport.readv``
655
        return self._readv(relpath, offsets)
656
657
    def _readv(self, relpath, offsets):
1594.2.5 by Robert Collins
Readv patch from Johan Rydberg giving knits partial download support.
658
        """Get parts of the file at the given relative path.
659
2745.5.3 by Robert Collins
* Move transport logging into a new transport class
660
        :param relpath: The path to read.
661
        :param offsets: A list of (offset, size) tuples.
1594.2.5 by Robert Collins
Readv patch from Johan Rydberg giving knits partial download support.
662
        :return: A list or generator of (offset, data) tuples
663
        """
1864.5.1 by John Arbash Meinel
Change the readv combining algorithm for one that is easier to test.
664
        if not offsets:
1594.2.16 by Robert Collins
Coalesce readv requests on file based transports.
665
            return
1864.5.1 by John Arbash Meinel
Change the readv combining algorithm for one that is easier to test.
666
1864.5.7 by John Arbash Meinel
remove disable prefetch support
667
        fp = self.get(relpath)
2001.3.2 by John Arbash Meinel
Force all transports to raise ShortReadvError if they can
668
        return self._seek_and_read(fp, offsets, relpath)
1864.5.11 by John Arbash Meinel
Factor out the workhorse of Transport.readv() into a helper function, and re-use that function in sftp but with a non-prefetch file.
669
2001.3.2 by John Arbash Meinel
Force all transports to raise ShortReadvError if they can
670
    def _seek_and_read(self, fp, offsets, relpath='<unknown>'):
1864.5.11 by John Arbash Meinel
Factor out the workhorse of Transport.readv() into a helper function, and re-use that function in sftp but with a non-prefetch file.
671
        """An implementation of readv that uses fp.seek and fp.read.
672
673
        This uses _coalesce_offsets to issue larger reads and fewer seeks.
674
675
        :param fp: A file-like object that supports seek() and read(size)
676
        :param offsets: A list of offsets to be read from the given file.
677
        :return: yield (pos, data) tuples for each request
678
        """
1864.5.2 by John Arbash Meinel
always read in sorted order, and return in requested order, but only cache what is currently out of order
679
        # We are going to iterate multiple times, we need a list
680
        offsets = list(offsets)
681
        sorted_offsets = sorted(offsets)
682
683
        # turn the list of offsets into a stack
1864.5.9 by John Arbash Meinel
Switch to returning an object to make the api more understandable.
684
        offset_stack = iter(offsets)
685
        cur_offset_and_size = offset_stack.next()
1864.5.2 by John Arbash Meinel
always read in sorted order, and return in requested order, but only cache what is currently out of order
686
        coalesced = self._coalesce_offsets(sorted_offsets,
1864.5.3 by John Arbash Meinel
Allow collapsing ranges even if they are just 'close'
687
                               limit=self._max_readv_combine,
688
                               fudge_factor=self._bytes_to_read_before_seek)
1864.5.2 by John Arbash Meinel
always read in sorted order, and return in requested order, but only cache what is currently out of order
689
690
        # Cache the results, but only until they have been fulfilled
691
        data_map = {}
1864.5.9 by John Arbash Meinel
Switch to returning an object to make the api more understandable.
692
        for c_offset in coalesced:
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
693
            # TODO: jam 20060724 it might be faster to not issue seek if
1864.5.11 by John Arbash Meinel
Factor out the workhorse of Transport.readv() into a helper function, and re-use that function in sftp but with a non-prefetch file.
694
            #       we are already at the right location. This should be
695
            #       benchmarked.
1864.5.9 by John Arbash Meinel
Switch to returning an object to make the api more understandable.
696
            fp.seek(c_offset.start)
697
            data = fp.read(c_offset.length)
2001.3.2 by John Arbash Meinel
Force all transports to raise ShortReadvError if they can
698
            if len(data) < c_offset.length:
699
                raise errors.ShortReadvError(relpath, c_offset.start,
2001.3.3 by John Arbash Meinel
review feedback: add the actual count written to ShortReadvError
700
                            c_offset.length, actual=len(data))
1864.5.9 by John Arbash Meinel
Switch to returning an object to make the api more understandable.
701
            for suboffset, subsize in c_offset.ranges:
702
                key = (c_offset.start+suboffset, subsize)
703
                data_map[key] = data[suboffset:suboffset+subsize]
1864.5.1 by John Arbash Meinel
Change the readv combining algorithm for one that is easier to test.
704
1864.5.8 by John Arbash Meinel
Cleanup and NEWS
705
            # Now that we've read some data, see if we can yield anything back
1864.5.9 by John Arbash Meinel
Switch to returning an object to make the api more understandable.
706
            while cur_offset_and_size in data_map:
707
                this_data = data_map.pop(cur_offset_and_size)
3794.2.2 by John Arbash Meinel
Instead of counting the remaining offsets, trap the offset exception
708
                this_offset = cur_offset_and_size[0]
709
                try:
710
                    cur_offset_and_size = offset_stack.next()
711
                except StopIteration:
712
                    # Close the file handle as there will be no more data
713
                    # The handle would normally be cleaned up as this code goes
714
                    # out of scope, but as we are a generator, not all code
715
                    # will re-enter once we have consumed all the expected
716
                    # data. For example:
717
                    #   zip(range(len(requests)), readv(foo, requests))
718
                    # Will stop because the range is done, and not run the
719
                    # cleanup code for the readv().
720
                    fp.close()
721
                    cur_offset_and_size = None
722
                yield this_offset, this_data
1864.5.1 by John Arbash Meinel
Change the readv combining algorithm for one that is easier to test.
723
2890.1.3 by Robert Collins
Review feedback and discussion with Martin - split out the readv offset adjustment into a new helper and document where the design might/should go next.
724
    def _sort_expand_and_combine(self, offsets, upper_limit):
725
        """Helper for readv.
726
727
        :param offsets: A readv vector - (offset, length) tuples.
728
        :param upper_limit: The highest byte offset that may be requested.
729
        :return: A readv vector that will read all the regions requested by
730
            offsets, in start-to-end order, with no duplicated regions,
731
            expanded by the transports recommended page size.
732
        """
733
        offsets = sorted(offsets)
734
        # short circuit empty requests
735
        if len(offsets) == 0:
736
            def empty_yielder():
737
                # Quick thunk to stop this function becoming a generator
738
                # itself, rather we return a generator that has nothing to
739
                # yield.
740
                if False:
741
                    yield None
742
            return empty_yielder()
743
        # expand by page size at either end
744
        maximum_expansion = self.recommended_page_size()
745
        new_offsets = []
746
        for offset, length in offsets:
747
            expansion = maximum_expansion - length
748
            if expansion < 0:
749
                # we're asking for more than the minimum read anyway.
750
                expansion = 0
751
            reduction = expansion / 2
752
            new_offset = offset - reduction
753
            new_length = length + expansion
754
            if new_offset < 0:
755
                # don't ask for anything < 0
756
                new_offset = 0
757
            if (upper_limit is not None and
758
                new_offset + new_length > upper_limit):
759
                new_length = upper_limit - new_offset
760
            new_offsets.append((new_offset, new_length))
761
        # combine the expanded offsets
762
        offsets = []
763
        current_offset, current_length = new_offsets[0]
764
        current_finish = current_length + current_offset
765
        for offset, length in new_offsets[1:]:
766
            finish = offset + length
3805.4.2 by John Arbash Meinel
Revert the changes to _sort_expand_and_combine
767
            if offset > current_finish:
768
                # there is a gap, output the current accumulator and start
769
                # a new one for the region we're examining.
2890.1.3 by Robert Collins
Review feedback and discussion with Martin - split out the readv offset adjustment into a new helper and document where the design might/should go next.
770
                offsets.append((current_offset, current_length))
771
                current_offset = offset
772
                current_length = length
773
                current_finish = finish
774
                continue
775
            if finish > current_finish:
776
                # extend the current accumulator to the end of the region
777
                # we're examining.
778
                current_finish = finish
779
                current_length = finish - current_offset
780
        offsets.append((current_offset, current_length))
781
        return offsets
782
1864.5.1 by John Arbash Meinel
Change the readv combining algorithm for one that is easier to test.
783
    @staticmethod
3686.1.6 by John Arbash Meinel
Respond to Martin's review comments.
784
    def _coalesce_offsets(offsets, limit=0, fudge_factor=0, max_size=0):
1864.5.1 by John Arbash Meinel
Change the readv combining algorithm for one that is easier to test.
785
        """Yield coalesced offsets.
786
787
        With a long list of neighboring requests, combine them
788
        into a single large request, while retaining the original
789
        offsets.
790
        Turns  [(15, 10), (25, 10)] => [(15, 20, [(0, 10), (10, 10)])]
3686.1.6 by John Arbash Meinel
Respond to Martin's review comments.
791
        Note that overlapping requests are not permitted. (So [(15, 10), (20,
792
        10)] will raise a ValueError.) This is because the data we access never
793
        overlaps, and it allows callers to trust that we only need any byte of
794
        data for 1 request (so nothing needs to be buffered to fulfill a second
795
        request.)
1864.5.1 by John Arbash Meinel
Change the readv combining algorithm for one that is easier to test.
796
797
        :param offsets: A list of (start, length) pairs
3059.2.17 by Vincent Ladeuil
Limit GET requests by body size instead of number of ranges.
798
        :param limit: Only combine a maximum of this many pairs Some transports
799
                penalize multiple reads more than others, and sometimes it is
800
                better to return early.
801
                0 means no limit
1864.5.3 by John Arbash Meinel
Allow collapsing ranges even if they are just 'close'
802
        :param fudge_factor: All transports have some level of 'it is
3120.2.1 by John Arbash Meinel
Change the sftp_readv loop to buffer even less.
803
                better to read some more data and throw it away rather
1864.5.3 by John Arbash Meinel
Allow collapsing ranges even if they are just 'close'
804
                than seek', so collapse if we are 'close enough'
3059.2.17 by Vincent Ladeuil
Limit GET requests by body size instead of number of ranges.
805
        :param max_size: Create coalesced offsets no bigger than this size.
806
                When a single offset is bigger than 'max_size', it will keep
807
                its size and be alone in the coalesced offset.
808
                0 means no maximum size.
3120.2.1 by John Arbash Meinel
Change the sftp_readv loop to buffer even less.
809
        :return: return a list of _CoalescedOffset objects, which have members
810
            for where to start, how much to read, and how to split those chunks
811
            back up
1864.5.1 by John Arbash Meinel
Change the readv combining algorithm for one that is easier to test.
812
        """
813
        last_end = None
1864.5.9 by John Arbash Meinel
Switch to returning an object to make the api more understandable.
814
        cur = _CoalescedOffset(None, None, [])
3120.2.1 by John Arbash Meinel
Change the sftp_readv loop to buffer even less.
815
        coalesced_offsets = []
1864.5.1 by John Arbash Meinel
Change the readv combining algorithm for one that is easier to test.
816
3876.1.1 by John Arbash Meinel
Fix bug #303538 by capping the max per-hunk read size at 100MB.
817
        if max_size <= 0:
818
            # 'unlimited', but we actually take this to mean 100MB buffer limit
819
            max_size = 100*1024*1024
820
1864.5.1 by John Arbash Meinel
Change the readv combining algorithm for one that is easier to test.
821
        for start, size in offsets:
822
            end = start + size
3059.2.17 by Vincent Ladeuil
Limit GET requests by body size instead of number of ranges.
823
            if (last_end is not None
1864.5.3 by John Arbash Meinel
Allow collapsing ranges even if they are just 'close'
824
                and start <= last_end + fudge_factor
1864.5.9 by John Arbash Meinel
Switch to returning an object to make the api more understandable.
825
                and start >= cur.start
3059.2.17 by Vincent Ladeuil
Limit GET requests by body size instead of number of ranges.
826
                and (limit <= 0 or len(cur.ranges) < limit)
827
                and (max_size <= 0 or end - cur.start <= max_size)):
3686.1.6 by John Arbash Meinel
Respond to Martin's review comments.
828
                if start < last_end:
3686.1.9 by John Arbash Meinel
Overlapping ranges are not allowed anymore.
829
                    raise ValueError('Overlapping range not allowed:'
3686.1.6 by John Arbash Meinel
Respond to Martin's review comments.
830
                        ' last range ended at %s, new one starts at %s'
831
                        % (last_end, start))
1864.5.9 by John Arbash Meinel
Switch to returning an object to make the api more understandable.
832
                cur.length = end - cur.start
833
                cur.ranges.append((start-cur.start, size))
1594.2.16 by Robert Collins
Coalesce readv requests on file based transports.
834
            else:
1864.5.9 by John Arbash Meinel
Switch to returning an object to make the api more understandable.
835
                if cur.start is not None:
3120.2.1 by John Arbash Meinel
Change the sftp_readv loop to buffer even less.
836
                    coalesced_offsets.append(cur)
1864.5.9 by John Arbash Meinel
Switch to returning an object to make the api more understandable.
837
                cur = _CoalescedOffset(start, size, [(0, size)])
1864.5.1 by John Arbash Meinel
Change the readv combining algorithm for one that is easier to test.
838
            last_end = end
839
1864.5.9 by John Arbash Meinel
Switch to returning an object to make the api more understandable.
840
        if cur.start is not None:
3120.2.1 by John Arbash Meinel
Change the sftp_readv loop to buffer even less.
841
            coalesced_offsets.append(cur)
842
        return coalesced_offsets
1594.2.5 by Robert Collins
Readv patch from Johan Rydberg giving knits partial download support.
843
907.1.50 by John Arbash Meinel
Removed encode/decode from Transport.put/get, added more exceptions that can be thrown.
844
    def get_multi(self, relpaths, pb=None):
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
845
        """Get a list of file-like objects, one for each entry in relpaths.
846
847
        :param relpaths: A list of relative paths.
4463.1.1 by Martin Pool
Update docstrings for recent progress changes
848
        :param pb:  An optional ProgressTask for indicating percent done.
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
849
        :return: A list or generator of file-like objects
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
850
        """
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
851
        # TODO: Consider having this actually buffer the requests,
852
        # in the default mode, it probably won't give worse performance,
853
        # and all children wouldn't have to implement buffering
907.1.16 by John Arbash Meinel
Fixing a few cut&paste typos.
854
        total = self._get_total(relpaths)
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
855
        count = 0
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
856
        for relpath in relpaths:
907.1.16 by John Arbash Meinel
Fixing a few cut&paste typos.
857
            self._update_pb(pb, 'get', count, total)
907.1.50 by John Arbash Meinel
Removed encode/decode from Transport.put/get, added more exceptions that can be thrown.
858
            yield self.get(relpath)
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
859
            count += 1
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
860
1955.3.27 by John Arbash Meinel
rename non_atomic_put_* to put_*non_atomic, and re-order the functions
861
    def put_bytes(self, relpath, bytes, mode=None):
862
        """Atomically put the supplied bytes into the given location.
863
864
        :param relpath: The location to put the contents, relative to the
865
            transport base.
866
        :param bytes: A bytestring of data.
867
        :param mode: Create the file with the given mode.
868
        :return: None
869
        """
2414.1.3 by Andrew Bennetts
Fix test failures under 'python2.4 -O' ('python2.5 -O' was already passing).
870
        if not isinstance(bytes, str):
871
            raise AssertionError(
872
                'bytes must be a plain string, not %s' % type(bytes))
1955.3.27 by John Arbash Meinel
rename non_atomic_put_* to put_*non_atomic, and re-order the functions
873
        return self.put_file(relpath, StringIO(bytes), mode=mode)
874
875
    def put_bytes_non_atomic(self, relpath, bytes, mode=None,
1946.2.12 by John Arbash Meinel
Add ability to pass a directory mode to non_atomic_put
876
                             create_parent_dir=False,
877
                             dir_mode=None):
1955.3.27 by John Arbash Meinel
rename non_atomic_put_* to put_*non_atomic, and re-order the functions
878
        """Copy the string into the target location.
879
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
880
        This function is not strictly safe to use. See
1955.3.27 by John Arbash Meinel
rename non_atomic_put_* to put_*non_atomic, and re-order the functions
881
        Transport.put_bytes_non_atomic for more information.
882
883
        :param relpath: The remote location to put the contents.
884
        :param bytes:   A string object containing the raw bytes to write into
885
                        the target file.
886
        :param mode:    Possible access permissions for new file.
887
                        None means do not set remote permissions.
888
        :param create_parent_dir: If we cannot create the target file because
889
                        the parent directory does not exist, go ahead and
890
                        create it, and then try again.
1946.2.12 by John Arbash Meinel
Add ability to pass a directory mode to non_atomic_put
891
        :param dir_mode: Possible access permissions for new directories.
1955.3.27 by John Arbash Meinel
rename non_atomic_put_* to put_*non_atomic, and re-order the functions
892
        """
2414.1.3 by Andrew Bennetts
Fix test failures under 'python2.4 -O' ('python2.5 -O' was already passing).
893
        if not isinstance(bytes, str):
894
            raise AssertionError(
895
                'bytes must be a plain string, not %s' % type(bytes))
1955.3.27 by John Arbash Meinel
rename non_atomic_put_* to put_*non_atomic, and re-order the functions
896
        self.put_file_non_atomic(relpath, StringIO(bytes), mode=mode,
1946.2.12 by John Arbash Meinel
Add ability to pass a directory mode to non_atomic_put
897
                                 create_parent_dir=create_parent_dir,
898
                                 dir_mode=dir_mode)
1955.3.27 by John Arbash Meinel
rename non_atomic_put_* to put_*non_atomic, and re-order the functions
899
1955.3.6 by John Arbash Meinel
Lots of deprecation warnings, but no errors
900
    def put_file(self, relpath, f, mode=None):
901
        """Copy the file-like object into the location.
902
903
        :param relpath: Location to put the contents, relative to base.
904
        :param f:       File-like object.
905
        :param mode: The mode for the newly created file,
906
                     None means just use the default.
2745.5.2 by Robert Collins
* ``bzrlib.transport.Transport.put_file`` now returns the number of bytes
907
        :return: The length of the file that was written.
1955.3.6 by John Arbash Meinel
Lots of deprecation warnings, but no errors
908
        """
909
        # We would like to mark this as NotImplemented, but most likely
910
        # transports have defined it in terms of the old api.
911
        symbol_versioning.warn('Transport %s should implement put_file,'
912
                               ' rather than implementing put() as of'
913
                               ' version 0.11.'
914
                               % (self.__class__.__name__,),
915
                               DeprecationWarning)
916
        return self.put(relpath, f, mode=mode)
917
        #raise NotImplementedError(self.put_file)
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
918
1955.3.27 by John Arbash Meinel
rename non_atomic_put_* to put_*non_atomic, and re-order the functions
919
    def put_file_non_atomic(self, relpath, f, mode=None,
1946.2.12 by John Arbash Meinel
Add ability to pass a directory mode to non_atomic_put
920
                            create_parent_dir=False,
921
                            dir_mode=None):
1946.1.1 by John Arbash Meinel
Stub out the test and basic implementation for 'non_atomic_put'
922
        """Copy the file-like object into the target location.
923
924
        This function is not strictly safe to use. It is only meant to
925
        be used when you already know that the target does not exist.
926
        It is not safe, because it will open and truncate the remote
927
        file. So there may be a time when the file has invalid contents.
928
929
        :param relpath: The remote location to put the contents.
930
        :param f:       File-like object.
931
        :param mode:    Possible access permissions for new file.
932
                        None means do not set remote permissions.
1946.1.8 by John Arbash Meinel
Update non_atomic_put to have a create_parent_dir flag
933
        :param create_parent_dir: If we cannot create the target file because
934
                        the parent directory does not exist, go ahead and
935
                        create it, and then try again.
1946.2.12 by John Arbash Meinel
Add ability to pass a directory mode to non_atomic_put
936
        :param dir_mode: Possible access permissions for new directories.
1946.1.1 by John Arbash Meinel
Stub out the test and basic implementation for 'non_atomic_put'
937
        """
938
        # Default implementation just does an atomic put.
1946.1.8 by John Arbash Meinel
Update non_atomic_put to have a create_parent_dir flag
939
        try:
1955.3.19 by John Arbash Meinel
rename non_atomic_put => non_atomic_put_file
940
            return self.put_file(relpath, f, mode=mode)
1946.1.8 by John Arbash Meinel
Update non_atomic_put to have a create_parent_dir flag
941
        except errors.NoSuchFile:
942
            if not create_parent_dir:
943
                raise
944
            parent_dir = osutils.dirname(relpath)
945
            if parent_dir:
1946.2.12 by John Arbash Meinel
Add ability to pass a directory mode to non_atomic_put
946
                self.mkdir(parent_dir, mode=dir_mode)
1955.3.19 by John Arbash Meinel
rename non_atomic_put => non_atomic_put_file
947
                return self.put_file(relpath, f, mode=mode)
1946.1.1 by John Arbash Meinel
Stub out the test and basic implementation for 'non_atomic_put'
948
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
949
    def mkdir(self, relpath, mode=None):
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
950
        """Create a directory at the given path."""
1540.3.1 by Martin Pool
First-cut implementation of pycurl. Substantially faster than using urllib.
951
        raise NotImplementedError(self.mkdir)
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
952
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
953
    def mkdir_multi(self, relpaths, mode=None, pb=None):
907.1.47 by John Arbash Meinel
Created mkdir_multi, modified branch to use _multi forms when initializing a branch, creating a full test routine for transports
954
        """Create a group of directories"""
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
955
        def mkdir(path):
956
            self.mkdir(path, mode=mode)
1563.2.3 by Robert Collins
Change the return signature of transport.append and append_multi to return the length of the pre-append content.
957
        return len(self._iterate_over(relpaths, mkdir, pb, 'mkdir', expand=False))
907.1.47 by John Arbash Meinel
Created mkdir_multi, modified branch to use _multi forms when initializing a branch, creating a full test routine for transports
958
2671.3.9 by Robert Collins
Review feedback and fix VFat emulated transports to not claim to have unix permissions.
959
    def open_write_stream(self, relpath, mode=None):
960
        """Open a writable file stream at relpath.
2671.3.2 by Robert Collins
Start open_file_stream logic.
961
2671.3.9 by Robert Collins
Review feedback and fix VFat emulated transports to not claim to have unix permissions.
962
        A file stream is a file like object with a write() method that accepts
963
        bytes to write.. Buffering may occur internally until the stream is
964
        closed with stream.close().  Calls to readv or the get_* methods will
965
        be synchronised with any internal buffering that may be present.
2671.3.2 by Robert Collins
Start open_file_stream logic.
966
967
        :param relpath: The relative path to the file.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
968
        :param mode: The mode for the newly created file,
2671.3.3 by Robert Collins
Add mode parameter to Transport.open_file_stream.
969
                     None means just use the default
2671.3.6 by Robert Collins
Review feedback.
970
        :return: A FileStream. FileStream objects have two methods, write() and
971
            close(). There is no guarantee that data is committed to the file
972
            if close() has not been called (even if get() is called on the same
973
            path).
2671.3.2 by Robert Collins
Start open_file_stream logic.
974
        """
2671.3.9 by Robert Collins
Review feedback and fix VFat emulated transports to not claim to have unix permissions.
975
        raise NotImplementedError(self.open_write_stream)
2671.3.2 by Robert Collins
Start open_file_stream logic.
976
1955.3.15 by John Arbash Meinel
Deprecate 'Transport.append' in favor of Transport.append_file or Transport.append_bytes
977
    def append_file(self, relpath, f, mode=None):
1910.7.18 by Andrew Bennetts
Merge from bzr.dev
978
        """Append bytes from a file-like object to a file at relpath.
979
980
        The file is created if it does not already exist.
981
982
        :param f: a file-like object of the bytes to append.
983
        :param mode: Unix mode for newly created files.  This is not used for
984
            existing files.
985
986
        :returns: the length of relpath before the content was written to it.
1955.3.15 by John Arbash Meinel
Deprecate 'Transport.append' in favor of Transport.append_file or Transport.append_bytes
987
        """
988
        symbol_versioning.warn('Transport %s should implement append_file,'
989
                               ' rather than implementing append() as of'
990
                               ' version 0.11.'
991
                               % (self.__class__.__name__,),
992
                               DeprecationWarning)
993
        return self.append(relpath, f, mode=mode)
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
994
1955.3.2 by John Arbash Meinel
Implement and test 'Transport.append_bytes', cleanup the tests of plain append
995
    def append_bytes(self, relpath, bytes, mode=None):
1910.7.18 by Andrew Bennetts
Merge from bzr.dev
996
        """Append bytes to a file at relpath.
997
998
        The file is created if it does not already exist.
999
1000
        :type f: str
1001
        :param f: a string of the bytes to append.
1002
        :param mode: Unix mode for newly created files.  This is not used for
1003
            existing files.
1004
1005
        :returns: the length of relpath before the content was written to it.
1955.3.2 by John Arbash Meinel
Implement and test 'Transport.append_bytes', cleanup the tests of plain append
1006
        """
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
1007
        if not isinstance(bytes, str):
1008
            raise TypeError(
1009
                'bytes must be a plain string, not %s' % type(bytes))
1955.3.15 by John Arbash Meinel
Deprecate 'Transport.append' in favor of Transport.append_file or Transport.append_bytes
1010
        return self.append_file(relpath, StringIO(bytes), mode=mode)
1955.3.2 by John Arbash Meinel
Implement and test 'Transport.append_bytes', cleanup the tests of plain append
1011
1185.11.19 by John Arbash Meinel
Testing put and append, also testing agaist file-like objects as well as strings.
1012
    def append_multi(self, files, pb=None):
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
1013
        """Append the text in each file-like or string object to
1014
        the supplied location.
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
1015
1016
        :param files: A set of (path, f) entries
4463.1.1 by Martin Pool
Update docstrings for recent progress changes
1017
        :param pb:  An optional ProgressTask for indicating percent done.
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
1018
        """
1955.3.15 by John Arbash Meinel
Deprecate 'Transport.append' in favor of Transport.append_file or Transport.append_bytes
1019
        return self._iterate_over(files, self.append_file, pb, 'append', expand=True)
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
1020
1021
    def copy(self, rel_from, rel_to):
1530.1.3 by Robert Collins
transport implementations now tested consistently.
1022
        """Copy the item at rel_from to the location at rel_to.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1023
1024
        Override this for efficiency if a specific transport can do it
1530.1.3 by Robert Collins
transport implementations now tested consistently.
1025
        faster than this default implementation.
1026
        """
1955.3.11 by John Arbash Meinel
Clean up the rest of the api calls to deprecated functions in the test suite, and make sure Transport._pump is only accepting files, not strings
1027
        self.put_file(rel_to, self.get(rel_from))
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
1028
907.1.28 by John Arbash Meinel
Added pb to function that were missing, implemented a basic double-dispatch copy_to function.
1029
    def copy_multi(self, relpaths, pb=None):
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
1030
        """Copy a bunch of entries.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1031
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
1032
        :param relpaths: A list of tuples of the form [(from, to), (from, to),...]
1033
        """
1034
        # This is the non-pipelined implementation, so that
1035
        # implementors don't have to implement everything.
907.1.14 by John Arbash Meinel
Handling some transport functions which take only a single argument.
1036
        return self._iterate_over(relpaths, self.copy, pb, 'copy', expand=True)
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
1037
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
1038
    def copy_to(self, relpaths, other, mode=None, pb=None):
907.1.28 by John Arbash Meinel
Added pb to function that were missing, implemented a basic double-dispatch copy_to function.
1039
        """Copy a set of entries from self into another Transport.
1040
1041
        :param relpaths: A list/generator of entries to be copied.
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
1042
        :param mode: This is the target mode for the newly created files
1185.16.156 by John Arbash Meinel
Adding a note about changing copy_to's interface
1043
        TODO: This interface needs to be updated so that the target location
1044
              can be different from the source location.
907.1.28 by John Arbash Meinel
Added pb to function that were missing, implemented a basic double-dispatch copy_to function.
1045
        """
1046
        # The dummy implementation just does a simple get + put
1047
        def copy_entry(path):
1955.3.11 by John Arbash Meinel
Clean up the rest of the api calls to deprecated functions in the test suite, and make sure Transport._pump is only accepting files, not strings
1048
            other.put_file(path, self.get(path), mode=mode)
907.1.28 by John Arbash Meinel
Added pb to function that were missing, implemented a basic double-dispatch copy_to function.
1049
1563.2.3 by Robert Collins
Change the return signature of transport.append and append_multi to return the length of the pre-append content.
1050
        return len(self._iterate_over(relpaths, copy_entry, pb, 'copy_to', expand=False))
907.1.28 by John Arbash Meinel
Added pb to function that were missing, implemented a basic double-dispatch copy_to function.
1051
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
1052
    def copy_tree(self, from_relpath, to_relpath):
1053
        """Copy a subtree from one relpath to another.
1054
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1055
        If a faster implementation is available, specific transports should
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
1056
        implement it.
1057
        """
1058
        source = self.clone(from_relpath)
1059
        target = self.clone(to_relpath)
4634.148.5 by Martin Pool
Additional fix for setting permissions across ftp (thanks Parth)
1060
1061
        # create target directory with the same rwx bits as source.
1062
        # use mask to ensure that bits other than rwx are ignored.
4634.148.1 by Martin Pool
Backport fix for permissions of backup.bzr
1063
        stat = self.stat(from_relpath)
4634.148.5 by Martin Pool
Additional fix for setting permissions across ftp (thanks Parth)
1064
        target.mkdir('.', stat.st_mode & 0777)
1551.21.5 by Aaron Bentley
Implement copy_tree on copy_tree_to_transport
1065
        source.copy_tree_to_transport(target)
1066
1067
    def copy_tree_to_transport(self, to_transport):
1068
        """Copy a subtree from one transport to another.
1069
1070
        self.base is used as the source tree root, and to_transport.base
1071
        is used as the target.  to_transport.base must exist (and be a
1072
        directory).
1073
        """
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
1074
        files = []
1075
        directories = ['.']
1076
        while directories:
1077
            dir = directories.pop()
1078
            if dir != '.':
1551.21.5 by Aaron Bentley
Implement copy_tree on copy_tree_to_transport
1079
                to_transport.mkdir(dir)
1080
            for path in self.list_dir(dir):
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
1081
                path = dir + '/' + path
1551.21.5 by Aaron Bentley
Implement copy_tree on copy_tree_to_transport
1082
                stat = self.stat(path)
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
1083
                if S_ISDIR(stat.st_mode):
1084
                    directories.append(path)
1085
                else:
1086
                    files.append(path)
1551.21.5 by Aaron Bentley
Implement copy_tree on copy_tree_to_transport
1087
        self.copy_to(files, to_transport)
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
1088
1553.5.13 by Martin Pool
New Transport.rename that mustn't overwrite
1089
    def rename(self, rel_from, rel_to):
1090
        """Rename a file or directory.
1091
1092
        This *must* fail if the destination is a nonempty directory - it must
1093
        not automatically remove it.  It should raise DirectoryNotEmpty, or
1094
        some other PathError if the case can't be specifically detected.
1095
1096
        If the destination is an empty directory or a file this function may
1097
        either fail or succeed, depending on the underlying transport.  It
1098
        should not attempt to remove the destination if overwriting is not the
1099
        native transport behaviour.  If at all possible the transport should
1100
        ensure that the rename either completes or not, without leaving the
1101
        destination deleted and the new file not moved in place.
1102
1103
        This is intended mainly for use in implementing LockDir.
1104
        """
1105
        # transports may need to override this
1553.5.17 by Martin Pool
Transport.rename should be unimplemented in base class
1106
        raise NotImplementedError(self.rename)
1553.5.13 by Martin Pool
New Transport.rename that mustn't overwrite
1107
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
1108
    def move(self, rel_from, rel_to):
1530.1.3 by Robert Collins
transport implementations now tested consistently.
1109
        """Move the item at rel_from to the location at rel_to.
1553.5.13 by Martin Pool
New Transport.rename that mustn't overwrite
1110
1111
        The destination is deleted if possible, even if it's a non-empty
1112
        directory tree.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1113
1530.1.3 by Robert Collins
transport implementations now tested consistently.
1114
        If a transport can directly implement this it is suggested that
1115
        it do so for efficiency.
1116
        """
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
1117
        if S_ISDIR(self.stat(rel_from).st_mode):
1118
            self.copy_tree(rel_from, rel_to)
1119
            self.delete_tree(rel_from)
1120
        else:
1121
            self.copy(rel_from, rel_to)
1122
            self.delete(rel_from)
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
1123
907.1.28 by John Arbash Meinel
Added pb to function that were missing, implemented a basic double-dispatch copy_to function.
1124
    def move_multi(self, relpaths, pb=None):
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
1125
        """Move a bunch of entries.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1126
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
1127
        :param relpaths: A list of tuples of the form [(from1, to1), (from2, to2),...]
1128
        """
907.1.14 by John Arbash Meinel
Handling some transport functions which take only a single argument.
1129
        return self._iterate_over(relpaths, self.move, pb, 'move', expand=True)
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
1130
1131
    def move_multi_to(self, relpaths, rel_to):
1132
        """Move a bunch of entries to a single location.
1133
        This differs from move_multi in that you give a list of from, and
1134
        a single destination, rather than multiple destinations.
1135
1136
        :param relpaths: A list of relative paths [from1, from2, from3, ...]
1137
        :param rel_to: A directory where each entry should be placed.
1138
        """
1139
        # This is not implemented, because you need to do special tricks to
1140
        # extract the basename, and add it to rel_to
1540.3.1 by Martin Pool
First-cut implementation of pycurl. Substantially faster than using urllib.
1141
        raise NotImplementedError(self.move_multi_to)
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
1142
1143
    def delete(self, relpath):
1144
        """Delete the item at relpath"""
1540.3.1 by Martin Pool
First-cut implementation of pycurl. Substantially faster than using urllib.
1145
        raise NotImplementedError(self.delete)
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
1146
907.1.28 by John Arbash Meinel
Added pb to function that were missing, implemented a basic double-dispatch copy_to function.
1147
    def delete_multi(self, relpaths, pb=None):
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
1148
        """Queue up a bunch of deletes to be done.
1149
        """
907.1.14 by John Arbash Meinel
Handling some transport functions which take only a single argument.
1150
        return self._iterate_over(relpaths, self.delete, pb, 'delete', expand=False)
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
1151
1534.4.15 by Robert Collins
Remove shutil dependency in upgrade - create a delete_tree method for transports.
1152
    def delete_tree(self, relpath):
1153
        """Delete an entire tree. This may require a listable transport."""
1154
        subtree = self.clone(relpath)
1155
        files = []
1156
        directories = ['.']
1157
        pending_rmdirs = []
1158
        while directories:
1159
            dir = directories.pop()
1160
            if dir != '.':
1161
                pending_rmdirs.append(dir)
1162
            for path in subtree.list_dir(dir):
1163
                path = dir + '/' + path
1164
                stat = subtree.stat(path)
1165
                if S_ISDIR(stat.st_mode):
1166
                    directories.append(path)
1167
                else:
1168
                    files.append(path)
1169
        subtree.delete_multi(files)
1170
        pending_rmdirs.reverse()
1171
        for dir in pending_rmdirs:
1172
            subtree.rmdir(dir)
1173
        self.rmdir(relpath)
1174
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
1175
    def __repr__(self):
1176
        return "<%s.%s url=%s>" % (self.__module__, self.__class__.__name__, self.base)
1177
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
1178
    def stat(self, relpath):
1179
        """Return the stat information for a file.
1180
        WARNING: This may not be implementable for all protocols, so use
1181
        sparingly.
1442.1.44 by Robert Collins
Many transport related tweaks:
1182
        NOTE: This returns an object with fields such as 'st_size'. It MAY
1183
        or MAY NOT return the literal result of an os.stat() call, so all
1184
        access should be via named fields.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1185
        ALSO NOTE: Stats of directories may not be supported on some
1442.1.44 by Robert Collins
Many transport related tweaks:
1186
        transports.
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
1187
        """
1540.3.1 by Martin Pool
First-cut implementation of pycurl. Substantially faster than using urllib.
1188
        raise NotImplementedError(self.stat)
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
1189
1534.4.15 by Robert Collins
Remove shutil dependency in upgrade - create a delete_tree method for transports.
1190
    def rmdir(self, relpath):
1191
        """Remove a directory at the given path."""
1192
        raise NotImplementedError
1193
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
1194
    def stat_multi(self, relpaths, pb=None):
1195
        """Stat multiple files and return the information.
1196
        """
1197
        #TODO:  Is it worth making this a generator instead of a
1198
        #       returning a list?
1199
        stats = []
1200
        def gather(path):
1201
            stats.append(self.stat(path))
1202
907.1.14 by John Arbash Meinel
Handling some transport functions which take only a single argument.
1203
        count = self._iterate_over(relpaths, gather, pb, 'stat', expand=False)
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
1204
        return stats
1205
5056.1.4 by Neil Santos
Changed stat() in SFTPTransport and LocalTransport back to calling plain stat(), instead of lstat().
1206
    def readlink(self, relpath):
1207
        """Return a string representing the path to which the symbolic link points."""
1208
        raise errors.TransportNotPossible("Dereferencing symlinks is not supported on %s" % self)
1209
5056.1.9 by Neil Santos
Renamed link() methods to hardlink(), as per mbp's suggestion
1210
    def hardlink(self, source, link_name):
5056.1.4 by Neil Santos
Changed stat() in SFTPTransport and LocalTransport back to calling plain stat(), instead of lstat().
1211
        """Create a hardlink pointing to source named link_name."""
5056.1.1 by Neil Santos
Added default link() and symlink() methods to Transport.
1212
        raise errors.TransportNotPossible("Hard links are not supported on %s" % self)
1213
1214
    def symlink(self, source, link_name):
5056.1.4 by Neil Santos
Changed stat() in SFTPTransport and LocalTransport back to calling plain stat(), instead of lstat().
1215
        """Create a symlink pointing to source named link_name."""
5056.1.1 by Neil Santos
Added default link() and symlink() methods to Transport.
1216
        raise errors.TransportNotPossible("Symlinks are not supported on %s" % self)
1217
1400.1.1 by Robert Collins
implement a basic test for the ui branch command from http servers
1218
    def listable(self):
1219
        """Return True if this store supports listing."""
1540.3.1 by Martin Pool
First-cut implementation of pycurl. Substantially faster than using urllib.
1220
        raise NotImplementedError(self.listable)
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
1221
1222
    def list_dir(self, relpath):
1223
        """Return a list of all files at the given location.
1224
        WARNING: many transports do not support this, so trying avoid using
1225
        it if at all possible.
1226
        """
1910.16.1 by Andrew Bennetts
lock_read and lock_write may raise TransportNotPossible.
1227
        raise errors.TransportNotPossible("Transport %r has not "
1530.1.21 by Robert Collins
Review feedback fixes.
1228
                                          "implemented list_dir "
1530.1.3 by Robert Collins
transport implementations now tested consistently.
1229
                                          "(but must claim to be listable "
1910.16.1 by Andrew Bennetts
lock_read and lock_write may raise TransportNotPossible.
1230
                                          "to trigger this error)."
1231
                                          % (self))
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
1232
907.1.24 by John Arbash Meinel
Remote functionality work.
1233
    def lock_read(self, relpath):
1234
        """Lock the given file for shared (read) access.
1910.16.1 by Andrew Bennetts
lock_read and lock_write may raise TransportNotPossible.
1235
1236
        WARNING: many transports do not support this, so trying avoid using it.
1237
        These methods may be removed in the future.
1238
1239
        Transports may raise TransportNotPossible if OS-level locks cannot be
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1240
        taken over this transport.
907.1.24 by John Arbash Meinel
Remote functionality work.
1241
1242
        :return: A lock object, which should contain an unlock() function.
1243
        """
1910.16.1 by Andrew Bennetts
lock_read and lock_write may raise TransportNotPossible.
1244
        raise errors.TransportNotPossible("transport locks not supported on %s" % self)
907.1.24 by John Arbash Meinel
Remote functionality work.
1245
1246
    def lock_write(self, relpath):
1247
        """Lock the given file for exclusive (write) access.
1910.16.1 by Andrew Bennetts
lock_read and lock_write may raise TransportNotPossible.
1248
1249
        WARNING: many transports do not support this, so trying avoid using it.
1250
        These methods may be removed in the future.
1251
1252
        Transports may raise TransportNotPossible if OS-level locks cannot be
1253
        taken over this transport.
907.1.24 by John Arbash Meinel
Remote functionality work.
1254
1255
        :return: A lock object, which should contain an unlock() function.
1256
        """
1910.16.1 by Andrew Bennetts
lock_read and lock_write may raise TransportNotPossible.
1257
        raise errors.TransportNotPossible("transport locks not supported on %s" % self)
907.1.24 by John Arbash Meinel
Remote functionality work.
1258
1530.1.3 by Robert Collins
transport implementations now tested consistently.
1259
    def is_readonly(self):
1260
        """Return true if this connection cannot be written to."""
1261
        return False
1262
1608.2.7 by Martin Pool
Rename supports_unix_modebits to _can_roundtrip_unix_modebits for clarity
1263
    def _can_roundtrip_unix_modebits(self):
1608.2.5 by Martin Pool
Add Transport.supports_unix_modebits, so tests can
1264
        """Return true if this transport can store and retrieve unix modebits.
1265
1266
        (For example, 0700 to make a directory owner-private.)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1267
1268
        Note: most callers will not want to switch on this, but should rather
1608.2.5 by Martin Pool
Add Transport.supports_unix_modebits, so tests can
1269
        just try and set permissions and let them be either stored or not.
1270
        This is intended mainly for the use of the test suite.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1271
1272
        Warning: this is not guaranteed to be accurate as sometimes we can't
1608.2.5 by Martin Pool
Add Transport.supports_unix_modebits, so tests can
1273
        be sure: for example with vfat mounted on unix, or a windows sftp
1274
        server."""
1275
        # TODO: Perhaps return a e.g. TransportCharacteristics that can answer
1276
        # several questions about the transport.
1277
        return False
1278
2485.8.37 by Vincent Ladeuil
Fix merge multiple connections. Test suite *not* passing (sftp
1279
    def _reuse_for(self, other_base):
2485.8.43 by Vincent Ladeuil
Cleaning.
1280
        # This is really needed for ConnectedTransport only, but it's easier to
1281
        # have Transport refuses to be reused than testing that the reuse
1282
        # should be asked to ConnectedTransport only.
2485.8.37 by Vincent Ladeuil
Fix merge multiple connections. Test suite *not* passing (sftp
1283
        return None
907.1.24 by John Arbash Meinel
Remote functionality work.
1284
5247.2.12 by Vincent Ladeuil
Ensure that all transports close their underlying connection.
1285
    def disconnect(self):
1286
        # This is really needed for ConnectedTransport only, but it's easier to
1287
        # have Transport do nothing than testing that the disconnect should be
1288
        # asked to ConnectedTransport only.
1289
        pass
1290
3878.4.5 by Vincent Ladeuil
Don't use the exception as a parameter for _redirected_to.
1291
    def _redirected_to(self, source, target):
3878.4.1 by Vincent Ladeuil
Fix bug #245964 by preserving decorators during redirections (when
1292
        """Returns a transport suitable to re-issue a redirected request.
1293
3878.4.5 by Vincent Ladeuil
Don't use the exception as a parameter for _redirected_to.
1294
        :param source: The source url as returned by the server.
1295
        :param target: The target url as returned by the server.
3878.4.1 by Vincent Ladeuil
Fix bug #245964 by preserving decorators during redirections (when
1296
1297
        The redirection can be handled only if the relpath involved is not
1298
        renamed by the redirection.
1299
1300
        :returns: A transport or None.
1301
        """
1302
        # This returns None by default, meaning the transport can't handle the
1303
        # redirection.
1304
        return None
1305
1306
2485.8.54 by Vincent Ladeuil
Refactor medium uses by making a distinction betweem shared and real medium.
1307
2485.8.55 by Vincent Ladeuil
Cleanup connection accessors.
1308
class _SharedConnection(object):
1309
    """A connection shared between several transports."""
1310
3104.4.1 by Andrew Bennetts
Fix paths sent by bzr+http client to correctly adjust for shared medium.
1311
    def __init__(self, connection=None, credentials=None, base=None):
2485.8.55 by Vincent Ladeuil
Cleanup connection accessors.
1312
        """Constructor.
1313
1314
        :param connection: An opaque object specific to each transport.
1315
1316
        :param credentials: An opaque object containing the credentials used to
1317
            create the connection.
1318
        """
1319
        self.connection = connection
1320
        self.credentials = credentials
3104.4.1 by Andrew Bennetts
Fix paths sent by bzr+http client to correctly adjust for shared medium.
1321
        self.base = base
2485.8.55 by Vincent Ladeuil
Cleanup connection accessors.
1322
1323
2485.8.19 by Vincent Ladeuil
Add a new ConnectedTransport class refactored from [s]ftp and http.
1324
class ConnectedTransport(Transport):
1325
    """A transport connected to a remote server.
1326
2485.8.28 by Vincent Ladeuil
Further simplifications and doc updates.
1327
    This class provide the basis to implement transports that need to connect
1328
    to a remote server.
1329
1330
    Host and credentials are available as private attributes, cloning preserves
1331
    them and share the underlying, protocol specific, connection.
2485.8.19 by Vincent Ladeuil
Add a new ConnectedTransport class refactored from [s]ftp and http.
1332
    """
1333
2485.8.59 by Vincent Ladeuil
Update from review comments.
1334
    def __init__(self, base, _from_transport=None):
2485.8.28 by Vincent Ladeuil
Further simplifications and doc updates.
1335
        """Constructor.
1336
2485.8.62 by Vincent Ladeuil
From review comments, fix typos and deprecate some functions.
1337
        The caller should ensure that _from_transport points at the same host
1338
        as the new base.
1339
2485.8.28 by Vincent Ladeuil
Further simplifications and doc updates.
1340
        :param base: transport root URL
1341
2485.8.59 by Vincent Ladeuil
Update from review comments.
1342
        :param _from_transport: optional transport to build from. The built
2485.8.28 by Vincent Ladeuil
Further simplifications and doc updates.
1343
            transport will share the connection with this transport.
1344
        """
2485.8.59 by Vincent Ladeuil
Update from review comments.
1345
        if not base.endswith('/'):
2485.8.19 by Vincent Ladeuil
Add a new ConnectedTransport class refactored from [s]ftp and http.
1346
            base += '/'
1347
        (self._scheme,
1348
         self._user, self._password,
1349
         self._host, self._port,
2485.8.47 by Vincent Ladeuil
Remove _initial_split_url hack.
1350
         self._path) = self._split_url(base)
2485.8.59 by Vincent Ladeuil
Update from review comments.
1351
        if _from_transport is not None:
2485.8.28 by Vincent Ladeuil
Further simplifications and doc updates.
1352
            # Copy the password as it does not appear in base and will be lost
2485.8.59 by Vincent Ladeuil
Update from review comments.
1353
            # otherwise. It can appear in the _split_url above if the user
1354
            # provided it on the command line. Otherwise, daughter classes will
1355
            # prompt the user for one when appropriate.
1356
            self._password = _from_transport._password
2485.8.25 by Vincent Ladeuil
Separate abspath from _remote_path, the intents are different.
1357
2485.8.19 by Vincent Ladeuil
Add a new ConnectedTransport class refactored from [s]ftp and http.
1358
        base = self._unsplit_url(self._scheme,
1359
                                 self._user, self._password,
1360
                                 self._host, self._port,
2485.8.28 by Vincent Ladeuil
Further simplifications and doc updates.
1361
                                 self._path)
2485.8.25 by Vincent Ladeuil
Separate abspath from _remote_path, the intents are different.
1362
2485.8.19 by Vincent Ladeuil
Add a new ConnectedTransport class refactored from [s]ftp and http.
1363
        super(ConnectedTransport, self).__init__(base)
2485.8.59 by Vincent Ladeuil
Update from review comments.
1364
        if _from_transport is None:
2485.8.55 by Vincent Ladeuil
Cleanup connection accessors.
1365
            self._shared_connection = _SharedConnection()
2485.8.19 by Vincent Ladeuil
Add a new ConnectedTransport class refactored from [s]ftp and http.
1366
        else:
2485.8.59 by Vincent Ladeuil
Update from review comments.
1367
            self._shared_connection = _from_transport._shared_connection
2485.8.19 by Vincent Ladeuil
Add a new ConnectedTransport class refactored from [s]ftp and http.
1368
2485.8.25 by Vincent Ladeuil
Separate abspath from _remote_path, the intents are different.
1369
    def clone(self, offset=None):
1370
        """Return a new transport with root at self.base + offset
1371
1372
        We leave the daughter classes take advantage of the hint
1373
        that it's a cloning not a raw creation.
1374
        """
1375
        if offset is None:
2485.8.59 by Vincent Ladeuil
Update from review comments.
1376
            return self.__class__(self.base, _from_transport=self)
2485.8.25 by Vincent Ladeuil
Separate abspath from _remote_path, the intents are different.
1377
        else:
2485.8.59 by Vincent Ladeuil
Update from review comments.
1378
            return self.__class__(self.abspath(offset), _from_transport=self)
2485.8.25 by Vincent Ladeuil
Separate abspath from _remote_path, the intents are different.
1379
2485.8.47 by Vincent Ladeuil
Remove _initial_split_url hack.
1380
    @staticmethod
1381
    def _split_url(url):
3873.3.1 by Martin Pool
Move Transport._split_url to urlutils, and ad a simple test
1382
        return urlutils.parse_url(url)
2485.8.25 by Vincent Ladeuil
Separate abspath from _remote_path, the intents are different.
1383
2485.8.47 by Vincent Ladeuil
Remove _initial_split_url hack.
1384
    @staticmethod
1385
    def _unsplit_url(scheme, user, password, host, port, path):
2485.8.28 by Vincent Ladeuil
Further simplifications and doc updates.
1386
        """
1387
        Build the full URL for the given already URL encoded path.
1388
1389
        user, password, host and path will be quoted if they contain reserved
1390
        chars.
1391
1392
        :param scheme: protocol
1393
1394
        :param user: login
1395
1396
        :param password: associated password
1397
1398
        :param host: the server address
1399
1400
        :param port: the associated port
1401
1402
        :param path: the absolute path on the server
1403
1404
        :return: The corresponding URL.
1405
        """
2485.8.19 by Vincent Ladeuil
Add a new ConnectedTransport class refactored from [s]ftp and http.
1406
        netloc = urllib.quote(host)
1407
        if user is not None:
1408
            # Note that we don't put the password back even if we
1409
            # have one so that it doesn't get accidentally
1410
            # exposed.
1411
            netloc = '%s@%s' % (urllib.quote(user), netloc)
3004.2.1 by Vincent Ladeuil
Fix 150860 by leaving port as user specified it.
1412
        if port is not None:
2485.8.19 by Vincent Ladeuil
Add a new ConnectedTransport class refactored from [s]ftp and http.
1413
            netloc = '%s:%d' % (netloc, port)
4505.3.1 by Andy Kilner
Fix up another tilde bug.
1414
        path = urlutils.escape(path)
2485.8.19 by Vincent Ladeuil
Add a new ConnectedTransport class refactored from [s]ftp and http.
1415
        return urlparse.urlunparse((scheme, netloc, path, None, None, None))
1416
1417
    def relpath(self, abspath):
2485.8.29 by Vincent Ladeuil
Cometic changes (and a typo).
1418
        """Return the local path portion from a given absolute path"""
1419
        scheme, user, password, host, port, path = self._split_url(abspath)
2485.8.19 by Vincent Ladeuil
Add a new ConnectedTransport class refactored from [s]ftp and http.
1420
        error = []
1421
        if (scheme != self._scheme):
1422
            error.append('scheme mismatch')
1423
        if (user != self._user):
2485.8.25 by Vincent Ladeuil
Separate abspath from _remote_path, the intents are different.
1424
            error.append('user name mismatch')
2485.8.19 by Vincent Ladeuil
Add a new ConnectedTransport class refactored from [s]ftp and http.
1425
        if (host != self._host):
1426
            error.append('host mismatch')
1427
        if (port != self._port):
1428
            error.append('port mismatch')
1429
        if not (path == self._path[:-1] or path.startswith(self._path)):
1430
            error.append('path mismatch')
1431
        if error:
1432
            extra = ', '.join(error)
1433
            raise errors.PathNotChild(abspath, self.base, extra=extra)
1434
        pl = len(self._path)
1435
        return path[pl:].strip('/')
1436
1437
    def abspath(self, relpath):
1438
        """Return the full url to the given relative path.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1439
2485.8.19 by Vincent Ladeuil
Add a new ConnectedTransport class refactored from [s]ftp and http.
1440
        :param relpath: the relative path urlencoded
2485.8.28 by Vincent Ladeuil
Further simplifications and doc updates.
1441
2485.8.25 by Vincent Ladeuil
Separate abspath from _remote_path, the intents are different.
1442
        :returns: the Unicode version of the absolute path for relpath.
2485.8.19 by Vincent Ladeuil
Add a new ConnectedTransport class refactored from [s]ftp and http.
1443
        """
2485.8.25 by Vincent Ladeuil
Separate abspath from _remote_path, the intents are different.
1444
        relative = urlutils.unescape(relpath).encode('utf-8')
1445
        path = self._combine_paths(self._path, relative)
2485.8.19 by Vincent Ladeuil
Add a new ConnectedTransport class refactored from [s]ftp and http.
1446
        return self._unsplit_url(self._scheme, self._user, self._password,
1447
                                 self._host, self._port,
2485.8.28 by Vincent Ladeuil
Further simplifications and doc updates.
1448
                                 path)
2485.8.19 by Vincent Ladeuil
Add a new ConnectedTransport class refactored from [s]ftp and http.
1449
1450
    def _remote_path(self, relpath):
1451
        """Return the absolute path part of the url to the given relative path.
2485.8.28 by Vincent Ladeuil
Further simplifications and doc updates.
1452
1453
        This is the path that the remote server expect to receive in the
1454
        requests, daughter classes should redefine this method if needed and
1455
        use the result to build their requests.
1456
1457
        :param relpath: the path relative to the transport base urlencoded.
1458
1459
        :return: the absolute Unicode path on the server,
2485.8.19 by Vincent Ladeuil
Add a new ConnectedTransport class refactored from [s]ftp and http.
1460
        """
1461
        relative = urlutils.unescape(relpath).encode('utf-8')
1462
        remote_path = self._combine_paths(self._path, relative)
1463
        return remote_path
1464
2485.8.54 by Vincent Ladeuil
Refactor medium uses by making a distinction betweem shared and real medium.
1465
    def _get_shared_connection(self):
1466
        """Get the object shared amongst cloned transports.
1467
1468
        This should be used only by classes that needs to extend the sharing
3004.2.1 by Vincent Ladeuil
Fix 150860 by leaving port as user specified it.
1469
        with objects other than transports.
2485.8.54 by Vincent Ladeuil
Refactor medium uses by making a distinction betweem shared and real medium.
1470
1471
        Use _get_connection to get the connection itself.
1472
        """
1473
        return self._shared_connection
2485.8.32 by Vincent Ladeuil
Keep credentials used at connection creation for reconnection purposes.
1474
1475
    def _set_connection(self, connection, credentials=None):
2485.8.34 by Vincent Ladeuil
Refactor mutiple connections detection and fix false positives. Only
1476
        """Record a newly created connection with its associated credentials.
2485.8.19 by Vincent Ladeuil
Add a new ConnectedTransport class refactored from [s]ftp and http.
1477
2485.8.30 by Vincent Ladeuil
Implement reliable connection sharing.
1478
        Note: To ensure that connection is still shared after a temporary
1479
        failure and a new one needs to be created, daughter classes should
2485.8.34 by Vincent Ladeuil
Refactor mutiple connections detection and fix false positives. Only
1480
        always call this method to set the connection and do so each time a new
1481
        connection is created.
2485.8.32 by Vincent Ladeuil
Keep credentials used at connection creation for reconnection purposes.
1482
1483
        :param connection: An opaque object representing the connection used by
1484
            the daughter class.
1485
1486
        :param credentials: An opaque object representing the credentials
1487
            needed to create the connection.
2485.8.19 by Vincent Ladeuil
Add a new ConnectedTransport class refactored from [s]ftp and http.
1488
        """
2485.8.55 by Vincent Ladeuil
Cleanup connection accessors.
1489
        self._shared_connection.connection = connection
1490
        self._shared_connection.credentials = credentials
2485.8.32 by Vincent Ladeuil
Keep credentials used at connection creation for reconnection purposes.
1491
1492
    def _get_connection(self):
2485.8.30 by Vincent Ladeuil
Implement reliable connection sharing.
1493
        """Returns the transport specific connection object."""
2485.8.55 by Vincent Ladeuil
Cleanup connection accessors.
1494
        return self._shared_connection.connection
2485.8.30 by Vincent Ladeuil
Implement reliable connection sharing.
1495
2485.8.32 by Vincent Ladeuil
Keep credentials used at connection creation for reconnection purposes.
1496
    def _get_credentials(self):
2485.8.34 by Vincent Ladeuil
Refactor mutiple connections detection and fix false positives. Only
1497
        """Returns the credentials used to establish the connection."""
2485.8.55 by Vincent Ladeuil
Cleanup connection accessors.
1498
        return self._shared_connection.credentials
2485.8.19 by Vincent Ladeuil
Add a new ConnectedTransport class refactored from [s]ftp and http.
1499
2485.8.39 by Vincent Ladeuil
Add tests around connection reuse.
1500
    def _update_credentials(self, credentials):
1501
        """Update the credentials of the current connection.
1502
1503
        Some protocols can renegociate the credentials within a connection,
1504
        this method allows daughter classes to share updated credentials.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1505
2485.8.39 by Vincent Ladeuil
Add tests around connection reuse.
1506
        :param credentials: the updated credentials.
1507
        """
1508
        # We don't want to call _set_connection here as we are only updating
1509
        # the credentials not creating a new connection.
2485.8.55 by Vincent Ladeuil
Cleanup connection accessors.
1510
        self._shared_connection.credentials = credentials
2485.8.39 by Vincent Ladeuil
Add tests around connection reuse.
1511
2485.8.37 by Vincent Ladeuil
Fix merge multiple connections. Test suite *not* passing (sftp
1512
    def _reuse_for(self, other_base):
1513
        """Returns a transport sharing the same connection if possible.
1514
1515
        Note: we share the connection if the expected credentials are the
1516
        same: (host, port, user). Some protocols may disagree and redefine the
1517
        criteria in daughter classes.
1518
1519
        Note: we don't compare the passwords here because other_base may have
1520
        been obtained from an existing transport.base which do not mention the
1521
        password.
1522
1523
        :param other_base: the URL we want to share the connection with.
1524
1525
        :return: A new transport or None if the connection cannot be shared.
1526
        """
2990.2.2 by Vincent Ladeuil
Detect invalid transport reuse attempts by catching invalid URLs.
1527
        try:
1528
            (scheme, user, password,
1529
             host, port, path) = self._split_url(other_base)
1530
        except errors.InvalidURL:
1531
            # No hope in trying to reuse an existing transport for an invalid
1532
            # URL
1533
            return None
1534
2485.8.37 by Vincent Ladeuil
Fix merge multiple connections. Test suite *not* passing (sftp
1535
        transport = None
2485.8.39 by Vincent Ladeuil
Add tests around connection reuse.
1536
        # Don't compare passwords, they may be absent from other_base or from
1537
        # self and they don't carry more information than user anyway.
2485.8.59 by Vincent Ladeuil
Update from review comments.
1538
        if (scheme == self._scheme
1539
            and user == self._user
1540
            and host == self._host
1541
            and port == self._port):
2485.8.37 by Vincent Ladeuil
Fix merge multiple connections. Test suite *not* passing (sftp
1542
            if not path.endswith('/'):
1543
                # This normally occurs at __init__ time, but it's easier to do
2485.8.39 by Vincent Ladeuil
Add tests around connection reuse.
1544
                # it now to avoid creating two transports for the same base.
2485.8.37 by Vincent Ladeuil
Fix merge multiple connections. Test suite *not* passing (sftp
1545
                path += '/'
1546
            if self._path  == path:
1547
                # shortcut, it's really the same transport
1548
                return self
1549
            # We don't call clone here because the intent is different: we
1550
            # build a new transport on a different base (which may be totally
1551
            # unrelated) but we share the connection.
2485.8.59 by Vincent Ladeuil
Update from review comments.
1552
            transport = self.__class__(other_base, _from_transport=self)
2485.8.37 by Vincent Ladeuil
Fix merge multiple connections. Test suite *not* passing (sftp
1553
        return transport
1554
5247.2.12 by Vincent Ladeuil
Ensure that all transports close their underlying connection.
1555
    def disconnect(self):
1556
        """Disconnect the transport.
1557
1558
        If and when required the transport willl reconnect automatically.
1559
        """
1560
        raise NotImplementedError(self.disconnect)
1561
2485.8.37 by Vincent Ladeuil
Fix merge multiple connections. Test suite *not* passing (sftp
1562
5609.9.2 by Martin
Revert temporary hack indirecting calls to get_transport
1563
def get_transport(base, possible_transports=None):
1185.70.3 by Martin Pool
Various updates to make storage branch mergeable:
1564
    """Open a transport to access a URL or directory.
1565
2476.3.5 by Vincent Ladeuil
Naive implementation of transport reuse by Transport.get_transport().
1566
    :param base: either a URL or a directory name.
2485.8.37 by Vincent Ladeuil
Fix merge multiple connections. Test suite *not* passing (sftp
1567
1568
    :param transports: optional reusable transports list. If not None, created
2485.8.59 by Vincent Ladeuil
Update from review comments.
1569
        transports will be added to the list.
2485.8.37 by Vincent Ladeuil
Fix merge multiple connections. Test suite *not* passing (sftp
1570
1571
    :return: A new transport optionally sharing its connection with one of
2485.8.59 by Vincent Ladeuil
Update from review comments.
1572
        possible_transports.
1185.70.3 by Martin Pool
Various updates to make storage branch mergeable:
1573
    """
907.1.13 by John Arbash Meinel
Fixed bzr root.
1574
    if base is None:
1685.1.11 by John Arbash Meinel
Not all of the registered transports use :// as part of their path, specifically memory:/
1575
        base = '.'
1843.1.1 by John Arbash Meinel
Update get_transport to raise a nicer error which includes dependency info
1576
    last_err = None
3251.3.1 by Aaron Bentley
Add support for directory services
1577
    from bzrlib.directory_service import directories
1578
    base = directories.dereference(base)
1843.1.1 by John Arbash Meinel
Update get_transport to raise a nicer error which includes dependency info
1579
1685.1.33 by John Arbash Meinel
Be more of a Nazi about URLs not being unicode
1580
    def convert_path_to_url(base, error_str):
5254.2.1 by Gordon Tyler
Fixed how get_transport's convert_path_to_url tests whether a path is actually a URL.
1581
        if urlutils.is_url(base):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1582
            # This looks like a URL, but we weren't able to
1685.1.33 by John Arbash Meinel
Be more of a Nazi about URLs not being unicode
1583
            # instantiate it as such raise an appropriate error
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
1584
            # FIXME: we have a 'error_str' unused and we use last_err below
1843.1.1 by John Arbash Meinel
Update get_transport to raise a nicer error which includes dependency info
1585
            raise errors.UnsupportedProtocol(base, last_err)
1685.1.33 by John Arbash Meinel
Be more of a Nazi about URLs not being unicode
1586
        # This doesn't look like a protocol, consider it a local path
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
1587
        new_base = urlutils.local_path_to_url(base)
1908.3.1 by Carl Friedrich Bolz
Clean up some mutter() calls.
1588
        # mutter('converting os path %r => url %s', base, new_base)
1685.1.33 by John Arbash Meinel
Be more of a Nazi about URLs not being unicode
1589
        return new_base
1590
1591
    # Catch any URLs which are passing Unicode rather than ASCII
1592
    try:
1593
        base = base.encode('ascii')
1594
    except UnicodeError:
1595
        # Only local paths can be Unicode
1596
        base = convert_path_to_url(base,
1597
            'URLs must be properly escaped (protocol: %s)')
2476.3.5 by Vincent Ladeuil
Naive implementation of transport reuse by Transport.get_transport().
1598
1599
    transport = None
1551.18.10 by Aaron Bentley
get_transport appends to possible_transports if it's an empty list
1600
    if possible_transports is not None:
2476.3.8 by Vincent Ladeuil
Mark transports that need to be instrumented or refactored to check
1601
        for t in possible_transports:
2485.8.37 by Vincent Ladeuil
Fix merge multiple connections. Test suite *not* passing (sftp
1602
            t_same_connection = t._reuse_for(base)
1603
            if t_same_connection is not None:
1604
                # Add only new transports
1605
                if t_same_connection not in possible_transports:
1606
                    possible_transports.append(t_same_connection)
1607
                return t_same_connection
1608
3882.1.1 by Martin Pool
Don't call iteritems on transport_list_registry, because it may change during iteration
1609
    for proto, factory_list in transport_list_registry.items():
2485.8.37 by Vincent Ladeuil
Fix merge multiple connections. Test suite *not* passing (sftp
1610
        if proto is not None and base.startswith(proto):
1611
            transport, last_err = _try_transport_factories(base, factory_list)
1612
            if transport:
1551.18.10 by Aaron Bentley
get_transport appends to possible_transports if it's an empty list
1613
                if possible_transports is not None:
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
1614
                    if transport in possible_transports:
1615
                        raise AssertionError()
2485.8.37 by Vincent Ladeuil
Fix merge multiple connections. Test suite *not* passing (sftp
1616
                    possible_transports.append(transport)
1617
                return transport
1618
2485.8.43 by Vincent Ladeuil
Cleaning.
1619
    # We tried all the different protocols, now try one last time
1620
    # as a local protocol
2485.8.37 by Vincent Ladeuil
Fix merge multiple connections. Test suite *not* passing (sftp
1621
    base = convert_path_to_url(base, 'Unsupported protocol: %s')
1622
2485.8.43 by Vincent Ladeuil
Cleaning.
1623
    # The default handler is the filesystem handler, stored as protocol None
2485.8.37 by Vincent Ladeuil
Fix merge multiple connections. Test suite *not* passing (sftp
1624
    factory_list = transport_list_registry.get(None)
1625
    transport, last_err = _try_transport_factories(base, factory_list)
1626
2476.3.5 by Vincent Ladeuil
Naive implementation of transport reuse by Transport.get_transport().
1627
    return transport
1628
1629
2485.8.37 by Vincent Ladeuil
Fix merge multiple connections. Test suite *not* passing (sftp
1630
def _try_transport_factories(base, factory_list):
1631
    last_err = None
1632
    for factory in factory_list:
1633
        try:
1634
            return factory.get_obj()(base), None
1635
        except errors.DependencyNotPresent, e:
1636
            mutter("failed to instantiate transport %r for %r: %r" %
1637
                    (factory, base, e))
1638
            last_err = e
1639
            continue
1640
    return None, last_err
1641
1642
2164.2.22 by Vincent Ladeuil
Take Aaron's review comments into account.
1643
def do_catching_redirections(action, transport, redirected):
2164.2.21 by Vincent Ladeuil
Take bundles into account.
1644
    """Execute an action with given transport catching redirections.
1645
1646
    This is a facility provided for callers needing to follow redirections
2164.2.25 by Vincent Ladeuil
Fix typos noticed by Aaron.
1647
    silently. The silence is relative: it is the caller responsability to
2164.2.21 by Vincent Ladeuil
Take bundles into account.
1648
    inform the user about each redirection or only inform the user of a user
1649
    via the exception parameter.
1650
1651
    :param action: A callable, what the caller want to do while catching
1652
                  redirections.
1653
    :param transport: The initial transport used.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1654
    :param redirected: A callable receiving the redirected transport and the
2164.2.21 by Vincent Ladeuil
Take bundles into account.
1655
                  RedirectRequested exception.
1656
1657
    :return: Whatever 'action' returns
1658
    """
1659
    MAX_REDIRECTIONS = 8
1660
1661
    # If a loop occurs, there is little we can do. So we don't try to detect
1662
    # them, just getting out if too much redirections occurs. The solution
1663
    # is outside: where the loop is defined.
1664
    for redirections in range(MAX_REDIRECTIONS):
1665
        try:
2164.2.22 by Vincent Ladeuil
Take Aaron's review comments into account.
1666
            return action(transport)
2164.2.21 by Vincent Ladeuil
Take bundles into account.
1667
        except errors.RedirectRequested, e:
1668
            redirection_notice = '%s is%s redirected to %s' % (
2164.2.22 by Vincent Ladeuil
Take Aaron's review comments into account.
1669
                e.source, e.permanently, e.target)
1670
            transport = redirected(transport, e, redirection_notice)
2164.2.21 by Vincent Ladeuil
Take bundles into account.
1671
    else:
2164.2.22 by Vincent Ladeuil
Take Aaron's review comments into account.
1672
        # Loop exited without resolving redirect ? Either the
1673
        # user has kept a very very very old reference or a loop
2164.2.25 by Vincent Ladeuil
Fix typos noticed by Aaron.
1674
        # occurred in the redirections.  Nothing we can cure here:
2164.2.22 by Vincent Ladeuil
Take Aaron's review comments into account.
1675
        # tell the user. Note that as the user has been informed
1676
        # about each redirection (it is the caller responsibility
1677
        # to do that in redirected via the provided
1678
        # redirection_notice). The caller may provide more
2164.2.25 by Vincent Ladeuil
Fix typos noticed by Aaron.
1679
        # information if needed (like what file or directory we
2164.2.22 by Vincent Ladeuil
Take Aaron's review comments into account.
1680
        # were trying to act upon when the redirection loop
2164.2.25 by Vincent Ladeuil
Fix typos noticed by Aaron.
1681
        # occurred).
2164.2.22 by Vincent Ladeuil
Take Aaron's review comments into account.
1682
        raise errors.TooManyRedirections
2164.2.21 by Vincent Ladeuil
Take bundles into account.
1683
1684
1530.1.3 by Robert Collins
transport implementations now tested consistently.
1685
class Server(object):
1530.1.21 by Robert Collins
Review feedback fixes.
1686
    """A Transport Server.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1687
5017.3.1 by Vincent Ladeuil
Create a tests.test_server.TestServer class out of transport.Server (while retaining the later for some special non-tests usages).
1688
    The Server interface provides a server for a given transport type.
1530.1.21 by Robert Collins
Review feedback fixes.
1689
    """
1530.1.3 by Robert Collins
transport implementations now tested consistently.
1690
4934.3.3 by Martin Pool
Rename Server.setUp to Server.start_server
1691
    def start_server(self):
1530.1.3 by Robert Collins
transport implementations now tested consistently.
1692
        """Setup the server to service requests."""
1693
4934.3.1 by Martin Pool
Rename Server.tearDown to .stop_server
1694
    def stop_server(self):
1530.1.3 by Robert Collins
transport implementations now tested consistently.
1695
        """Remove the server and cleanup any resources it owns."""
1696
1697
1185.16.81 by mbp at sourcefrog
[merge] robert
1698
# None is the default transport, for things with no url scheme
2241.2.9 by ghigo
add the 'file://' prefix to the urlspec topic
1699
register_transport_proto('file://',
1700
            help="Access using the standard filesystem (default)")
1185.16.79 by Martin Pool
Load transports when they're first used.
1701
register_lazy_transport('file://', 'bzrlib.transport.local', 'LocalTransport')
2241.2.3 by ghigo
removed the the registration of the 'None' transport, instead we use the set_default_transport function
1702
transport_list_registry.set_default_transport("file://")
2241.2.4 by ghigo
removed commented line
1703
2241.2.5 by ghigo
add the topics transport
1704
register_transport_proto('sftp://',
2919.2.1 by John Arbash Meinel
Register netloc protocols as soon as the protocol is registered.
1705
            help="Access using SFTP (most SSH servers provide SFTP).",
1706
            register_netloc=True)
1185.16.79 by Martin Pool
Load transports when they're first used.
1707
register_lazy_transport('sftp://', 'bzrlib.transport.sftp', 'SFTPTransport')
2164.2.7 by v.ladeuil+lp at free
First implementation of transport hints.
1708
# Decorated http transport
2241.2.5 by ghigo
add the topics transport
1709
register_transport_proto('http+urllib://',
2241.2.11 by ghigo
On the basis of Robert Collins and John Arbash Meinel
1710
#                help="Read-only access of branches exported on the web."
3004.2.1 by Vincent Ladeuil
Fix 150860 by leaving port as user specified it.
1711
                         register_netloc=True)
1540.3.23 by Martin Pool
Allow urls like http+pycurl://host/ to use a particular impl
1712
register_lazy_transport('http+urllib://', 'bzrlib.transport.http._urllib',
1540.3.26 by Martin Pool
[merge] bzr.dev; pycurl not updated for readv yet
1713
                        'HttpTransport_urllib')
2241.2.5 by ghigo
add the topics transport
1714
register_transport_proto('https+urllib://',
2241.2.11 by ghigo
On the basis of Robert Collins and John Arbash Meinel
1715
#                help="Read-only access of branches exported on the web using SSL."
3004.2.1 by Vincent Ladeuil
Fix 150860 by leaving port as user specified it.
1716
                         register_netloc=True)
1540.3.23 by Martin Pool
Allow urls like http+pycurl://host/ to use a particular impl
1717
register_lazy_transport('https+urllib://', 'bzrlib.transport.http._urllib',
1540.3.26 by Martin Pool
[merge] bzr.dev; pycurl not updated for readv yet
1718
                        'HttpTransport_urllib')
2241.2.5 by ghigo
add the topics transport
1719
register_transport_proto('http+pycurl://',
2241.2.11 by ghigo
On the basis of Robert Collins and John Arbash Meinel
1720
#                help="Read-only access of branches exported on the web."
3004.2.1 by Vincent Ladeuil
Fix 150860 by leaving port as user specified it.
1721
                         register_netloc=True)
1540.3.26 by Martin Pool
[merge] bzr.dev; pycurl not updated for readv yet
1722
register_lazy_transport('http+pycurl://', 'bzrlib.transport.http._pycurl',
1723
                        'PyCurlTransport')
2241.2.5 by ghigo
add the topics transport
1724
register_transport_proto('https+pycurl://',
2241.2.11 by ghigo
On the basis of Robert Collins and John Arbash Meinel
1725
#                help="Read-only access of branches exported on the web using SSL."
3004.2.1 by Vincent Ladeuil
Fix 150860 by leaving port as user specified it.
1726
                         register_netloc=True)
1540.3.26 by Martin Pool
[merge] bzr.dev; pycurl not updated for readv yet
1727
register_lazy_transport('https+pycurl://', 'bzrlib.transport.http._pycurl',
1728
                        'PyCurlTransport')
2164.2.7 by v.ladeuil+lp at free
First implementation of transport hints.
1729
# Default http transports (last declared wins (if it can be imported))
2241.2.5 by ghigo
add the topics transport
1730
register_transport_proto('http://',
3004.2.1 by Vincent Ladeuil
Fix 150860 by leaving port as user specified it.
1731
                 help="Read-only access of branches exported on the web.")
2241.2.5 by ghigo
add the topics transport
1732
register_transport_proto('https://',
3004.2.1 by Vincent Ladeuil
Fix 150860 by leaving port as user specified it.
1733
            help="Read-only access of branches exported on the web using SSL.")
3882.2.1 by John Arbash Meinel
Use urllib for http connections, pycurl for https connections.
1734
# The default http implementation is urllib, but https is pycurl if available
1735
register_lazy_transport('http://', 'bzrlib.transport.http._pycurl',
1736
                        'PyCurlTransport')
1540.3.26 by Martin Pool
[merge] bzr.dev; pycurl not updated for readv yet
1737
register_lazy_transport('http://', 'bzrlib.transport.http._urllib',
1738
                        'HttpTransport_urllib')
1739
register_lazy_transport('https://', 'bzrlib.transport.http._urllib',
1740
                        'HttpTransport_urllib')
3004.2.1 by Vincent Ladeuil
Fix 150860 by leaving port as user specified it.
1741
register_lazy_transport('https://', 'bzrlib.transport.http._pycurl',
1742
                        'PyCurlTransport')
2241.2.4 by ghigo
removed commented line
1743
3004.2.1 by Vincent Ladeuil
Fix 150860 by leaving port as user specified it.
1744
register_transport_proto('ftp://', help="Access using passive FTP.")
1185.36.4 by Daniel Silverstone
Add FTP transport
1745
register_lazy_transport('ftp://', 'bzrlib.transport.ftp', 'FtpTransport')
3004.2.1 by Vincent Ladeuil
Fix 150860 by leaving port as user specified it.
1746
register_transport_proto('aftp://', help="Access using active FTP.")
1185.36.4 by Daniel Silverstone
Add FTP transport
1747
register_lazy_transport('aftp://', 'bzrlib.transport.ftp', 'FtpTransport')
5270.1.3 by Jelmer Vernooij
Remove unused imports, lazily load kerberos python module.
1748
register_transport_proto('gio+', help="Access using any GIO supported protocols.")
1749
register_lazy_transport('gio+', 'bzrlib.transport.gio_transport', 'GioTransport')
1750
1751
1752
# Default to trying GSSAPI authentication (if the kerberos module is
1753
# available)
5270.1.1 by Jelmer Vernooij
Always register GSSAPI proto's, even if we don't have an implementation that uses them.
1754
register_transport_proto('ftp+gssapi://', register_netloc=True)
1755
register_transport_proto('aftp+gssapi://', register_netloc=True)
1756
register_transport_proto('ftp+nogssapi://', register_netloc=True)
1757
register_transport_proto('aftp+nogssapi://', register_netloc=True)
5270.1.3 by Jelmer Vernooij
Remove unused imports, lazily load kerberos python module.
1758
register_lazy_transport('ftp+gssapi://', 'bzrlib.transport.ftp._gssapi',
1759
                        'GSSAPIFtpTransport')
1760
register_lazy_transport('aftp+gssapi://', 'bzrlib.transport.ftp._gssapi',
1761
                        'GSSAPIFtpTransport')
1762
register_lazy_transport('ftp://', 'bzrlib.transport.ftp._gssapi',
1763
                        'GSSAPIFtpTransport')
1764
register_lazy_transport('aftp://', 'bzrlib.transport.ftp._gssapi',
1765
                        'GSSAPIFtpTransport')
1766
register_lazy_transport('ftp+nogssapi://', 'bzrlib.transport.ftp',
1767
                        'FtpTransport')
1768
register_lazy_transport('aftp+nogssapi://', 'bzrlib.transport.ftp',
1769
                        'FtpTransport')
3331.2.4 by Jelmer Vernooij
Move GSSAPI support to a separate file.
1770
2241.2.1 by ghigo
Add the TransportRegistry class
1771
register_transport_proto('memory://')
3004.2.1 by Vincent Ladeuil
Fix 150860 by leaving port as user specified it.
1772
register_lazy_transport('memory://', 'bzrlib.transport.memory',
1773
                        'MemoryTransport')
2745.5.3 by Robert Collins
* Move transport logging into a new transport class
1774
1775
# chroots cannot be implicitly accessed, they must be explicitly created:
2241.2.1 by ghigo
Add the TransportRegistry class
1776
register_transport_proto('chroot+')
2241.3.6 by ghigo
Upgraded to the latest bzr.dev
1777
2241.2.5 by ghigo
add the topics transport
1778
register_transport_proto('readonly+',
2241.2.11 by ghigo
On the basis of Robert Collins and John Arbash Meinel
1779
#              help="This modifier converts any transport to be readonly."
1780
            )
3004.2.1 by Vincent Ladeuil
Fix 150860 by leaving port as user specified it.
1781
register_lazy_transport('readonly+', 'bzrlib.transport.readonly',
1782
                        'ReadonlyTransportDecorator')
2555.3.8 by Martin Pool
Add new BrokenRenameTransportDecorator
1783
2617.4.5 by Robert Collins
Reinstate the fakenfs+ decorator registration.
1784
register_transport_proto('fakenfs+')
3004.2.1 by Vincent Ladeuil
Fix 150860 by leaving port as user specified it.
1785
register_lazy_transport('fakenfs+', 'bzrlib.transport.fakenfs',
1786
                        'FakeNFSTransportDecorator')
2617.4.5 by Robert Collins
Reinstate the fakenfs+ decorator registration.
1787
3675.1.1 by Martin Pool
Merge and update log+ transport decorator
1788
register_transport_proto('log+')
1789
register_lazy_transport('log+', 'bzrlib.transport.log', 'TransportLogDecorator')
1790
2745.5.3 by Robert Collins
* Move transport logging into a new transport class
1791
register_transport_proto('trace+')
3004.2.1 by Vincent Ladeuil
Fix 150860 by leaving port as user specified it.
1792
register_lazy_transport('trace+', 'bzrlib.transport.trace',
1793
                        'TransportTraceDecorator')
2745.5.3 by Robert Collins
* Move transport logging into a new transport class
1794
2617.4.1 by Robert Collins
Add a new transport decorator unlistable+ for testing.
1795
register_transport_proto('unlistable+')
3004.2.1 by Vincent Ladeuil
Fix 150860 by leaving port as user specified it.
1796
register_lazy_transport('unlistable+', 'bzrlib.transport.unlistable',
1797
                        'UnlistableTransportDecorator')
2555.3.8 by Martin Pool
Add new BrokenRenameTransportDecorator
1798
1799
register_transport_proto('brokenrename+')
1800
register_lazy_transport('brokenrename+', 'bzrlib.transport.brokenrename',
3004.2.1 by Vincent Ladeuil
Fix 150860 by leaving port as user specified it.
1801
                        'BrokenRenameTransportDecorator')
2555.3.8 by Martin Pool
Add new BrokenRenameTransportDecorator
1802
2241.2.1 by ghigo
Add the TransportRegistry class
1803
register_transport_proto('vfat+')
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
1804
register_lazy_transport('vfat+',
1608.2.4 by Martin Pool
[broken] Add FakeFVATTransport
1805
                        'bzrlib.transport.fakevfat',
1806
                        'FakeVFATTransportDecorator')
2919.2.1 by John Arbash Meinel
Register netloc protocols as soon as the protocol is registered.
1807
3313.3.4 by Andrew Bennetts
Add a 'nosmart+' transport decorator.
1808
register_transport_proto('nosmart+')
1809
register_lazy_transport('nosmart+', 'bzrlib.transport.nosmart',
1810
                        'NoSmartTransportDecorator')
1811
2919.2.1 by John Arbash Meinel
Register netloc protocols as soon as the protocol is registered.
1812
# These two schemes were registered, but don't seem to have an actual transport
1813
# protocol registered
1814
for scheme in ['ssh', 'bzr+loopback']:
2919.2.2 by John Arbash Meinel
fix a simple typo
1815
    register_urlparse_netloc_protocol(scheme)
2919.2.1 by John Arbash Meinel
Register netloc protocols as soon as the protocol is registered.
1816
del scheme
1817
2241.2.5 by ghigo
add the topics transport
1818
register_transport_proto('bzr://',
2811.1.1 by Andrew Bennetts
Cherrypick fix proposed for 0.90.
1819
            help="Fast access using the Bazaar smart server.",
3004.2.1 by Vincent Ladeuil
Fix 150860 by leaving port as user specified it.
1820
                         register_netloc=True)
2241.2.5 by ghigo
add the topics transport
1821
3004.2.1 by Vincent Ladeuil
Fix 150860 by leaving port as user specified it.
1822
register_lazy_transport('bzr://', 'bzrlib.transport.remote',
2413.2.1 by Andrew Bennetts
Rename Smart.*Transport classes to RemoteTransport, RemoteTCPTransport, etc.
1823
                        'RemoteTCPTransport')
3453.5.1 by Andrew Bennetts
Add {bzrdir,repository,branch}_implementations tests for Remote objects using protocol v2 and pre-1.6 RPCs.
1824
register_transport_proto('bzr-v2://', register_netloc=True)
1825
1826
register_lazy_transport('bzr-v2://', 'bzrlib.transport.remote',
1827
                        'RemoteTCPTransportV2Only')
2241.2.5 by ghigo
add the topics transport
1828
register_transport_proto('bzr+http://',
2241.2.11 by ghigo
On the basis of Robert Collins and John Arbash Meinel
1829
#                help="Fast access using the Bazaar smart server over HTTP."
3004.2.1 by Vincent Ladeuil
Fix 150860 by leaving port as user specified it.
1830
                         register_netloc=True)
1831
register_lazy_transport('bzr+http://', 'bzrlib.transport.remote',
2413.2.1 by Andrew Bennetts
Rename Smart.*Transport classes to RemoteTransport, RemoteTCPTransport, etc.
1832
                        'RemoteHTTPTransport')
2651.1.1 by John Ferlito
bzr+https support
1833
register_transport_proto('bzr+https://',
1834
#                help="Fast access using the Bazaar smart server over HTTPS."
3004.2.1 by Vincent Ladeuil
Fix 150860 by leaving port as user specified it.
1835
                         register_netloc=True)
2651.1.1 by John Ferlito
bzr+https support
1836
register_lazy_transport('bzr+https://',
1837
                        'bzrlib.transport.remote',
1838
                        'RemoteHTTPTransport')
2241.2.5 by ghigo
add the topics transport
1839
register_transport_proto('bzr+ssh://',
2919.2.1 by John Arbash Meinel
Register netloc protocols as soon as the protocol is registered.
1840
            help="Fast access using the Bazaar smart server over SSH.",
1841
            register_netloc=True)
3004.2.1 by Vincent Ladeuil
Fix 150860 by leaving port as user specified it.
1842
register_lazy_transport('bzr+ssh://', 'bzrlib.transport.remote',
2413.2.1 by Andrew Bennetts
Rename Smart.*Transport classes to RemoteTransport, RemoteTCPTransport, etc.
1843
                        'RemoteSSHTransport')
4011.4.1 by Jelmer Vernooij
Point out bzr+ssh:// to the user when they use ssh://.
1844
4011.4.2 by Jelmer Vernooij
Register ssh: rather than ssh://, avoid referring to smart server, which users may not be familiar with.
1845
register_transport_proto('ssh:')
4032.1.2 by John Arbash Meinel
Track down a few more files that have trailing whitespace.
1846
register_lazy_transport('ssh:', 'bzrlib.transport.remote',
4011.4.1 by Jelmer Vernooij
Point out bzr+ssh:// to the user when they use ssh://.
1847
                        'HintingSSHTransport')
4370.4.6 by Jelmer Vernooij
Move server protocol registry to bzrlib.transport.
1848
1849
1850
transport_server_registry = registry.Registry()
5056.1.4 by Neil Santos
Changed stat() in SFTPTransport and LocalTransport back to calling plain stat(), instead of lstat().
1851
transport_server_registry.register_lazy('bzr', 'bzrlib.smart.server',
4370.4.6 by Jelmer Vernooij
Move server protocol registry to bzrlib.transport.
1852
    'serve_bzr', help="The Bazaar smart server protocol over TCP. (default port: 4155)")
1853
transport_server_registry.default_key = 'bzr'