Merge lp:~jelmer/brz/268573-outf into lp:brz

[Jelmer Vernooij]

use self.outf rather than sys.stdout in command implementations.

[Martin Packman (gz)]

Looks good.

review: Approve

=== modified file 'breezy/bisect.py'
--- breezy/bisect.py	2017-08-26 23:50:59 +0000
+++ breezy/bisect.py	2017-12-04 01:16:07 +0000
@@ -71,12 +71,12 @@
         """Is the current revision a merge point?"""
         return len(self.get_parent_revids()) > 1
 
-    def show_rev_log(self, out = sys.stdout):
+    def show_rev_log(self, outf):
         """Write the current revision's log entry to a file."""
         rev = self._branch.repository.get_revision(self._revid)
         revno = ".".join([str(x) for x in self.get_current_revno()])
-        out.write("On revision %s (%s):\n%s\n" % (revno, rev.revision_id,
-                                                  rev.message))
+        outf.write("On revision %s (%s):\n%s\n" % (revno, rev.revision_id,
+                                                   rev.message))
 
     def switch(self, revid):
         """Switch the current revision to the given revid."""
@@ -186,7 +186,7 @@
     def _switch_wc_to_revno(self, revno, outf):
         """Move the working tree to the given revno."""
         self._current.switch(revno)
-        self._current.show_rev_log(out=outf)
+        self._current.show_rev_log(outf=outf)
 
     def _set_status(self, revid, status):
         """Set the bisect status for the given revid."""
@@ -330,7 +330,7 @@
         bisect_log = BisectLog(controldir)
         if bisect_log.is_done():
             note("No further bisection is possible.\n")
-            bisect_log._current.show_rev_log(self.outf)
+            bisect_log._current.show_rev_log(outf=self.outf)
             return True
 
         if revspec:

=== modified file 'breezy/builtins.py'
--- breezy/builtins.py	2017-11-24 09:25:13 +0000
+++ breezy/builtins.py	2017-12-04 01:16:07 +0000
@@ -2370,7 +2370,7 @@
             file_list, revision, old, new, self.add_cleanup, apply_view=True)
         # GNU diff on Windows uses ANSI encoding for filenames
         path_encoding = osutils.get_diff_header_encoding()
-        return show_diff_trees(old_tree, new_tree, sys.stdout,
+        return show_diff_trees(old_tree, new_tree, self.outf,
                                specific_files=specific_files,
                                external_diff_options=diff_options,
                                old_label=old_label, new_label=new_label,
@@ -4505,7 +4505,7 @@
         writer = breezy.option.diff_writer_registry.get()
         shelver = shelf_ui.Shelver(merger.this_tree, result_tree, destroy=True,
                                    reporter=shelf_ui.ApplyReporter(),
-                                   diff_writer=writer(sys.stdout))
+                                   diff_writer=writer(self.outf))
         try:
             shelver.run()
         finally:
@@ -5488,8 +5488,8 @@
     hidden = True
 
     def run(self):
-        sys.stdout.write("running\n")
-        sys.stdout.flush()
+        self.outf.write("running\n")
+        self.outf.flush()
         sys.stdin.readline()
 
 
@@ -6539,7 +6539,7 @@
         if writer is None:
             writer = breezy.option.diff_writer_registry.get()
         try:
-            shelver = Shelver.from_args(writer(sys.stdout), revision, all,
+            shelver = Shelver.from_args(writer(self.outf), revision, all,
                 file_list, message, destroy=destroy, directory=directory)
             try:
                 shelver.run()

=== modified file 'breezy/status.py'
--- breezy/status.py	2017-09-11 03:17:16 +0000
+++ breezy/status.py	2017-12-04 01:16:07 +0000
@@ -84,7 +84,7 @@
                            classify=classify)
 
 
-def show_tree_status(wt, show_unchanged=None,
+def show_tree_status(wt,
                      specific_files=None,
                      show_ids=False,
                      to_file=None,
@@ -127,10 +127,6 @@
     :param show_long_callback: A callback: message = show_long_callback(to_file, delta,
         show_ids, show_unchanged, indent, filter), only used with the long output
     """
-    if show_unchanged is not None:
-        warn("show_tree_status with show_unchanged has been deprecated "
-             "since breezy 0.9", DeprecationWarning, stacklevel=2)
-
     if to_file is None:
         to_file = sys.stdout
 

=== modified file 'doc/en/release-notes/brz-3.0.txt'
--- doc/en/release-notes/brz-3.0.txt	2017-11-20 22:51:10 +0000
+++ doc/en/release-notes/brz-3.0.txt	2017-12-04 01:16:07 +0000
@@ -146,6 +146,9 @@
 * Support automatic rename tracking into new directories.
   (mnn, #373319)
 
+* Avoid writing directly to sys.stdout, but use self.outf in
+  Command implementations instead. (#268573, B. Clausius)
+
 Documentation
 *************