← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/weave.py

Clean up the lock.py code to use less indenting, and conform to better coding practise.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/weave.py
607
607
        else:
608
608
            return self.get_ancestry(version_ids)
609
609
 
610
 
    def get_ancestry(self, version_ids, topo_sorted=True):
 
610
    def get_ancestry(self, version_ids):
611
611
        """See VersionedFile.get_ancestry."""
612
612
        if isinstance(version_ids, basestring):
613
613
            version_ids = [version_ids]
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
    
644
658
    def annotate_iter(self, version_id):
645
659
        """Yield list of (version-id, line) pairs for the specified version.
646
660
 
891
905
        """See VersionedFile.get_sha1()."""
892
906
        return self._sha1s[self._lookup(version_id)]
893
907
 
894
 
    def get_sha1s(self, version_ids):
895
 
        """See VersionedFile.get_sha1s()."""
896
 
        return [self._sha1s[self._lookup(v)] for v in version_ids]
897
 
 
898
908
    @deprecated_method(zero_eight)
899
909
    def numversions(self):
900
910
        """How many versions are in this weave?