← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bundle/__init__.py

  • Committer: Martin Pool
  • Date: 2007-04-04 06:17:31 UTC
  • mto: This revision was merged to the branch mainline in revision 2397.
  • Revision ID: mbp@sourcefrog.net-20070404061731-tt2xrzllqhbodn83
Contents of TODO file moved into bug tracker

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
16
 
 
17
 
from bzrlib.symbol_versioning import deprecated_function, deprecated_in
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
16
 
 
17
from StringIO import StringIO
 
18
 
18
19
from bzrlib.lazy_import import lazy_import
19
20
lazy_import(globals(), """
20
21
from bzrlib import (
30
31
from bzrlib.trace import note
31
32
 
32
33
 
33
 
@deprecated_function(deprecated_in((1, 12, 0)))
34
34
def read_bundle_from_url(url):
35
35
    return read_mergeable_from_url(url, _do_directive=False)
36
36
 
37
 
 
38
 
def read_mergeable_from_url(url, _do_directive=True, possible_transports=None):
 
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
    """
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('/'):
 
43
    from bzrlib.merge_directive import MergeDirective
 
44
    url = urlutils.normalize_url(url)
 
45
    url, filename = urlutils.split(url, exclude_trailing_slash=False)
 
46
    if not filename:
49
47
        # A path to a directory was passed in
50
48
        # definitely not a bundle
51
49
        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):
 
50
 
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
85
 
    except errors.ConnectionReset:
86
 
        raise
 
78
            return _serializer.read_bundle(f)
87
79
    except (errors.TransportError, errors.PathError), e:
88
80
        raise errors.NotABundle(str(e))
89
81
    except (IOError,), e:
92
84
        # doesn't always fail at get() time. Sometimes it fails
93
85
        # during read. And that raises a generic IOError with
94
86
        # just the string 'Failure'
95
 
        # StubSFTPServer does fail during get() (because of prefetch)
 
87
        # StubSFTPServer does fail during get() (because of prefetch) 
96
88
        # so it has an opportunity to translate the error.
97
89
        raise errors.NotABundle(str(e))
98
90
    except errors.NotAMergeDirective:
99
91
        f.seek(0)
100
 
        return _serializer.read_bundle(f), transport
 
92
        return _serializer.read_bundle(f)