← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bundle/__init__.py

https://launchpad.net/bugs/524184
NEWS section template into a separate file

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
 
 
17
 
from StringIO import StringIO
18
 
 
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
16
 
 
17
from bzrlib.symbol_versioning import deprecated_function, deprecated_in
19
18
from bzrlib.lazy_import import lazy_import
20
19
lazy_import(globals(), """
21
20
from bzrlib import (
31
30
from bzrlib.trace import note
32
31
 
33
32
 
 
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
 
45
45
        possible_transports=possible_transports)
46
46
    transport = child_transport.clone('..')
47
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
48
    mergeable, transport = read_mergeable_from_transport(transport, filename,
53
49
                                                         _do_directive)
54
50
    return mergeable
74
70
            f, transport = do_catching_redirections(get_bundle, transport,
75
71
                                                    redirected_transport)
76
72
        except errors.TooManyRedirections:
77
 
            raise errors.NotABundle(str(url))
 
73
            raise errors.NotABundle(transport.clone(filename).base)
78
74
 
79
75
        if _do_directive:
80
76
            from bzrlib.merge_directive import MergeDirective
82
78
            return directive, transport
83
79
        else:
84
80
            return _serializer.read_bundle(f), transport
 
81
    except (errors.ConnectionReset, errors.ConnectionError), e:
 
82
        raise
85
83
    except (errors.TransportError, errors.PathError), e:
86
84
        raise errors.NotABundle(str(e))
87
85
    except (IOError,), e:
90
88
        # doesn't always fail at get() time. Sometimes it fails
91
89
        # during read. And that raises a generic IOError with
92
90
        # just the string 'Failure'
93
 
        # StubSFTPServer does fail during get() (because of prefetch) 
 
91
        # StubSFTPServer does fail during get() (because of prefetch)
94
92
        # so it has an opportunity to translate the error.
95
93
        raise errors.NotABundle(str(e))
96
94
    except errors.NotAMergeDirective: