/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/bundle/commands.py

  • Committer: Jelmer Vernooij
  • Date: 2019-06-03 23:48:08 UTC
  • mfrom: (7316 work)
  • mto: This revision was merged to the branch mainline in revision 7328.
  • Revision ID: jelmer@jelmer.uk-20190603234808-15yk5c7054tj8e2b
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/bundle/commands.py
23
23
 
24
24
from __future__ import absolute_import
25
25
 
26
 
from ... import (
27
 
    errors,
28
 
    )
29
 
 
30
 
from ...lazy_import import lazy_import
 
26
from ..lazy_import import lazy_import
31
27
lazy_import(globals(), """
32
28
from breezy import (
33
29
    branch,
 
30
    errors,
34
31
    merge_directive,
35
32
    revision as _mod_revision,
36
33
    urlutils,
39
36
from breezy.i18n import gettext
40
37
""")
41
38
 
42
 
from ...commands import Command
43
 
from ...sixish import (
 
39
from ..commands import Command
 
40
from ..sixish import (
44
41
    BytesIO,
45
42
    viewitems,
46
43
    )
55
52
    encoding_type = 'exact'
56
53
 
57
54
    def run(self, location, verbose=False):
58
 
        from breezy.bzr.bundle.serializer import read_bundle
 
55
        from breezy.bundle.serializer import read_bundle
59
56
        from breezy.mergeable import read_mergeable_from_url
60
57
        from breezy import osutils
61
58
        term_encoding = osutils.get_terminal_encoding()