This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7784

progress: flush stderr after clearing
ClosedPublic

Authored by spectral on Jan 2 2020, 8:30 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG4e0a6d157910: progress: flush stderr after clearing
Summary

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.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

spectral created this revision.Jan 2 2020, 8:30 PM
spectral added a commit: rHG4e0a6d157910: progress: flush stderr after clearing.Jan 8 2020, 2:54 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG4e0a6d157910: progress: flush stderr after clearing (authored by spectral). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/progress.py (1 line)

Diff 19107

mercurial/progress.py

self._writeerr(b'\r' + encoding.trim(out, termwidth)) self._writeerr(b'\r' + encoding.trim(out, termwidth))
self.lasttopic = topic self.lasttopic = topic
self._flusherr() self._flusherr()
def clear(self): def clear(self):
if not self.printed or not self.lastprint or not shouldprint(self.ui): if not self.printed or not self.lastprint or not shouldprint(self.ui):
return return
self._writeerr(b'\r%s\r' % (b' ' * self.width())) self._writeerr(b'\r%s\r' % (b' ' * self.width()))
self._flusherr()
if self.printed: if self.printed:
# force immediate re-paint of progress bar # force immediate re-paint of progress bar
self.lastprint = 0 self.lastprint = 0
def complete(self): def complete(self):
if not shouldprint(self.ui): if not shouldprint(self.ui):
return return
if self.ui.configbool(b'progress', b'clear-complete'): if self.ui.configbool(b'progress', b'clear-complete'):