← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bundle/__init__.py

  • Committer: Mark Hammond
  • Date: 2009-01-12 01:55:34 UTC
  • mto: (3995.8.2 prepare-1.12)
  • mto: This revision was merged to the branch mainline in revision 4007.
  • Revision ID: mhammond@skippinet.com.au-20090112015534-yfxg50p7mpds9j4v
Include all .html files from the tortoise doc directory.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bundle/__init__.py
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
18
 
 
19
 
from bzrlib.symbol_versioning import deprecated_function, deprecated_in
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
16
 
20
17
from bzrlib.lazy_import import lazy_import
21
18
lazy_import(globals(), """
22
19
from bzrlib import (
24
21
    urlutils,
25
22
    )
26
23
from bzrlib.bundle import serializer as _serializer
27
 
from bzrlib.merge_directive import MergeDirective
28
24
from bzrlib.transport import (
29
25
    do_catching_redirections,
30
26
    get_transport,
33
29
from bzrlib.trace import note
34
30
 
35
31
 
36
 
@deprecated_function(deprecated_in((1, 12, 0)))
37
32
def read_bundle_from_url(url):
38
33
    return read_mergeable_from_url(url, _do_directive=False)
39
34
 
48
43
        possible_transports=possible_transports)
49
44
    transport = child_transport.clone('..')
50
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')
51
50
    mergeable, transport = read_mergeable_from_transport(transport, filename,
52
51
                                                         _do_directive)
53
52
    return mergeable
54
53
 
55
54
 
56
55
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
 
 
 
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.
68
59
    try:
69
 
        bytef, transport = do_catching_redirections(get_bundle, transport,
 
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,
70
73
                                                    redirected_transport)
71
 
    except errors.TooManyRedirections:
72
 
        raise errors.NotABundle(transport.clone(filename).base)
73
 
    except (errors.ConnectionReset, errors.ConnectionError), e:
 
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:
74
84
        raise
75
85
    except (errors.TransportError, errors.PathError), e:
76
86
        raise errors.NotABundle(str(e))
80
90
        # doesn't always fail at get() time. Sometimes it fails
81
91
        # during read. And that raises a generic IOError with
82
92
        # just the string 'Failure'
83
 
        # StubSFTPServer does fail during get() (because of prefetch)
 
93
        # StubSFTPServer does fail during get() (because of prefetch) 
84
94
        # so it has an opportunity to translate the error.
85
95
        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
 
96
    except errors.NotAMergeDirective:
 
97
        f.seek(0)
 
98
        return _serializer.read_bundle(f), transport