Merge lp:~jelmer/brz/pb-context into lp:brz

[Jelmer Vernooij]

Make progress bars context managers.

Make progress bars context managers.

[Martin Packman (gz)]

Looks like a good improvement overall, see couple of inline notes.

review: Approve

[Vincent Ladeuil (vila)]

Running landing tests failed

=== modified file 'breezy/bundle/apply_bundle.py'
--- breezy/bundle/apply_bundle.py	2018-02-24 15:50:23 +0000
+++ breezy/bundle/apply_bundle.py	2018-03-01 23:45:46 +0000
@@ -32,7 +32,7 @@
     custom_install = getattr(bundle_reader, 'install', None)
     if custom_install is not None:
         return custom_install(repository)
-    with ui.ui_factory.nested_progress_bar() as pb, repository.lock_write():
+    with repository.lock_write(), ui.ui_factory.nested_progress_bar() as pb:
         real_revisions = bundle_reader.real_revisions
         for i, revision in enumerate(reversed(real_revisions)):
             pb.update(gettext("Install revisions"), i, len(real_revisions))
 
=== modified file 'breezy/plugins/weave_fmt/bzrdir.py'
--- breezy/plugins/weave_fmt/bzrdir.py	2018-02-24 15:50:23 +0000
+++ breezy/plugins/weave_fmt/bzrdir.py	2018-03-01 23:45:46 +0000
@@ -242,7 +242,6 @@
         if pb is not None:
             warnings.warn(gettext("pb parameter to convert() is deprecated"))
         with ui.ui_factory.nested_progress_bar() as self.pb:
-        try:
             ui.ui_factory.note(gettext('starting upgrade from format 4 to 5'))
             if isinstance(self.controldir.transport, local.LocalTransport):
                 self.controldir.get_workingtree_transport(None).delete('stat-cache')
 
=== modified file 'breezy/reconcile.py'
--- breezy/reconcile.py	2018-02-24 15:50:23 +0000
+++ breezy/reconcile.py	2018-03-01 23:45:46 +0000
@@ -76,11 +76,14 @@
           branch history was correct, True if the branch history needed to be
           re-normalized.
         """
-        with ui.ui_factory.nested_progress_bar() as self.pb:
-            self._reconcile()
+        operation = cleanup.OperationWithCleanups(self._reconcile)
+        self.add_cleanup = operation.add_cleanup
+        operation.run_simple()
 
     def _reconcile(self):
         """Helper function for performing reconciliation."""
+        self.pb = ui.ui_factory.nested_progress_bar()
+        self.add_cleanup(self.pb.finished)
         self._reconcile_branch()
         self._reconcile_repository()
 
 
=== modified file 'breezy/tests/testui.py'
--- breezy/tests/testui.py	2017-05-22 00:56:52 +0000
+++ breezy/tests/testui.py	2018-03-01 23:45:46 +0000
@@ -41,6 +41,13 @@
     def finished(self):
         self.depth -= 1
 
+    def __enter__(self):
+        return self
+
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        self.finished()
+        return False
+
     def update(self, message, count=None, total=None):
         if self.depth == 1:
             self._calls.append(("update", count, total, message))