/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-12-22 16:28:47 UTC
  • mto: This revision was merged to the branch mainline in revision 4922.
  • Revision ID: john@arbash-meinel.com-20091222162847-tvnsc69to4l4uf5r
Implement a permute_for_extension helper.

Use it for all of the 'simple' extension permutations.
It basically permutes all tests in the current module, by setting TestCase.module.
Which works well for most of our extension tests. Some had more advanced
handling of permutations (extra permutations, custom vars, etc.)

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 cStringIO import StringIO
 
18
 
 
19
from bzrlib.symbol_versioning import deprecated_function, deprecated_in
 
20
from bzrlib.lazy_import import lazy_import
 
21
lazy_import(globals(), """
 
22
from bzrlib import (
 
23
    errors,
 
24
    urlutils,
 
25
    )
 
26
from bzrlib.bundle import serializer as _serializer
 
27
from bzrlib.merge_directive import MergeDirective
 
28
from bzrlib.transport import (
 
29
    do_catching_redirections,
 
30
    get_transport,
 
31
    )
 
32
""")
 
33
from bzrlib.trace import note
 
34
 
 
35
 
 
36
@deprecated_function(deprecated_in((1, 12, 0)))
 
37
def read_bundle_from_url(url):
 
38
    return read_mergeable_from_url(url, _do_directive=False)
 
39
 
 
40
 
 
41
def read_mergeable_from_url(url, _do_directive=True, possible_transports=None):
 
42
    """Read mergable object from a given URL.
 
43
 
 
44
    :return: An object supporting get_target_revision.  Raises NotABundle if
 
45
        the target is not a mergeable type.
 
46
    """
 
47
    child_transport = get_transport(url,
 
48
        possible_transports=possible_transports)
 
49
    transport = child_transport.clone('..')
 
50
    filename = transport.relpath(child_transport.base)
 
51
    mergeable, transport = read_mergeable_from_transport(transport, filename,
 
52
                                                         _do_directive)
 
53
    return mergeable
 
54
 
 
55
 
 
56
def read_mergeable_from_transport(transport, filename, _do_directive=True):
 
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
 
 
68
    try:
 
69
        bytef, transport = do_catching_redirections(get_bundle, transport,
 
70
                                                    redirected_transport)
 
71
    except errors.TooManyRedirections:
 
72
        raise errors.NotABundle(transport.clone(filename).base)
 
73
    except (errors.ConnectionReset, errors.ConnectionError), e:
 
74
        raise
 
75
    except (errors.TransportError, errors.PathError), e:
 
76
        raise errors.NotABundle(str(e))
 
77
    except (IOError,), e:
 
78
        # jam 20060707
 
79
        # Abstraction leakage, SFTPTransport.get('directory')
 
80
        # doesn't always fail at get() time. Sometimes it fails
 
81
        # during read. And that raises a generic IOError with
 
82
        # just the string 'Failure'
 
83
        # StubSFTPServer does fail during get() (because of prefetch)
 
84
        # so it has an opportunity to translate the error.
 
85
        raise errors.NotABundle(str(e))
 
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