← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bundle/__init__.py

  • Committer: Robert Collins
  • Date: 2009-06-15 10:22:08 UTC
  • mto: This revision was merged to the branch mainline in revision 4441.
  • Revision ID: robertc@robertcollins.net-20090615102208-35q3sg050vbxd32e
And fix tests for bzr help.

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
 
 
19
17
from bzrlib.symbol_versioning import deprecated_function, deprecated_in
20
18
from bzrlib.lazy_import import lazy_import
21
19
lazy_import(globals(), """
24
22
    urlutils,
25
23
    )
26
24
from bzrlib.bundle import serializer as _serializer
27
 
from bzrlib.merge_directive import MergeDirective
28
25
from bzrlib.transport import (
29
26
    do_catching_redirections,
30
27
    get_transport,
48
45
        possible_transports=possible_transports)
49
46
    transport = child_transport.clone('..')
50
47
    filename = transport.relpath(child_transport.base)
 
48
    if filename.endswith('/'):
 
49
        # A path to a directory was passed in
 
50
        # definitely not a bundle
 
51
        raise errors.NotABundle('A directory cannot be a bundle')
51
52
    mergeable, transport = read_mergeable_from_transport(transport, filename,
52
53
                                                         _do_directive)
53
54
    return mergeable
54
55
 
55
56
 
56
57
def read_mergeable_from_transport(transport, filename, _do_directive=True):
57
 
    def get_bundle(transport):
58
 
        return StringIO(transport.get_bytes(filename)), transport
59
 
 
60
 
    def redirected_transport(transport, exception, redirection_notice):
61
 
        note(redirection_notice)
62
 
        url, filename = urlutils.split(exception.target,
63
 
                                       exclude_trailing_slash=False)
64
 
        if not filename:
65
 
            raise errors.NotABundle('A directory cannot be a bundle')
66
 
        return get_transport(url)
67
 
 
 
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.
68
61
    try:
69
 
        bytef, transport = do_catching_redirections(get_bundle, transport,
 
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,
70
75
                                                    redirected_transport)
71
 
    except errors.TooManyRedirections:
72
 
        raise errors.NotABundle(transport.clone(filename).base)
73
 
    except (errors.ConnectionReset, errors.ConnectionError), e:
 
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
 
85
    except errors.ConnectionReset:
74
86
        raise
75
87
    except (errors.TransportError, errors.PathError), e:
76
88
        raise errors.NotABundle(str(e))
83
95
        # StubSFTPServer does fail during get() (because of prefetch)
84
96
        # so it has an opportunity to translate the error.
85
97
        raise errors.NotABundle(str(e))
86
 
 
87
 
    if _do_directive:
88
 
        try:
89
 
            return MergeDirective.from_lines(bytef), transport
90
 
        except errors.NotAMergeDirective:
91
 
            bytef.seek(0)
92
 
 
93
 
    return _serializer.read_bundle(bytef), transport
 
98
    except errors.NotAMergeDirective:
 
99
        f.seek(0)
 
100
        return _serializer.read_bundle(f), transport