/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/test_bundle.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2017-06-11 23:44:17 UTC
  • mfrom: (6670.4.19 move-bzr)
  • Revision ID: breezy.the.bot@gmail.com-20170611234417-n5xscr4kqnvbtloi
Move most bzr-specific format and protocol code to breezy.bzr.

Merged from https://code.launchpad.net/~jelmer/brz/move-bzr/+merge/325461

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_bundle.py
22
22
import sys
23
23
 
24
24
from .. import (
25
 
    bzrdir,
26
25
    diff,
27
26
    errors,
28
 
    inventory,
29
27
    merge,
30
28
    osutils,
31
29
    revision as _mod_revision,
32
30
    tests,
33
31
    treebuilder,
34
32
    )
 
33
from ..bzr import (
 
34
    bzrdir,
 
35
    inventory,
 
36
    )
35
37
from ..bundle import read_mergeable_from_url
36
38
from ..bundle.apply_bundle import install_bundle, merge_bundle
37
39
from ..bundle.bundle_data import BundleTree
40
42
from ..bundle.serializer.v08 import BundleSerializerV08
41
43
from ..bundle.serializer.v09 import BundleSerializerV09
42
44
from ..bundle.serializer.v4 import BundleSerializerV4
43
 
from ..repofmt import knitrepo
 
45
from ..bzr import knitrepo
44
46
from ..sixish import (
45
47
    BytesIO,
46
48
    )
72
74
class MockTree(object):
73
75
 
74
76
    def __init__(self):
75
 
        from ..inventory import InventoryDirectory, ROOT_ID
 
77
        from ..bzr.inventory import InventoryDirectory, ROOT_ID
76
78
        object.__init__(self)
77
79
        self.paths = {ROOT_ID: ""}
78
80
        self.ids = {"": ROOT_ID}
116
118
        return kind
117
119
 
118
120
    def make_entry(self, file_id, path):
119
 
        from ..inventory import (InventoryFile , InventoryDirectory,
 
121
        from ..bzr.inventory import (InventoryFile , InventoryDirectory,
120
122
            InventoryLink)
121
123
        name = os.path.basename(path)
122
124
        kind = self.kind(file_id)