← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/weave.py

  • Committer: Robert Collins
  • Date: 2007-03-27 21:45:59 UTC
  • mfrom: (2379 +trunk)
  • mto: (2018.5.109 hpss)
  • mto: This revision was merged to the branch mainline in revision 2435.
  • Revision ID: robertc@robertcollins.net-20070327214559-3zto1rfp3g7dnzl9
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/weave.py
641
641
        """
642
642
        return len(other_parents.difference(my_parents)) == 0
643
643
 
644
 
    def annotate(self, version_id):
645
 
        if isinstance(version_id, int):
646
 
            warnings.warn('Weave.annotate(int) is deprecated. Please use version names'
647
 
                 ' in all circumstances as of 0.8',
648
 
                 DeprecationWarning,
649
 
                 stacklevel=2
650
 
                 )
651
 
            result = []
652
 
            for origin, lineno, text in self._extract([version_id]):
653
 
                result.append((origin, text))
654
 
            return result
655
 
        else:
656
 
            return super(Weave, self).annotate(version_id)
657
 
    
658
644
    def annotate_iter(self, version_id):
659
645
        """Yield list of (version-id, line) pairs for the specified version.
660
646