/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/tests/per_versionedfile.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/tests/per_versionedfile.py
27
27
from .. import (
28
28
    errors,
29
29
    graph as _mod_graph,
30
 
    groupcompress,
31
 
    knit as _mod_knit,
32
30
    osutils,
33
31
    progress,
34
32
    transport,
35
33
    ui,
36
34
    )
 
35
from ..bzr import (
 
36
    groupcompress,
 
37
    knit as _mod_knit,
 
38
    )
37
39
from ..errors import (
38
 
                           RevisionNotPresent,
39
 
                           RevisionAlreadyPresent,
40
 
                           )
41
 
from ..knit import (
 
40
    RevisionNotPresent,
 
41
    RevisionAlreadyPresent,
 
42
    )
 
43
from ..bzr.knit import (
42
44
    cleanup_pack_knit,
43
45
    make_file_factory,
44
46
    make_pack_factory,
55
57
    )
56
58
from .http_utils import TestCaseWithWebserver
57
59
from ..transport.memory import MemoryTransport
58
 
from .. import versionedfile as versionedfile
59
 
from ..versionedfile import (
 
60
from ..bzr import versionedfile as versionedfile
 
61
from ..bzr.versionedfile import (
60
62
    ConstantMapper,
61
63
    HashEscapedPrefixMapper,
62
64
    PrefixMapper,
63
65
    VirtualVersionedFiles,
64
66
    make_versioned_files_factory,
65
67
    )
66
 
from ..weave import WeaveFile
67
 
from ..weavefile import write_weave
 
68
from ..bzr.weave import WeaveFile
 
69
from ..bzr.weavefile import write_weave
68
70
from .scenarios import load_tests_apply_scenarios
69
71
 
70
72