← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_bundle.py

  • Committer: Jelmer Vernooij
  • Date: 2012-02-28 10:06:39 UTC
  • mfrom: (6437.40.2 rmbranch-colo)
  • mto: This revision was merged to the branch mainline in revision 6482.
  • Revision ID: jelmer@samba.org-20120228100639-p5gndu91wuqwugti
Merge rmbranch-colo.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_bundle.py
75
75
        self.root = InventoryDirectory(ROOT_ID, '', None)
76
76
 
77
77
    inventory = property(lambda x:x)
 
78
    root_inventory = property(lambda x:x)
 
79
 
 
80
    def get_root_id(self):
 
81
        return self.root.file_id
78
82
 
79
83
    def all_file_ids(self):
80
84
        return set(self.paths.keys())
81
85
 
 
86
    def is_executable(self, file_id):
 
87
        # Not all the files are executable.
 
88
        return False
 
89
 
82
90
    def __getitem__(self, file_id):
83
91
        if file_id == self.root.file_id:
84
92
            return self.root
95
103
        for path, file_id in self.ids.iteritems():
96
104
            yield path, self[file_id]
97
105
 
98
 
    def get_file_kind(self, file_id):
 
106
    def kind(self, file_id):
99
107
        if file_id in self.contents:
100
108
            kind = 'file'
101
109
        else:
103
111
        return kind
104
112
 
105
113
    def make_entry(self, file_id, path):
106
 
        from bzrlib.inventory import (InventoryEntry, InventoryFile
107
 
                                    , InventoryDirectory, InventoryLink)
 
114
        from bzrlib.inventory import (InventoryFile , InventoryDirectory,
 
115
            InventoryLink)
108
116
        name = os.path.basename(path)
109
 
        kind = self.get_file_kind(file_id)
 
117
        kind = self.kind(file_id)
110
118
        parent_id = self.parent_id(file_id)
111
119
        text_sha_1, text_size = self.contents_stats(file_id)
112
120
        if kind == 'directory':
147
155
    def get_file_revision(self, file_id):
148
156
        return self.inventory[file_id].revision
149
157
 
 
158
    def get_file_size(self, file_id):
 
159
        return self.inventory[file_id].text_size
 
160
 
 
161
    def get_file_sha1(self, file_id):
 
162
        return self.inventory[file_id].text_sha1
 
163
 
150
164
    def contents_stats(self, file_id):
151
165
        if file_id not in self.contents:
152
166
            return None, None
315
329
        self.assertTrue(btree.path2id("grandparent/parent/file") is None)
316
330
 
317
331
    def sorted_ids(self, tree):
318
 
        ids = list(tree)
 
332
        ids = list(tree.all_file_ids())
319
333
        ids.sort()
320
334
        return ids
321
335
 
945
959
        self.tree1.commit('message', rev_id='revid1')
946
960
        bundle = self.get_valid_bundle('null:', 'revid1')
947
961
        tree = self.get_bundle_tree(bundle, 'revid1')
948
 
        self.assertEqual('revid1', tree.inventory.root.revision)
 
962
        root_revision = tree.get_file_revision(tree.get_root_id())
 
963
        self.assertEqual('revid1', root_revision)
949
964
 
950
965
    def test_install_revisions(self):
951
966
        self.tree1 = self.make_branch_and_tree('b1')