/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/tree_implementations/test_test_trees.py

(working), fix dirstate to use utf8 file ids.
Also fix a bug in _generate_inventory for non-ascii paths. It was
combining the decoded path with the utf8 prefix and assuming the
whole thing was utf8.

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')],