← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

Merge dirstate and some small cleanups

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
486
486
        """
487
487
        file_id = osutils.safe_file_id(file_id)
488
488
        basis = self.basis_tree()
489
 
        changes = iter(self._iter_changes(basis, True, [self.id2path(file_id)],
490
 
            require_versioned=True)).next()
 
489
        changes = self._iter_changes(basis, True, [self.id2path(file_id)],
 
490
            require_versioned=True).next()
491
491
        changed_content, kind = changes[2], changes[6]
492
492
        if not changed_content:
493
493
            return basis.annotate_iter(file_id)