← 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-11 17:20:25 UTC
  • mto: This revision was merged to the branch mainline in revision 2239.
  • Revision ID: abentley@panoramicfeedback.com-20070111172025-8rnvvm3jqx7h5uvv
Reject reserved ids in versiondfile, tree, branch and repository

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
        if self.reserved_id(version_id):
 
522
            raise errors.ReservedId(version_id)
521
523
        if not self.has_version(version_id):
522
524
            raise RevisionNotPresent(version_id, self.filename)
523
525
        
685
687
        ### FIXME escape. RBC 20060228
686
688
        if contains_whitespace(version_id):
687
689
            raise InvalidRevisionId(version_id, self.filename)
 
690
        if self.reserved_id(version_id):
 
691
            raise errors.ReservedId(version_id)
688
692
        if self.has_version(version_id):
689
693
            raise RevisionAlreadyPresent(version_id, self.filename)
690
694
        self._check_lines_not_unicode(lines)
797
801
 
798
802
    def get_line_list(self, version_ids):
799
803
        """Return the texts of listed versions as a list of strings."""
 
804
        for version_id in version_ids:
 
805
            if self.reserved_id(version_id):
 
806
                raise errors.ReservedId(version_id)
800
807
        text_map, content_map = self._get_content_maps(version_ids)
801
808
        return [text_map[v] for v in version_ids]
802
809