← 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-07-04 08:08:13 UTC
  • mfrom: (2572 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2587.
  • Revision ID: robertc@robertcollins.net-20070704080813-wzebx0r88fvwj5rq
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/weave.py
247
247
 
248
248
    def _lookup(self, name):
249
249
        """Convert symbolic version name to index."""
 
250
        self.check_not_reserved_id(name)
250
251
        try:
251
252
            return self._name_map[name]
252
253
        except KeyError:
606
607
        else:
607
608
            return self.get_ancestry(version_ids)
608
609
 
609
 
    def get_ancestry(self, version_ids):
 
610
    def get_ancestry(self, version_ids, topo_sorted=True):
610
611
        """See VersionedFile.get_ancestry."""
611
612
        if isinstance(version_ids, basestring):
612
613
            version_ids = [version_ids]
640
641
        """
641
642
        return len(other_parents.difference(my_parents)) == 0
642
643
 
643
 
    def annotate(self, version_id):
644
 
        if isinstance(version_id, int):
645
 
            warnings.warn('Weave.annotate(int) is deprecated. Please use version names'
646
 
                 ' in all circumstances as of 0.8',
647
 
                 DeprecationWarning,
648
 
                 stacklevel=2
649
 
                 )
650
 
            result = []
651
 
            for origin, lineno, text in self._extract([version_id]):
652
 
                result.append((origin, text))
653
 
            return result
654
 
        else:
655
 
            return super(Weave, self).annotate(version_id)
656
 
    
657
644
    def annotate_iter(self, version_id):
658
645
        """Yield list of (version-id, line) pairs for the specified version.
659
646
 
1120
1107
 
1121
1108
    def _add_lines(self, version_id, parents, lines, parent_texts):
1122
1109
        """Add a version and save the weave."""
 
1110
        self.check_not_reserved_id(version_id)
1123
1111
        result = super(WeaveFile, self)._add_lines(version_id, parents, lines,
1124
1112
                                                   parent_texts)
1125
1113
        self._save()