# HG changeset patch # User Bryan O'Sullivan # Date 2017-04-11 21:54:12 # Node ID 1bfb9a63b98ee95c6ac3a3848bc70673b9c3e902 # Parent e9646ff34d55d4dd2a2fab8110091adb004df0e7 stdio: raise StdioError if something goes wrong in ui.flush The prior code used to ignore all errors, which was intended to deal with a decade-old problem with writing to broken pipes on Windows. However, that code inadvertantly went a lot further, making it impossible to detect *all* I/O errors on stdio ... but only sometimes. What actually happened was that if Mercurial wrote less than a stdio buffer's worth of output (the overwhelmingly common case for most commands), any error that occurred would get swallowed here. But if the buffering strategy changed, an unhandled IOError could be raised from any number of other locations. Because we now have a top-level StdioError handler, and ui._write and ui._write_err (and now flush!) will raise that exception, we have one rational place to detect and handle these errors. diff --git a/mercurial/ui.py b/mercurial/ui.py --- a/mercurial/ui.py +++ b/mercurial/ui.py @@ -807,10 +807,15 @@ class ui(object): # opencode timeblockedsection because this is a critical path starttime = util.timer() try: - try: self.fout.flush() - except (IOError, ValueError): pass - try: self.ferr.flush() - except (IOError, ValueError): pass + try: + self.fout.flush() + except IOError as err: + raise error.StdioError(err) + finally: + try: + self.ferr.flush() + except IOError as err: + raise error.StdioError(err) finally: self._blockedtimes['stdio_blocked'] += \ (util.timer() - starttime) * 1000