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

  • Committer: Jelmer Vernooij
  • Date: 2019-06-03 23:48:08 UTC
  • mfrom: (7316 work)
  • mto: This revision was merged to the branch mainline in revision 7328.
  • Revision ID: jelmer@jelmer.uk-20190603234808-15yk5c7054tj8e2b
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/bundle/serializer/v4.py
26
26
    lru_cache,
27
27
    multiparent,
28
28
    osutils,
 
29
    repository as _mod_repository,
29
30
    revision as _mod_revision,
30
31
    trace,
31
32
    ui,
519
520
 
520
521
        Must be called with the Repository locked.
521
522
        """
522
 
        self._repository.start_write_group()
523
 
        try:
524
 
            result = self._install_in_write_group()
525
 
        except:
526
 
            self._repository.abort_write_group()
527
 
            raise
528
 
        self._repository.commit_write_group()
529
 
        return result
 
523
        with _mod_repository.WriteGroup(self._repository):
 
524
            return self._install_in_write_group()
530
525
 
531
526
    def _install_in_write_group(self):
532
527
        current_file = None