← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bundle/__init__.py

  • Committer: Michael Ellerman
  • Date: 2006-02-28 14:45:51 UTC
  • mto: (1558.1.18 Aaron's integration)
  • mto: This revision was merged to the branch mainline in revision 1586.
  • Revision ID: michael@ellerman.id.au-20060228144551-3d9941ecde4a0b0a
Update contrib/pwk for -p1 diffs from bzr

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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
 
 
17
 
from bzrlib.symbol_versioning import deprecated_function, deprecated_in
18
 
from bzrlib.lazy_import import lazy_import
19
 
lazy_import(globals(), """
20
 
from bzrlib import (
21
 
    errors,
22
 
    urlutils,
23
 
    )
24
 
from bzrlib.bundle import serializer as _serializer
25
 
from bzrlib.transport import (
26
 
    do_catching_redirections,
27
 
    get_transport,
28
 
    )
29
 
""")
30
 
from bzrlib.trace import note
31
 
 
32
 
 
33
 
@deprecated_function(deprecated_in((1, 12, 0)))
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, possible_transports=None):
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
 
    child_transport = get_transport(url,
45
 
        possible_transports=possible_transports)
46
 
    transport = child_transport.clone('..')
47
 
    filename = transport.relpath(child_transport.base)
48
 
    mergeable, transport = read_mergeable_from_transport(transport, filename,
49
 
                                                         _do_directive)
50
 
    return mergeable
51
 
 
52
 
 
53
 
def read_mergeable_from_transport(transport, filename, _do_directive=True):
54
 
    # All of this must be in the try/except
55
 
    # Some transports cannot detect that we are trying to read a
56
 
    # directory until we actually issue read() on the handle.
57
 
    try:
58
 
        def get_bundle(transport):
59
 
            return transport.get(filename), transport
60
 
 
61
 
        def redirected_transport(transport, exception, redirection_notice):
62
 
            note(redirection_notice)
63
 
            url, filename = urlutils.split(exception.target,
64
 
                                           exclude_trailing_slash=False)
65
 
            if not filename:
66
 
                raise errors.NotABundle('A directory cannot be a bundle')
67
 
            return get_transport(url)
68
 
 
69
 
        try:
70
 
            f, transport = do_catching_redirections(get_bundle, transport,
71
 
                                                    redirected_transport)
72
 
        except errors.TooManyRedirections:
73
 
            raise errors.NotABundle(transport.clone(filename).base)
74
 
 
75
 
        if _do_directive:
76
 
            from bzrlib.merge_directive import MergeDirective
77
 
            directive = MergeDirective.from_lines(f.readlines())
78
 
            return directive, transport
79
 
        else:
80
 
            return _serializer.read_bundle(f), transport
81
 
    except (errors.ConnectionReset, errors.ConnectionError), e:
82
 
        raise
83
 
    except (errors.TransportError, errors.PathError), e:
84
 
        raise errors.NotABundle(str(e))
85
 
    except (IOError,), e:
86
 
        # jam 20060707
87
 
        # Abstraction leakage, SFTPTransport.get('directory')
88
 
        # doesn't always fail at get() time. Sometimes it fails
89
 
        # during read. And that raises a generic IOError with
90
 
        # just the string 'Failure'
91
 
        # StubSFTPServer does fail during get() (because of prefetch)
92
 
        # so it has an opportunity to translate the error.
93
 
        raise errors.NotABundle(str(e))
94
 
    except errors.NotAMergeDirective:
95
 
        f.seek(0)
96
 
        return _serializer.read_bundle(f), transport