/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: Parth Malwankar
  • Date: 2010-05-13 06:54:21 UTC
  • mfrom: (5225 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5241.
  • Revision ID: parth.malwankar@gmail.com-20100513065421-bde255i4ga5o3oqe
merged in changes from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/weave.py
345
345
    def get_parents_with_ghosts(self, version_id):
346
346
        raise NotImplementedError(self.get_parents_with_ghosts)
347
347
 
348
 
    def insert_record_stream(self, stream):
 
348
    def insert_record_stream(self, stream, stream_type=None,
 
349
            record_counter=None):
349
350
        """Insert a record stream into this versioned file.
350
351
 
351
352
        :param stream: A stream of records to insert.
964
965
        """See VersionedFile.get_suffixes()."""
965
966
        return [WeaveFile.WEAVE_SUFFIX]
966
967
 
967
 
    def insert_record_stream(self, stream):
 
968
    def insert_record_stream(self, stream, stream_type=None,
 
969
            record_counter=None):
968
970
        super(WeaveFile, self).insert_record_stream(stream)
969
971
        self._save()
970
972