← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bundle/__init__.py

  • Committer: Aaron Bentley
  • Date: 2007-03-07 23:15:10 UTC
  • mto: (1551.19.24 Aaron's mergeable stuff)
  • mto: This revision was merged to the branch mainline in revision 2325.
  • Revision ID: abentley@panoramicfeedback.com-20070307231510-jae63zsli83db3eb
Make ChangeReporter private

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
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
 
from bzrlib.symbol_versioning import deprecated_function, deprecated_in
18
17
from bzrlib.lazy_import import lazy_import
19
18
lazy_import(globals(), """
20
19
from bzrlib import (
22
21
    urlutils,
23
22
    )
24
23
from bzrlib.bundle import serializer as _serializer
25
 
from bzrlib.transport import (
26
 
    do_catching_redirections,
27
 
    get_transport,
28
 
    )
 
24
from bzrlib.transport import get_transport as _get_transport
29
25
""")
30
 
from bzrlib.trace import note
31
 
 
32
 
 
33
 
@deprecated_function(deprecated_in((1, 12, 0)))
 
26
 
 
27
 
34
28
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.
 
29
    """Read a bundle from a given URL.
 
30
 
 
31
    :return: A BundleReader, may raise NotABundle if the target 
 
32
            is not a proper bundle.
43
33
    """
44
 
    child_transport = get_transport(url,
45
 
        possible_transports=possible_transports)
46
 
    transport = child_transport.clone('..')
47
 
    filename = transport.relpath(child_transport.base)
48
 
    if filename.endswith('/'):
 
34
    url = urlutils.normalize_url(url)
 
35
    url, filename = urlutils.split(url, exclude_trailing_slash=False)
 
36
    if not filename:
49
37
        # A path to a directory was passed in
50
38
        # definitely not a bundle
51
39
        raise errors.NotABundle('A directory cannot be a bundle')
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):
 
40
 
58
41
    # All of this must be in the try/except
59
42
    # Some transports cannot detect that we are trying to read a
60
43
    # directory until we actually issue read() on the handle.
61
44
    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.ConnectionReset:
86
 
        raise
 
45
        t = _get_transport(url)
 
46
        f = t.get(filename)
 
47
        return _serializer.read_bundle(f)
87
48
    except (errors.TransportError, errors.PathError), e:
88
49
        raise errors.NotABundle(str(e))
89
50
    except (IOError,), e:
92
53
        # doesn't always fail at get() time. Sometimes it fails
93
54
        # during read. And that raises a generic IOError with
94
55
        # just the string 'Failure'
95
 
        # StubSFTPServer does fail during get() (because of prefetch)
 
56
        # StubSFTPServer does fail during get() (because of prefetch) 
96
57
        # so it has an opportunity to translate the error.
97
58
        raise errors.NotABundle(str(e))
98
 
    except errors.NotAMergeDirective:
99
 
        f.seek(0)
100
 
        return _serializer.read_bundle(f), transport
 
59