← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree_4.py

  • Committer: Aaron Bentley
  • Date: 2008-04-24 04:58:42 UTC
  • mfrom: (3377 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3380.
  • Revision ID: aaron@aaronbentley.com-20080424045842-0cajl9v6s4u52kaw
Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree_4.py
1402
1402
                      default_revision=_mod_revision.CURRENT_REVISION):
1403
1403
        """See Tree.annotate_iter"""
1404
1404
        w = self._get_weave(file_id)
1405
 
        return w.annotate_iter(self.inventory[file_id].revision)
 
1405
        return w.annotate(self.inventory[file_id].revision)
1406
1406
 
1407
1407
    def _get_ancestors(self, default_revision):
1408
1408
        return set(self._repository.get_ancestry(self._revision_id,