← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/weave.py

  • Committer: Aaron Bentley
  • Date: 2007-07-25 19:32:22 UTC
  • mto: (1551.19.24 Aaron's mergeable stuff)
  • mto: This revision was merged to the branch mainline in revision 2664.
  • Revision ID: abentley@panoramicfeedback.com-20070725193222-lcq4z4980ffd4bf5
Stop using _merge_helper for merging

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):
 
610
    def get_ancestry(self, version_ids, topo_sorted=True):
611
611
        """See VersionedFile.get_ancestry."""
612
612
        if isinstance(version_ids, basestring):
613
613
            version_ids = [version_ids]
891
891
        """See VersionedFile.get_sha1()."""
892
892
        return self._sha1s[self._lookup(version_id)]
893
893
 
 
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
 
894
898
    @deprecated_method(zero_eight)
895
899
    def numversions(self):
896
900
        """How many versions are in this weave?