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

Avoid inventories in more places.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_bundle.py
76
76
 
77
77
    inventory = property(lambda x:x)
78
78
 
 
79
    def get_root_id(self):
 
80
        return self.root.file_id
 
81
 
79
82
    def all_file_ids(self):
80
83
        return set(self.paths.keys())
81
84
 
 
85
    def is_executable(self, file_id):
 
86
        return False
 
87
 
82
88
    def __getitem__(self, file_id):
83
89
        if file_id == self.root.file_id:
84
90
            return self.root
95
101
        for path, file_id in self.ids.iteritems():
96
102
            yield path, self[file_id]
97
103
 
98
 
    def get_file_kind(self, file_id):
 
104
    def kind(self, file_id):
99
105
        if file_id in self.contents:
100
106
            kind = 'file'
101
107
        else:
106
112
        from bzrlib.inventory import (InventoryEntry, InventoryFile
107
113
                                    , InventoryDirectory, InventoryLink)
108
114
        name = os.path.basename(path)
109
 
        kind = self.get_file_kind(file_id)
 
115
        kind = self.kind(file_id)
110
116
        parent_id = self.parent_id(file_id)
111
117
        text_sha_1, text_size = self.contents_stats(file_id)
112
118
        if kind == 'directory':
945
951
        self.tree1.commit('message', rev_id='revid1')
946
952
        bundle = self.get_valid_bundle('null:', 'revid1')
947
953
        tree = self.get_bundle_tree(bundle, 'revid1')
948
 
        self.assertEqual('revid1', tree.inventory.root.revision)
 
954
        root_revision = tree.get_file_revision(tree.get_root_id())
 
955
        self.assertEqual('revid1', root_revision)
949
956
 
950
957
    def test_install_revisions(self):
951
958
        self.tree1 = self.make_branch_and_tree('b1')