/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/remote.py

  • Committer: Jelmer Vernooij
  • Date: 2017-06-08 23:30:31 UTC
  • mto: This revision was merged to the branch mainline in revision 6690.
  • Revision ID: jelmer@jelmer.uk-20170608233031-3qavls2o7a1pqllj
Update imports.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/remote.py
22
22
from . import (
23
23
    bencode,
24
24
    branch,
25
 
    bzrbranch,
26
 
    bzrdir as _mod_bzrdir,
27
25
    config as _mod_config,
28
26
    controldir,
29
27
    debug,
30
28
    errors,
31
29
    gpg,
32
30
    graph,
33
 
    inventory_delta,
34
31
    lock,
35
32
    lockdir,
36
33
    osutils,
40
37
    static_tuple,
41
38
    testament as _mod_testament,
42
39
    urlutils,
 
40
    )
 
41
from .bzr import (
 
42
    branch as bzrbranch,
 
43
    bzrdir as _mod_bzrdir,
 
44
    inventory_delta,
43
45
    vf_repository,
44
46
    vf_search,
45
47
    )
46
 
from .bzrbranch import BranchReferenceFormat
 
48
from .bzr.branch import BranchReferenceFormat
47
49
from .branch import BranchWriteLockResult
48
50
from .decorators import needs_read_lock, needs_write_lock, only_raises
49
51
from .errors import (
51
53
    SmartProtocolError,
52
54
    )
53
55
from .i18n import gettext
54
 
from .inventory import Inventory
 
56
from .bzr.inventory import Inventory
55
57
from .lockable_files import LockableFiles
56
58
from .sixish import (
57
59
    viewitems,
64
66
from .repository import RepositoryWriteLockResult, _LazyListJoin
65
67
from .serializer import format_registry as serializer_format_registry
66
68
from .trace import mutter, note, warning, log_exception_quietly
67
 
from .versionedfile import FulltextContentFactory
 
69
from .bzr.versionedfile import FulltextContentFactory
68
70
 
69
71
 
70
72
_DEFAULT_SEARCH_DEPTH = 100