← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bundle/__init__.py

Merge cleanup into first-try resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bundle/__init__.py
16
16
 
17
17
from cStringIO import StringIO
18
18
 
19
 
from bzrlib.symbol_versioning import deprecated_function, deprecated_in
20
19
from bzrlib.lazy_import import lazy_import
21
20
lazy_import(globals(), """
22
21
from bzrlib import (
33
32
from bzrlib.trace import note
34
33
 
35
34
 
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
35
def read_mergeable_from_url(url, _do_directive=True, possible_transports=None):
42
36
    """Read mergable object from a given URL.
43
37