← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/knit.py

  • Committer: Aaron Bentley
  • Date: 2007-01-26 04:00:12 UTC
  • mfrom: (2245 +trunk)
  • mto: (2255.6.1 dirstate)
  • mto: This revision was merged to the branch mainline in revision 2322.
  • Revision ID: aaron.bentley@utoronto.ca-20070126040012-j80k7qhvj80dyp9j
merge from bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/knit.py
518
518
 
519
519
    def get_delta(self, version_id):
520
520
        """Get a delta for constructing version from some other version."""
 
521
        self.check_not_reserved_id(version_id)
521
522
        if not self.has_version(version_id):
522
523
            raise RevisionNotPresent(version_id, self.filename)
523
524
        
685
686
        ### FIXME escape. RBC 20060228
686
687
        if contains_whitespace(version_id):
687
688
            raise InvalidRevisionId(version_id, self.filename)
 
689
        self.check_not_reserved_id(version_id)
688
690
        if self.has_version(version_id):
689
691
            raise RevisionAlreadyPresent(version_id, self.filename)
690
692
        self._check_lines_not_unicode(lines)
797
799
 
798
800
    def get_line_list(self, version_ids):
799
801
        """Return the texts of listed versions as a list of strings."""
 
802
        for version_id in version_ids:
 
803
            self.check_not_reserved_id(version_id)
800
804
        text_map, content_map = self._get_content_maps(version_ids)
801
805
        return [text_map[v] for v in version_ids]
802
806