← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bundle/__init__.py

  • Committer: John Arbash Meinel
  • Date: 2008-10-04 14:10:13 UTC
  • mto: This revision was merged to the branch mainline in revision 3805.
  • Revision ID: john@arbash-meinel.com-20081004141013-yskxjlwtuy2k18ue
Playing around with expanding requests for btree index nodes into neighboring nodes.

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
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
 
 
17
 
from cStringIO import StringIO
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
18
16
 
19
17
from bzrlib.lazy_import import lazy_import
20
18
lazy_import(globals(), """
21
19
from bzrlib import (
22
20
    errors,
23
 
    transport as _mod_transport,
24
21
    urlutils,
25
22
    )
26
23
from bzrlib.bundle import serializer as _serializer
27
 
from bzrlib.merge_directive import MergeDirective
 
24
from bzrlib.transport import (
 
25
    do_catching_redirections,
 
26
    get_transport,
 
27
    )
28
28
""")
29
29
from bzrlib.trace import note
30
30
 
31
31
 
 
32
def read_bundle_from_url(url):
 
33
    return read_mergeable_from_url(url, _do_directive=False)
 
34
 
 
35
 
32
36
def read_mergeable_from_url(url, _do_directive=True, possible_transports=None):
33
37
    """Read mergable object from a given URL.
34
38
 
35
39
    :return: An object supporting get_target_revision.  Raises NotABundle if
36
40
        the target is not a mergeable type.
37
41
    """
38
 
    child_transport = _mod_transport.get_transport(url,
 
42
    child_transport = get_transport(url,
39
43
        possible_transports=possible_transports)
40
44
    transport = child_transport.clone('..')
41
45
    filename = transport.relpath(child_transport.base)
 
46
    if filename.endswith('/'):
 
47
        # A path to a directory was passed in
 
48
        # definitely not a bundle
 
49
        raise errors.NotABundle('A directory cannot be a bundle')
42
50
    mergeable, transport = read_mergeable_from_transport(transport, filename,
43
51
                                                         _do_directive)
44
52
    return mergeable
45
53
 
46
54
 
47
55
def read_mergeable_from_transport(transport, filename, _do_directive=True):
48
 
    def get_bundle(transport):
49
 
        return StringIO(transport.get_bytes(filename)), transport
50
 
 
51
 
    def redirected_transport(transport, exception, redirection_notice):
52
 
        note(redirection_notice)
53
 
        url, filename = urlutils.split(exception.target,
54
 
                                       exclude_trailing_slash=False)
55
 
        if not filename:
56
 
            raise errors.NotABundle('A directory cannot be a bundle')
57
 
        return _mod_transport.get_transport_from_url(url)
58
 
 
 
56
    # All of this must be in the try/except
 
57
    # Some transports cannot detect that we are trying to read a
 
58
    # directory until we actually issue read() on the handle.
59
59
    try:
60
 
        bytef, transport = _mod_transport.do_catching_redirections(
61
 
            get_bundle, transport, redirected_transport)
62
 
    except errors.TooManyRedirections:
63
 
        raise errors.NotABundle(transport.clone(filename).base)
64
 
    except (errors.ConnectionReset, errors.ConnectionError), e:
 
60
        def get_bundle(transport):
 
61
            return transport.get(filename), transport
 
62
 
 
63
        def redirected_transport(transport, exception, redirection_notice):
 
64
            note(redirection_notice)
 
65
            url, filename = urlutils.split(exception.target,
 
66
                                           exclude_trailing_slash=False)
 
67
            if not filename:
 
68
                raise errors.NotABundle('A directory cannot be a bundle')
 
69
            return get_transport(url)
 
70
 
 
71
        try:
 
72
            f, transport = do_catching_redirections(get_bundle, transport,
 
73
                                                    redirected_transport)
 
74
        except errors.TooManyRedirections:
 
75
            raise errors.NotABundle(str(url))
 
76
 
 
77
        if _do_directive:
 
78
            from bzrlib.merge_directive import MergeDirective
 
79
            directive = MergeDirective.from_lines(f.readlines())
 
80
            return directive, transport
 
81
        else:
 
82
            return _serializer.read_bundle(f), transport
 
83
    except errors.ConnectionReset:
65
84
        raise
66
85
    except (errors.TransportError, errors.PathError), e:
67
86
        raise errors.NotABundle(str(e))
71
90
        # doesn't always fail at get() time. Sometimes it fails
72
91
        # during read. And that raises a generic IOError with
73
92
        # just the string 'Failure'
74
 
        # StubSFTPServer does fail during get() (because of prefetch)
 
93
        # StubSFTPServer does fail during get() (because of prefetch) 
75
94
        # so it has an opportunity to translate the error.
76
95
        raise errors.NotABundle(str(e))
77
 
 
78
 
    if _do_directive:
79
 
        try:
80
 
            return MergeDirective.from_lines(bytef), transport
81
 
        except errors.NotAMergeDirective:
82
 
            bytef.seek(0)
83
 
 
84
 
    return _serializer.read_bundle(bytef), transport
 
96
    except errors.NotAMergeDirective:
 
97
        f.seek(0)
 
98
        return _serializer.read_bundle(f), transport