← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bundle/__init__.py

  • Committer: Andrew Bennetts
  • Date: 2010-10-08 08:15:14 UTC
  • mto: This revision was merged to the branch mainline in revision 5498.
  • Revision ID: andrew.bennetts@canonical.com-20101008081514-dviqzrdfwyzsqbz2
Split NEWS into per-release doc/en/release-notes/bzr-*.txt

Show diffs side-by-side

added added

removed removed

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