Merge lp:~jelmer/brz/3.1default-ui into lp:brz/3.1

[Jelmer Vernooij]

Fix setup_ui=False.

Fix setup_ui=False.

[The Breezy Bot (the-breezy-bot)]

Voting criteria not met
https://ci.breezy-vcs.org/job/brz-3.1/job/brz-3.1-land/18/

[Jelmer Vernooij (jelmer)]

review: Approve

[The Breezy Bot (the-breezy-bot)]

Running landing tests failed
https://ci.breezy-vcs.org/job/brz-3.1/job/brz-3.1-land/24/

=== modified file 'breezy/library_state.py'
--- breezy/library_state.py	2019-06-22 16:20:00 +0000
+++ breezy/library_state.py	2020-02-21 23:53:00 +0000
@@ -98,8 +98,9 @@
         self._trace.__enter__()
 
         self._orig_ui = breezy.ui.ui_factory
-        breezy.ui.ui_factory = self._ui
-        self._ui.__enter__()
+        if self._ui is not None:
+            breezy.ui.ui_factory = self._ui
+            self._ui.__enter__()
 
         if breezy._global_state is not None:
             raise RuntimeError("Breezy already initialized")
@@ -115,7 +116,8 @@
         trace._flush_stdout_stderr()
         trace._flush_trace()
         osutils.report_extension_load_failures()
-        self._ui.__exit__(None, None, None)
+        if self._ui is not None:
+            self._ui.__exit__(None, None, None)
         self._trace.__exit__(None, None, None)
         ui.ui_factory = self._orig_ui
         breezy._global_state = None

=== modified file 'breezy/tests/test_library_state.py'
--- breezy/tests/test_library_state.py	2017-08-27 13:57:26 +0000
+++ breezy/tests/test_library_state.py	2020-02-21 23:53:00 +0000
@@ -52,3 +52,15 @@
         finally:
             state.__exit__(None, None, None)
             self.assertEqual(['__enter__', '__exit__'], tracer._calls)
+
+    def test_ui_not_specified(self):
+        self.overrideAttr(breezy, '_global_state', None)
+        state = library_state.BzrLibraryState(
+            ui=None, trace=fixtures.RecordingContextManager())
+        orig_ui = _mod_ui.ui_factory
+        state.__enter__()
+        try:
+            self.assertEqual(orig_ui, _mod_ui.ui_factory)
+        finally:
+            state.__exit__(None, None, None)
+            self.assertEqual(orig_ui, _mod_ui.ui_factory)

=== modified file 'doc/en/release-notes/brz-3.1.txt'
--- doc/en/release-notes/brz-3.1.txt	2020-02-08 17:00:10 +0000
+++ doc/en/release-notes/brz-3.1.txt	2020-02-21 23:53:00 +0000
@@ -148,6 +148,9 @@
 * Ignore ghost tags when interacting with remote Git repositories.
   (Jelmer Vernooij)
 
+* Fix ``setup_ui=False`` when initializing Breezy.
+  (Jelmer Vernooij, #1852647)
+
 Documentation
 *************