changeset 44033:4e0a6d157910 stable

progress: flush stderr after clearing On python3, ui.stderr is buffered, it seems, so we need to flush it to actually get the progress bar off the screen. This is important since ui.write() will call into progbar.clear() if it thinks there's a progress bar on the screen, with the intent that the next thing it outputs is at the beginning of the line (instead of at the end of the progress bar line). Without the flush, we buffer up the clearing of the screen, and we get some really weird/corrupt output. Differential Revision: https://phab.mercurial-scm.org/D7784
author Kyle Lippincott <spectral@google.com>
date Thu, 02 Jan 2020 17:27:37 -0800
parents 7ca8aa8840c0
children 61881b170140
files mercurial/progress.py
diffstat 1 files changed, 1 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/progress.py	Tue Dec 24 01:38:02 2019 -0500
+++ b/mercurial/progress.py	Thu Jan 02 17:27:37 2020 -0800
@@ -193,6 +193,7 @@
         if not self.printed or not self.lastprint or not shouldprint(self.ui):
             return
         self._writeerr(b'\r%s\r' % (b' ' * self.width()))
+        self._flusherr()
         if self.printed:
             # force immediate re-paint of progress bar
             self.lastprint = 0