← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bundle/__init__.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-06-28 07:08:27 UTC
  • mfrom: (2553.1.3 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20070628070827-h5s313dg5tnag9vj
(robertc) Show the names of commit hooks during commit.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bundle/__init__.py
34
34
def read_bundle_from_url(url):
35
35
    return read_mergeable_from_url(url, _do_directive=False)
36
36
 
37
 
 
38
37
def read_mergeable_from_url(url, _do_directive=True):
39
38
    """Read mergable object from a given URL.
40
39
 
41
40
    :return: An object supporting get_target_revision.  Raises NotABundle if
42
41
        the target is not a mergeable type.
43
42
    """
 
43
    from bzrlib.merge_directive import MergeDirective
44
44
    url = urlutils.normalize_url(url)
45
45
    url, filename = urlutils.split(url, exclude_trailing_slash=False)
46
46
    if not filename:
48
48
        # definitely not a bundle
49
49
        raise errors.NotABundle('A directory cannot be a bundle')
50
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
51
    # All of this must be in the try/except
59
52
    # Some transports cannot detect that we are trying to read a
60
53
    # directory until we actually issue read() on the handle.
61
54
    try:
 
55
        transport = get_transport(url)
 
56
 
62
57
        def get_bundle(transport):
63
 
            return transport.get(filename), transport
 
58
            return transport.get(filename)
64
59
 
65
60
        def redirected_transport(transport, exception, redirection_notice):
66
61
            note(redirection_notice)
71
66
            return get_transport(url)
72
67
 
73
68
        try:
74
 
            f, transport = do_catching_redirections(get_bundle, transport,
75
 
                                                    redirected_transport)
 
69
            f = do_catching_redirections(get_bundle, transport,
 
70
                                         redirected_transport)
76
71
        except errors.TooManyRedirections:
77
72
            raise errors.NotABundle(str(url))
78
73
 
79
74
        if _do_directive:
80
 
            from bzrlib.merge_directive import MergeDirective
81
75
            directive = MergeDirective.from_lines(f.readlines())
82
 
            return directive, transport
 
76
            return directive
83
77
        else:
84
 
            return _serializer.read_bundle(f), transport
 
78
            return _serializer.read_bundle(f)
85
79
    except (errors.TransportError, errors.PathError), e:
86
80
        raise errors.NotABundle(str(e))
87
81
    except (IOError,), e:
95
89
        raise errors.NotABundle(str(e))
96
90
    except errors.NotAMergeDirective:
97
91
        f.seek(0)
98
 
        return _serializer.read_bundle(f), transport
 
92
        return _serializer.read_bundle(f)