← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bundle/__init__.py

  • Committer: Vincent Ladeuil
  • Date: 2010-02-10 15:46:03 UTC
  • mfrom: (4985.3.21 update)
  • mto: This revision was merged to the branch mainline in revision 5021.
  • Revision ID: v.ladeuil+lp@free.fr-20100210154603-k4no1gvfuqpzrw7p
https://launchpad.net/bugs/113809
Update performs two merges in a more logical order but stop on conflicts

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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
 
 
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
16
 
 
17
from cStringIO import StringIO
 
18
 
 
19
from bzrlib.symbol_versioning import deprecated_function, deprecated_in
17
20
from bzrlib.lazy_import import lazy_import
18
21
lazy_import(globals(), """
19
22
from bzrlib import (
21
24
    urlutils,
22
25
    )
23
26
from bzrlib.bundle import serializer as _serializer
 
27
from bzrlib.merge_directive import MergeDirective
24
28
from bzrlib.transport import (
25
29
    do_catching_redirections,
26
30
    get_transport,
29
33
from bzrlib.trace import note
30
34
 
31
35
 
 
36
@deprecated_function(deprecated_in((1, 12, 0)))
32
37
def read_bundle_from_url(url):
33
38
    return read_mergeable_from_url(url, _do_directive=False)
34
39
 
43
48
        possible_transports=possible_transports)
44
49
    transport = child_transport.clone('..')
45
50
    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
51
    mergeable, transport = read_mergeable_from_transport(transport, filename,
51
52
                                                         _do_directive)
52
53
    return mergeable
53
54
 
54
55
 
55
56
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.
 
57
    def get_bundle(transport):
 
58
        return StringIO(transport.get_bytes(filename)), transport
 
59
 
 
60
    def redirected_transport(transport, exception, redirection_notice):
 
61
        note(redirection_notice)
 
62
        url, filename = urlutils.split(exception.target,
 
63
                                       exclude_trailing_slash=False)
 
64
        if not filename:
 
65
            raise errors.NotABundle('A directory cannot be a bundle')
 
66
        return get_transport(url)
 
67
 
59
68
    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,
 
69
        bytef, transport = do_catching_redirections(get_bundle, transport,
73
70
                                                    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:
 
71
    except errors.TooManyRedirections:
 
72
        raise errors.NotABundle(transport.clone(filename).base)
 
73
    except (errors.ConnectionReset, errors.ConnectionError), e:
84
74
        raise
85
75
    except (errors.TransportError, errors.PathError), e:
86
76
        raise errors.NotABundle(str(e))
90
80
        # doesn't always fail at get() time. Sometimes it fails
91
81
        # during read. And that raises a generic IOError with
92
82
        # just the string 'Failure'
93
 
        # StubSFTPServer does fail during get() (because of prefetch) 
 
83
        # StubSFTPServer does fail during get() (because of prefetch)
94
84
        # so it has an opportunity to translate the error.
95
85
        raise errors.NotABundle(str(e))
96
 
    except errors.NotAMergeDirective:
97
 
        f.seek(0)
98
 
        return _serializer.read_bundle(f), transport
 
86
 
 
87
    if _do_directive:
 
88
        try:
 
89
            return MergeDirective.from_lines(bytef), transport
 
90
        except errors.NotAMergeDirective:
 
91
            bytef.seek(0)
 
92
 
 
93
    return _serializer.read_bundle(bytef), transport