~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/revisiontree.py

Merge from bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
93
93
                      default_revision=revision.CURRENT_REVISION):
94
94
        """See Tree.annotate_iter"""
95
95
        w = self._get_weave(file_id)
96
 
        return w.annotate_iter(self.inventory[file_id].revision)
 
96
        return w.annotate(self.inventory[file_id].revision)
97
97
 
98
98
    def get_file_size(self, file_id):
99
99
        return self._inventory[file_id].text_size