← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bundle/__init__.py

  • Committer: Danny van Heumen
  • Date: 2010-03-09 21:42:11 UTC
  • mto: (4634.139.5 2.0)
  • mto: This revision was merged to the branch mainline in revision 5160.
  • Revision ID: danny@dannyvanheumen.nl-20100309214211-iqh42x6qcikgd9p3
Reverted now-useless TODO list.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bundle/__init__.py
1
 
# Copyright (C) 2005-2010 Canonical Ltd
 
1
# Copyright (C) 2005, 2006 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
 
from cStringIO import StringIO
18
 
 
 
17
from bzrlib.symbol_versioning import deprecated_function, deprecated_in
19
18
from bzrlib.lazy_import import lazy_import
20
19
lazy_import(globals(), """
21
20
from bzrlib import (
23
22
    urlutils,
24
23
    )
25
24
from bzrlib.bundle import serializer as _serializer
26
 
from bzrlib.merge_directive import MergeDirective
27
25
from bzrlib.transport import (
28
26
    do_catching_redirections,
29
27
    get_transport,
32
30
from bzrlib.trace import note
33
31
 
34
32
 
 
33
@deprecated_function(deprecated_in((1, 12, 0)))
 
34
def read_bundle_from_url(url):
 
35
    return read_mergeable_from_url(url, _do_directive=False)
 
36
 
 
37
 
35
38
def read_mergeable_from_url(url, _do_directive=True, possible_transports=None):
36
39
    """Read mergable object from a given URL.
37
40
 
48
51
 
49
52
 
50
53
def read_mergeable_from_transport(transport, filename, _do_directive=True):
51
 
    def get_bundle(transport):
52
 
        return StringIO(transport.get_bytes(filename)), transport
53
 
 
54
 
    def redirected_transport(transport, exception, redirection_notice):
55
 
        note(redirection_notice)
56
 
        url, filename = urlutils.split(exception.target,
57
 
                                       exclude_trailing_slash=False)
58
 
        if not filename:
59
 
            raise errors.NotABundle('A directory cannot be a bundle')
60
 
        return get_transport(url)
61
 
 
 
54
    # All of this must be in the try/except
 
55
    # Some transports cannot detect that we are trying to read a
 
56
    # directory until we actually issue read() on the handle.
62
57
    try:
63
 
        bytef, transport = do_catching_redirections(get_bundle, transport,
 
58
        def get_bundle(transport):
 
59
            return transport.get(filename), transport
 
60
 
 
61
        def redirected_transport(transport, exception, redirection_notice):
 
62
            note(redirection_notice)
 
63
            url, filename = urlutils.split(exception.target,
 
64
                                           exclude_trailing_slash=False)
 
65
            if not filename:
 
66
                raise errors.NotABundle('A directory cannot be a bundle')
 
67
            return get_transport(url)
 
68
 
 
69
        try:
 
70
            f, transport = do_catching_redirections(get_bundle, transport,
64
71
                                                    redirected_transport)
65
 
    except errors.TooManyRedirections:
66
 
        raise errors.NotABundle(transport.clone(filename).base)
 
72
        except errors.TooManyRedirections:
 
73
            raise errors.NotABundle(transport.clone(filename).base)
 
74
 
 
75
        if _do_directive:
 
76
            from bzrlib.merge_directive import MergeDirective
 
77
            directive = MergeDirective.from_lines(f.readlines())
 
78
            return directive, transport
 
79
        else:
 
80
            return _serializer.read_bundle(f), transport
67
81
    except (errors.ConnectionReset, errors.ConnectionError), e:
68
82
        raise
69
83
    except (errors.TransportError, errors.PathError), e:
77
91
        # StubSFTPServer does fail during get() (because of prefetch)
78
92
        # so it has an opportunity to translate the error.
79
93
        raise errors.NotABundle(str(e))
80
 
 
81
 
    if _do_directive:
82
 
        try:
83
 
            return MergeDirective.from_lines(bytef), transport
84
 
        except errors.NotAMergeDirective:
85
 
            bytef.seek(0)
86
 
 
87
 
    return _serializer.read_bundle(bytef), transport
 
94
    except errors.NotAMergeDirective:
 
95
        f.seek(0)
 
96
        return _serializer.read_bundle(f), transport