/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/weave.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/weave.py
247
247
 
248
248
    def _lookup(self, name):
249
249
        """Convert symbolic version name to index."""
 
250
        if self.reserved_id(name):
 
251
            raise errors.ReservedId(name)
250
252
        try:
251
253
            return self._name_map[name]
252
254
        except KeyError:
1120
1122
 
1121
1123
    def _add_lines(self, version_id, parents, lines, parent_texts):
1122
1124
        """Add a version and save the weave."""
 
1125
        if self.reserved_id(version_id):
 
1126
            raise errors.ReservedId(version_id)
1123
1127
        result = super(WeaveFile, self)._add_lines(version_id, parents, lines,
1124
1128
                                                   parent_texts)
1125
1129
        self._save()