← 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-09-12 04:21:51 UTC
  • mto: This revision was merged to the branch mainline in revision 2817.
  • Revision ID: robertc@robertcollins.net-20070912042151-o2k78pnf1hdwd2xt
Review feedback.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/weave.py
261
261
        return idx
262
262
 
263
263
    def _add_lines(self, version_id, parents, lines, parent_texts,
264
 
       left_matching_blocks, nostore_sha, random_id):
 
264
       left_matching_blocks, nostore_sha, random_id, check_content):
265
265
        """See VersionedFile.add_lines."""
266
266
        idx = self._add(version_id, lines, map(self._lookup, parents),
267
267
            nostore_sha=nostore_sha)
870
870
            self._save()
871
871
 
872
872
    def _add_lines(self, version_id, parents, lines, parent_texts,
873
 
        left_matching_blocks, nostore_sha, random_id):
 
873
        left_matching_blocks, nostore_sha, random_id, check_content):
874
874
        """Add a version and save the weave."""
875
875
        self.check_not_reserved_id(version_id)
876
876
        result = super(WeaveFile, self)._add_lines(version_id, parents, lines,
877
 
            parent_texts, left_matching_blocks, nostore_sha, random_id)
 
877
            parent_texts, left_matching_blocks, nostore_sha, random_id,
 
878
            check_content)
878
879
        self._save()
879
880
        return result
880
881