Don't try to determine interactivity if ui() called with interactive=False. WSGI applications are not supposed to refer to sys.stdin. In ed6df6b1c29a, hgweb and hgwebdir were fixed to pass interactive=False to their ui()'s, but sys.stdin.isatty() was still called by the ui objects. This change makes sure only the ui.fixconfig() method will call ui.isatty() (by making the ui._readline() method, which is currently only called from ui.prompt(), private). ui.fixconfig() is changed to let config files override the initial interactivity setting, but not check isatty() if interactive=False was specified in the creation of the ui.

     1

#!/bin/sh

     2

     3

hg init

     4

python -c 'print "confuse str.splitlines\nembedded\rnewline"' > a

     5

hg ci -Ama -d '1 0'

     6

echo clean diff >> a

     7

hg ci -mb -d '2 0'

     8

hg diff -r0 -r1