/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/reconcile.py

  • Committer: Jelmer Vernooij
  • Date: 2018-03-24 17:48:04 UTC
  • mfrom: (6921 work)
  • mto: This revision was merged to the branch mainline in revision 6923.
  • Revision ID: jelmer@jelmer.uk-20180324174804-xf22o05byoj12x1q
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/reconcile.py
76
76
          branch history was correct, True if the branch history needed to be
77
77
          re-normalized.
78
78
        """
79
 
        self.pb = ui.ui_factory.nested_progress_bar()
80
 
        try:
81
 
            self._reconcile()
82
 
        finally:
83
 
            self.pb.finished()
 
79
        operation = cleanup.OperationWithCleanups(self._reconcile)
 
80
        self.add_cleanup = operation.add_cleanup
 
81
        operation.run_simple()
84
82
 
85
83
    def _reconcile(self):
86
84
        """Helper function for performing reconciliation."""
 
85
        self.pb = ui.ui_factory.nested_progress_bar()
 
86
        self.add_cleanup(self.pb.finished)
87
87
        self._reconcile_branch()
88
88
        self._reconcile_repository()
89
89