← 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: 2009-05-05 15:31:34 UTC
  • mto: (4343.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4344.
  • Revision ID: v.ladeuil+lp@free.fr-20090505153134-q4bp4is9gywsmzrv
Clean up test for log formats.

* bzrlib/tests/blackbox/test_logformats.py:
Update tests to actual style.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bundle/__init__.py
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')
48
52
    mergeable, transport = read_mergeable_from_transport(transport, filename,
49
53
                                                         _do_directive)
50
54
    return mergeable
70
74
            f, transport = do_catching_redirections(get_bundle, transport,
71
75
                                                    redirected_transport)
72
76
        except errors.TooManyRedirections:
73
 
            raise errors.NotABundle(transport.clone(filename).base)
 
77
            raise errors.NotABundle(str(url))
74
78
 
75
79
        if _do_directive:
76
80
            from bzrlib.merge_directive import MergeDirective
78
82
            return directive, transport
79
83
        else:
80
84
            return _serializer.read_bundle(f), transport
81
 
    except (errors.ConnectionReset, errors.ConnectionError), e:
 
85
    except errors.ConnectionReset:
82
86
        raise
83
87
    except (errors.TransportError, errors.PathError), e:
84
88
        raise errors.NotABundle(str(e))