[PATCH 6 of 8] ui: do not use rawinput() when we have to replace sys.stdin/stdout
Yuya Nishihara
yuya at tcha.org
Sat Mar 10 02:02:07 EST 2018
On Fri, 09 Mar 2018 23:52:16 -0500, Matt Harbison wrote:
> On Fri, 09 Mar 2018 07:35:39 -0500, Yuya Nishihara <yuya at tcha.org> wrote:
>
> > # HG changeset patch
> > # User Yuya Nishihara <yuya at tcha.org>
> > # Date 1520325533 21600
> > # Tue Mar 06 02:38:53 2018 -0600
> > # Node ID ad7ff97565b261d82952acc9f941e5dd99f11374
> > # Parent 63a13b91e1ab4d9fa0a713935be58794b9cadab5
> > ui: do not use rawinput() when we have to replace sys.stdin/stdout
>
> Windows really doesn't like this[1]. The simplest example out of that
> might be:
>
> --- c:/Users/Matt/projects/hg/tests/test-merge-tools.t
> +++ c:/Users/Matt/projects/hg/tests/test-merge-tools.t.err
> @@ -556,6 +556,9 @@
> > u
> > EOF
> keep (l)ocal [working copy], take (o)ther [merge rev], or leave
> (u)nresolved for f? u
> +
> + unrecognized response
> + keep (l)ocal [working copy], take (o)ther [merge rev], or leave
> (u)nresolved for f?
Good catch. It appears that the new code is too strict on line ending.
More information about the Mercurial-devel
mailing list