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

reference-trees in dirstate pass all tests.

_iter_changes crudely changed not to be an iterator, so it can hold the
lock for the whole time.

Add DirStateRevisionTree.kind()

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree_4.py
442
442
                result.append(key[2])
443
443
        return iter(result)
444
444
 
 
445
    @needs_read_lock
445
446
    def kind(self, file_id):
446
447
        # The kind of a file is whatever it actually is on disk, except that 
447
448
        # tree-references need to be reported as such rather than as the
1338
1339
            return None
1339
1340
        return ie.executable
1340
1341
 
 
1342
    @needs_read_lock
 
1343
    def kind(self, file_id):
 
1344
        return self.inventory[file_id].kind
 
1345
 
1341
1346
    def list_files(self, include_root=False):
1342
1347
        # We use a standard implementation, because DirStateRevisionTree is
1343
1348
        # dealing with one of the parents of the current state