comparison mercurial/dispatch.py @ 45253:9b5723784aac stable

dispatch: adjust ui.flush() timing to stabilize test-blackbox.t

Without this change, dispatch.dispatch() could return before flushing all
stdio data. This means chg stdio would print data after receiving the result
code.

--- tests/test-blackbox.t
+++ tests/test-blackbox.t.err
@@ -354,13 +354,13 @@
   > EOF
   $ hg log --debug
   removing $TESTTMP/gone/.hg
-  warning: cannot write to blackbox.log: $ENOENT$ (no-windows !)
   warning: cannot write to blackbox.log: $TESTTMP/gone/.hg/blackbox.log: $ENOTDIR$ (windows !)
   $ cd ..

 blackbox should disable itself if track is empty

   $ hg --config blackbox.track= init nothing_tracked
+  warning: cannot write to blackbox.log: $ENOENT$
   $ cd nothing_tracked
   $ cat >> .hg/hgrc << EOF
   > [blackbox]

45252:20d110e6eea6

                if inst.errno != errno.EPIPE:
                    raise
            ret = -1
        finally:
            duration = util.timer() - starttime
            req.ui.flush()
            if req.ui.logblockedtimes:
                req.ui._blockedtimes[b'command_duration'] = duration * 1000
                req.ui.log(
                    b'uiblocked',
                    b'ui blocked ms\n',

            )
            try:
                req._runexithandlers()
            except:  # exiting, so no re-raises
                ret = ret or -1
        return ret


def _runcatch(req):
    with tracing.log('dispatch._runcatch'):

45253:9b5723784aac

                if inst.errno != errno.EPIPE:
                    raise
            ret = -1
        finally:
            duration = util.timer() - starttime
            req.ui.flush()  # record blocked times
            if req.ui.logblockedtimes:
                req.ui._blockedtimes[b'command_duration'] = duration * 1000
                req.ui.log(
                    b'uiblocked',
                    b'ui blocked ms\n',

            )
            try:
                req._runexithandlers()
            except:  # exiting, so no re-raises
                ret = ret or -1
            # do flush again since ui.log() and exit handlers may write to ui
            req.ui.flush()
        return ret


def _runcatch(req):
    with tracing.log('dispatch._runcatch'):