← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Vincent Ladeuil
  • Date: 2007-07-20 18:59:29 UTC
  • mfrom: (2641 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2646.
  • Revision ID: v.ladeuil+lp@free.fr-20070720185929-lg19h2k1lfomgtxa
merge bzr.dev@2642

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
460
460
        return file(self.abspath(filename), 'rb')
461
461
 
462
462
    @needs_read_lock
463
 
    def annotate_iter(self, file_id):
 
463
    def annotate_iter(self, file_id, default_revision=CURRENT_REVISION):
464
464
        """See Tree.annotate_iter
465
465
 
466
466
        This implementation will use the basis tree implementation if possible.
493
493
                    continue
494
494
                old.append(list(tree.annotate_iter(file_id)))
495
495
            return annotate.reannotate(old, self.get_file(file_id).readlines(),
496
 
                                       CURRENT_REVISION)
 
496
                                       default_revision)
497
497
        finally:
498
498
            basis.unlock()
499
499
 
 
500
    def _get_ancestors(self, default_revision):
 
501
        ancestors = set([default_revision])
 
502
        for parent_id in self.get_parent_ids():
 
503
            ancestors.update(self.branch.repository.get_ancestry(
 
504
                             parent_id, topo_sorted=False))
 
505
        return ancestors
 
506
 
500
507
    def get_parent_ids(self):
501
508
        """See Tree.get_parent_ids.
502
509