← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bundle/__init__.py

  • Committer: Jelmer Vernooij
  • Date: 2011-04-09 19:25:42 UTC
  • mto: (5777.5.1 inventoryworkingtree)
  • mto: This revision was merged to the branch mainline in revision 5781.
  • Revision ID: jelmer@samba.org-20110409192542-8bbedp36s7nj928e
Split InventoryTree out of Tree.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bundle/__init__.py
25
25
    )
26
26
from bzrlib.bundle import serializer as _serializer
27
27
from bzrlib.merge_directive import MergeDirective
28
 
from bzrlib.i18n import gettext
29
28
""")
30
29
from bzrlib.trace import note
31
30
 
54
53
        url, filename = urlutils.split(exception.target,
55
54
                                       exclude_trailing_slash=False)
56
55
        if not filename:
57
 
            raise errors.NotABundle(gettext('A directory cannot be a bundle'))
58
 
        return _mod_transport.get_transport_from_url(url)
 
56
            raise errors.NotABundle('A directory cannot be a bundle')
 
57
        return _mod_transport.get_transport(url)
59
58
 
60
59
    try:
61
60
        bytef, transport = _mod_transport.do_catching_redirections(