← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bundle/__init__.py

  • Committer: Tarmac
  • Author(s): Vincent Ladeuil
  • Date: 2017-01-30 14:42:05 UTC
  • mfrom: (6620.1.1 trunk)
  • Revision ID: tarmac-20170130144205-r8fh2xpmiuxyozpv
Merge  2.7 into trunk including fix for bug #1657238 [r=vila]

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bundle/__init__.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
 
17
from __future__ import absolute_import
 
18
 
17
19
from cStringIO import StringIO
18
20
 
19
21
from bzrlib.lazy_import import lazy_import
25
27
    )
26
28
from bzrlib.bundle import serializer as _serializer
27
29
from bzrlib.merge_directive import MergeDirective
 
30
from bzrlib.i18n import gettext
28
31
""")
29
32
from bzrlib.trace import note
30
33
 
53
56
        url, filename = urlutils.split(exception.target,
54
57
                                       exclude_trailing_slash=False)
55
58
        if not filename:
56
 
            raise errors.NotABundle('A directory cannot be a bundle')
57
 
        return _mod_transport.get_transport(url)
 
59
            raise errors.NotABundle(gettext('A directory cannot be a bundle'))
 
60
        return _mod_transport.get_transport_from_url(url)
58
61
 
59
62
    try:
60
63
        bytef, transport = _mod_transport.do_catching_redirections(