← Back to branch summary

~jelmer/brz/patch-silent

« back to all changes in this revision

Viewing changes to breezy/plugins/repodebug/missing_keys_for_stacking_fixer.py

  • Committer: Jelmer Vernooij
  • Date: 2019-06-01 00:52:00 UTC
  • mfrom: (7296.2.10 work)
  • Revision ID: jelmer@jelmer.uk-20190601005200-69woyx8n0klqu402
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/repodebug/missing_keys_for_stacking_fixer.py
21
21
from ... import errors
22
22
from ...sixish import viewvalues
23
23
from ...bzr.vf_search import PendingAncestryResult
 
24
from ...repository import WriteGroup
24
25
from ...revision import NULL_REVISION
25
26
 
26
27
 
77
78
            assert raw_r._format.network_name() == b.repository._format.network_name()
78
79
            stream = b.repository.inventories.get_record_stream(
79
80
                needed, 'topological', True)
80
 
            raw_r.start_write_group()
81
 
            try:
 
81
            with WriteGroup(raw_r):
82
82
                raw_r.inventories.insert_record_stream(stream)
83
 
            except:
84
 
                raw_r.abort_write_group()
85
 
                raise
86
 
            else:
87
 
                raw_r.commit_write_group()
88
83
        finally:
89
84
            raw_r.unlock()
90
85
        b.unlock()