← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.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.py
483
483
        """
484
484
        file_id = osutils.safe_file_id(file_id)
485
485
        basis = self.basis_tree()
486
 
        changes = self._iter_changes(basis, True, [self.id2path(file_id)],
487
 
            require_versioned=True).next()
 
486
        changes = iter(self._iter_changes(basis, True, [self.id2path(file_id)],
 
487
            require_versioned=True)).next()
488
488
        changed_content, kind = changes[2], changes[6]
489
489
        if not changed_content:
490
490
            return basis.annotate_iter(file_id)