/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/bundle/serializer/v4.py

Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bundle/serializer/v4.py
330
330
 
331
331
    def write_files(self):
332
332
        """Write bundle records for all revisions of all files"""
333
 
        for vf, file_id, revision_ids in self.iter_file_revisions_aggressive():
 
333
        for vf, file_id, revision_ids in self.iter_file_revisions():
334
334
            self.add_mp_records('file', file_id, vf, revision_ids)
335
335
 
336
336
    def write_revisions(self):
466
466
        self._info = None
467
467
 
468
468
    def install(self):
469
 
        """Perform the installation"""
 
469
        """Perform the installation.
 
470
        
 
471
        Must be called with the Repository locked.
 
472
        """
 
473
        self._repository.start_write_group()
 
474
        try:
 
475
            result = self._install_in_write_group()
 
476
        except:
 
477
            self._repository.abort_write_group()
 
478
            raise
 
479
        self._repository.commit_write_group()
 
480
        return result
 
481
 
 
482
    def _install_in_write_group(self):
470
483
        current_file = None
471
484
        current_versionedfile = None
472
485
        pending_file_records = []