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.
#!/bin/sh
# test that we don't interrupt the merge session if
# a file-level merge failed
hg init repo
cd repo
echo foo > foo
echo a > bar
hg ci -Am 'add foo' -d '0 0'
hg mv foo baz
echo b >> bar
echo quux > quux1
hg ci -Am 'mv foo baz' -d '0 0'
hg up -qC 0
echo >> foo
echo c >> bar
echo quux > quux2
hg ci -Am 'change foo' -d '0 0'
# test with the rename on the remote side
HGMERGE=false hg merge
# test with the rename on the local side
hg up -C 1
HGMERGE=false hg merge
true