← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bundle/__init__.py

  • Committer: Blake Winton
  • Date: 2007-10-16 16:02:01 UTC
  • mto: This revision was merged to the branch mainline in revision 2921.
  • Revision ID: bwinton@latte.ca-20071016160201-os2bci2ujf7in7an
Change 'print >> f,'s to 'f.write('s.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bundle/__init__.py
 
1
# Copyright (C) 2005, 2006 Canonical Ltd
 
2
#
 
3
# This program is free software; you can redistribute it and/or modify
 
4
# it under the terms of the GNU General Public License as published by
 
5
# the Free Software Foundation; either version 2 of the License, or
 
6
# (at your option) any later version.
 
7
#
 
8
# This program is distributed in the hope that it will be useful,
 
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
 
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 
11
# GNU General Public License for more details.
 
12
#
 
13
# You should have received a copy of the GNU General Public License
 
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
 
16
 
 
17
from StringIO import StringIO
 
18
 
 
19
from bzrlib.lazy_import import lazy_import
 
20
lazy_import(globals(), """
 
21
from bzrlib import (
 
22
    errors,
 
23
    urlutils,
 
24
    )
 
25
from bzrlib.bundle import serializer as _serializer
 
26
from bzrlib.transport import (
 
27
    do_catching_redirections,
 
28
    get_transport,
 
29
    )
 
30
""")
 
31
from bzrlib.trace import note
 
32
 
 
33
 
 
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):
 
39
    """Read mergable object from a given URL.
 
40
 
 
41
    :return: An object supporting get_target_revision.  Raises NotABundle if
 
42
        the target is not a mergeable type.
 
43
    """
 
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)
 
52
    mergeable, transport = read_mergeable_from_transport(transport, filename,
 
53
                                                         _do_directive)
 
54
    return mergeable
 
55
 
 
56
 
 
57
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.
 
61
    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,
 
75
                                                    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
 
85
    except (errors.TransportError, errors.PathError), e:
 
86
        raise errors.NotABundle(str(e))
 
87
    except (IOError,), e:
 
88
        # jam 20060707
 
89
        # Abstraction leakage, SFTPTransport.get('directory')
 
90
        # doesn't always fail at get() time. Sometimes it fails
 
91
        # during read. And that raises a generic IOError with
 
92
        # just the string 'Failure'
 
93
        # StubSFTPServer does fail during get() (because of prefetch) 
 
94
        # so it has an opportunity to translate the error.
 
95
        raise errors.NotABundle(str(e))
 
96
    except errors.NotAMergeDirective:
 
97
        f.seek(0)
 
98
        return _serializer.read_bundle(f), transport