← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/weave.py

  • Committer: John Arbash Meinel
  • Date: 2007-01-24 20:40:20 UTC
  • mfrom: (2242 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2245.
  • Revision ID: john@arbash-meinel.com-20070124204020-szyxbjpn9mzbsks7
[merge] bzr.dev 2242

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:
1120
1121
 
1121
1122
    def _add_lines(self, version_id, parents, lines, parent_texts):
1122
1123
        """Add a version and save the weave."""
 
1124
        self.check_not_reserved_id(version_id)
1123
1125
        result = super(WeaveFile, self)._add_lines(version_id, parents, lines,
1124
1126
                                                   parent_texts)
1125
1127
        self._save()