/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: 2009-06-18 18:18:36 UTC
  • mto: This revision was merged to the branch mainline in revision 4461.
  • Revision ID: john@arbash-meinel.com-20090618181836-biodfkat9a8eyzjz
The new add_inventory_by_delta is returning a CHKInventory when mapping from NULL
Which is completely valid, but 'broke' one of the tests.
So to fix it, changed the test to use CHKInventories on both sides, and add an __eq__
member. The nice thing is that CHKInventory.__eq__ is fairly cheap, since it only
has to check the root keys.

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
    if filename.endswith('/'):
 
49
        # A path to a directory was passed in
 
50
        # definitely not a bundle
 
51
        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):
 
58
    # All of this must be in the try/except
 
59
    # Some transports cannot detect that we are trying to read a
 
60
    # directory until we actually issue read() on the handle.
 
61
    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
 
87
    except (errors.TransportError, errors.PathError), e:
 
88
        raise errors.NotABundle(str(e))
 
89
    except (IOError,), e:
 
90
        # jam 20060707
 
91
        # Abstraction leakage, SFTPTransport.get('directory')
 
92
        # doesn't always fail at get() time. Sometimes it fails
 
93
        # during read. And that raises a generic IOError with
 
94
        # just the string 'Failure'
 
95
        # StubSFTPServer does fail during get() (because of prefetch)
 
96
        # so it has an opportunity to translate the error.
 
97
        raise errors.NotABundle(str(e))
 
98
    except errors.NotAMergeDirective:
 
99
        f.seek(0)
 
100
        return _serializer.read_bundle(f), transport