[PATCH] hook: ensure stderr is flushed when an exception is raised, for test stability

Yuya Nishihara yuya at tcha.org
Sun Mar 11 05:32:52 EDT 2018


On Sat, 10 Mar 2018 22:30:57 -0500, Matt Harbison wrote:
> # HG changeset patch
> # User Matt Harbison <matt_harbison at yahoo.com>
> # Date 1520737378 18000
> #      Sat Mar 10 22:02:58 2018 -0500
> # Node ID 5dd79bb7e5a3cf33d04c00e7c6c52070f472149d
> # Parent  7c4e5abd9e7e903e6916b30ccc0d2b26d69a5fca
> hook: ensure stderr is flushed when an exception is raised, for test stability

Queued, thanks.

> diff --git a/mercurial/hook.py b/mercurial/hook.py
> --- a/mercurial/hook.py
> +++ b/mercurial/hook.py
> @@ -265,12 +265,12 @@ def runhooks(ui, repo, htype, hooks, thr
>                  raised = False
>  
>              res[hname] = r, raised
> +    finally:
> +        # The stderr is fully buffered on Windows when connected to a pipe.
> +        # A forcible flush is required to make small stderr data in the
> +        # remote side available to the client immediately.
> +        util.stderr.flush()
>  
> -            # The stderr is fully buffered on Windows when connected to a pipe.
> -            # A forcible flush is required to make small stderr data in the
> -            # remote side available to the client immediately.
> -            util.stderr.flush()

Appears that we didn't have to flush stderr per hook, so this change seems
good.


More information about the Mercurial-devel mailing list