/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/bundle/__init__.py

  • Committer: John Arbash Meinel
  • Date: 2008-11-25 18:51:48 UTC
  • mto: This revision was merged to the branch mainline in revision 3854.
  • Revision ID: john@arbash-meinel.com-20081125185148-jsfkqnzfjjqsleds
It seems we have some direct tests that don't use strings and expect a value error as well.

They would be sanitized later on by Revision. We could use that code, but this test
depends on the serializer, which Revision wouldn't know about.

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 bzrlib.lazy_import import lazy_import
 
18
lazy_import(globals(), """
 
19
from bzrlib import (
 
20
    errors,
 
21
    urlutils,
 
22
    )
 
23
from bzrlib.bundle import serializer as _serializer
 
24
from bzrlib.transport import (
 
25
    do_catching_redirections,
 
26
    get_transport,
 
27
    )
 
28
""")
 
29
from bzrlib.trace import note
 
30
 
 
31
 
 
32
def read_bundle_from_url(url):
 
33
    return read_mergeable_from_url(url, _do_directive=False)
 
34
 
 
35
 
 
36
def read_mergeable_from_url(url, _do_directive=True, possible_transports=None):
 
37
    """Read mergable object from a given URL.
 
38
 
 
39
    :return: An object supporting get_target_revision.  Raises NotABundle if
 
40
        the target is not a mergeable type.
 
41
    """
 
42
    child_transport = get_transport(url,
 
43
        possible_transports=possible_transports)
 
44
    transport = child_transport.clone('..')
 
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')
 
50
    mergeable, transport = read_mergeable_from_transport(transport, filename,
 
51
                                                         _do_directive)
 
52
    return mergeable
 
53
 
 
54
 
 
55
def read_mergeable_from_transport(transport, filename, _do_directive=True):
 
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.
 
59
    try:
 
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,
 
73
                                                    redirected_transport)
 
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:
 
84
        raise
 
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