/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/bzr/knitrepo.py

  • Committer: Jelmer Vernooij
  • Date: 2017-09-06 04:15:55 UTC
  • mfrom: (6754.8.21 lock-context-2)
  • Revision ID: jelmer@jelmer.uk-20170906041555-jtr5qxli38167gc6
Merge lp:~jelmer/brz/lock-context-2.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/bzr/knitrepo.py
38
38
    xml7,
39
39
    )
40
40
""")
41
 
from ..decorators import needs_write_lock
42
41
from ..repository import (
43
42
    InterRepository,
44
43
    IsInWriteGroupError,
205
204
        else:
206
205
            self.control_files._set_read_transaction()
207
206
 
208
 
    @needs_write_lock
209
207
    def reconcile(self, other=None, thorough=False):
210
208
        """Reconcile this repository."""
211
209
        from breezy.reconcile import KnitReconciler
212
 
        reconciler = KnitReconciler(self, thorough=thorough)
213
 
        reconciler.reconcile()
214
 
        return reconciler
 
210
        with self.lock_write():
 
211
            reconciler = KnitReconciler(self, thorough=thorough)
 
212
            reconciler.reconcile()
 
213
            return reconciler
215
214
 
216
215
    def _make_parents_provider(self):
217
216
        return _KnitsParentsProvider(self.revisions)