--- a/mercurial/dispatch.py	Wed Apr 04 21:17:55 2018 +0900
+++ b/mercurial/dispatch.py	Fri May 11 21:23:48 2018 -0700
@@ -87,16 +87,19 @@
     req = request(pycompat.sysargv[1:])
     err = None
     try:
-        status = (dispatch(req) or 0)
+        status = dispatch(req) or 0
     except error.StdioError as e:
         err = e
         status = -1
+
+    # In all cases we try to flush stdio streams.
     if util.safehasattr(req.ui, 'fout'):
         try:
             req.ui.fout.flush()
         except IOError as e:
             err = e
             status = -1
+
     if util.safehasattr(req.ui, 'ferr'):
         try:
             if err is not None and err.errno != errno.EPIPE: