← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/tree_implementations/test_test_trees.py

merge from dirstate

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/tree_implementations/test_test_trees.py
160
160
                '1top-dir',
161
161
                '1file-in-1topdir',
162
162
                '0dir-in-1topdir',
163
 
                 u'0utf\u1234file',
 
163
                 u'0utf\u1234file'.encode('utf8'),
164
164
                'symlink',
165
165
                 ]),
166
166
            set(iter(tree)))
170
170
            [('', tree_root, 'directory'),
171
171
             ('0file', '2file', 'file'),
172
172
             ('1top-dir', '1top-dir', 'directory'),
173
 
             (u'2utf\u1234file', u'0utf\u1234file', 'file'),
 
173
             (u'2utf\u1234file', u'0utf\u1234file'.encode('utf8'), 'file'),
174
174
             ('symlink', 'symlink', 'symlink'),
175
175
             ('1top-dir/0file-in-1topdir', '1file-in-1topdir', 'file'),
176
176
             ('1top-dir/1dir-in-1topdir', '0dir-in-1topdir', 'directory')],
177
177
            [(path, node.file_id, node.kind) for path, node in tree.iter_entries_by_dir()])
 
178
 
 
179
    def test_tree_with_utf8(self):
 
180
        tree = self.make_branch_and_tree('.')
 
181
        tree = self.get_tree_with_utf8(tree)
 
182
 
 
183
        revision_id = u'r\xe9v-1'.encode('utf8')
 
184
        root_id = 'TREE_ROOT'
 
185
        bar_id = u'b\xe5r-id'.encode('utf8')
 
186
        foo_id = u'f\xf6-id'.encode('utf8')
 
187
        baz_id = u'b\xe1z-id'.encode('utf8')
 
188
        path_and_ids = [(u'', root_id, None),
 
189
                        (u'b\xe5r', bar_id, root_id),
 
190
                        (u'f\xf6', foo_id, root_id),
 
191
                        (u'b\xe5r/b\xe1z', baz_id, bar_id),
 
192
                       ]
 
193
        tree.lock_read()
 
194
        try:
 
195
            path_entries = list(tree.iter_entries_by_dir())
 
196
        finally:
 
197
            tree.unlock()
 
198
 
 
199
        for expected, (path, ie) in zip(path_and_ids, path_entries):
 
200
            self.assertEqual(expected[0], path) # Paths should match
 
201
            self.assertIsInstance(path, unicode)
 
202
            self.assertEqual(expected[1], ie.file_id)
 
203
            self.assertIsInstance(ie.file_id, str)
 
204
            self.assertEqual(expected[2], ie.parent_id)
 
205
            if expected[2] is not None:
 
206
                self.assertIsInstance(ie.parent_id, str)
 
207
            # WorkingTree's return None for the last modified revision
 
208
            if ie.revision is not None:
 
209
                self.assertIsInstance(ie.revision, str)
 
210
                if expected[0] != '':
 
211
                    # Some trees will preserve the revision id of the tree root,
 
212
                    # but not all will
 
213
                    self.assertEqual(revision_id, ie.revision)
 
214
        self.assertEqual(len(path_and_ids), len(path_entries))
 
215
        get_revision_id = getattr(tree, 'get_revision_id', None)
 
216
        if get_revision_id is not None:
 
217
            self.assertIsInstance(get_revision_id(), str)
 
218
        last_revision = getattr(tree, 'last_revision', None)
 
219
        if last_revision is not None:
 
220
            self.assertIsInstance(last_revision(), str)
 
221
 
 
222
    def test_tree_with_merged_utf8(self):
 
223
        tree = self.make_branch_and_tree('.')
 
224
        tree = self.get_tree_with_merged_utf8(tree)
 
225
 
 
226
        revision_id_1 = u'r\xe9v-1'.encode('utf8')
 
227
        revision_id_2 = u'r\xe9v-2'.encode('utf8')
 
228
        root_id = 'TREE_ROOT'
 
229
        bar_id = u'b\xe5r-id'.encode('utf8')
 
230
        foo_id = u'f\xf6-id'.encode('utf8')
 
231
        baz_id = u'b\xe1z-id'.encode('utf8')
 
232
        zez_id = u'z\xf7z-id'.encode('utf8')
 
233
        path_and_ids = [(u'', root_id, None, None),
 
234
                        (u'b\xe5r', bar_id, root_id, revision_id_1),
 
235
                        (u'f\xf6', foo_id, root_id, revision_id_1),
 
236
                        (u'b\xe5r/b\xe1z', baz_id, bar_id, revision_id_1),
 
237
                        (u'b\xe5r/z\xf7z', zez_id, bar_id, revision_id_2),
 
238
                       ]
 
239
        tree.lock_read()
 
240
        try:
 
241
            path_entries = list(tree.iter_entries_by_dir())
 
242
        finally:
 
243
            tree.unlock()
 
244
 
 
245
        for expected, (path, ie) in zip(path_and_ids, path_entries):
 
246
            self.assertEqual(expected[0], path) # Paths should match
 
247
            self.assertIsInstance(path, unicode)
 
248
            self.assertEqual(expected[1], ie.file_id)
 
249
            self.assertIsInstance(ie.file_id, str)
 
250
            self.assertEqual(expected[2], ie.parent_id)
 
251
            if expected[2] is not None:
 
252
                self.assertIsInstance(ie.parent_id, str)
 
253
            # WorkingTree's return None for the last modified revision
 
254
            if ie.revision is not None:
 
255
                self.assertIsInstance(ie.revision, str)
 
256
                if expected[0] == '':
 
257
                    # Some trees will preserve the revision id of the tree root,
 
258
                    # but not all will
 
259
                    continue
 
260
                self.assertEqual(expected[3], ie.revision)
 
261
        self.assertEqual(len(path_and_ids), len(path_entries))
 
262
        get_revision_id = getattr(tree, 'get_revision_id', None)
 
263
        if get_revision_id is not None:
 
264
            self.assertIsInstance(get_revision_id(), str)
 
265
        last_revision = getattr(tree, 'last_revision', None)
 
266
        if last_revision is not None:
 
267
            self.assertIsInstance(last_revision(), str)