← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree_4.py

  • Committer: Vincent Ladeuil
  • Date: 2011-06-27 15:42:09 UTC
  • mfrom: (5993 +trunk)
  • mto: (5993.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 5994.
  • Revision ID: v.ladeuil+lp@free.fr-20110627154209-azubuhbuxsz109hq
Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree_4.py
1713
1713
        annotations = self._repository.texts.annotate(text_key)
1714
1714
        return [(key[-1], line) for (key, line) in annotations]
1715
1715
 
1716
 
    def _get_ancestors(self, default_revision):
1717
 
        return set(self._repository.get_ancestry(self._revision_id,
1718
 
                                                 topo_sorted=False))
1719
1716
    def _comparison_data(self, entry, path):
1720
1717
        """See Tree._comparison_data."""
1721
1718
        if entry is None: