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

adding a

     2

diff -r 107ba6f817b5 -r 310ce7989cdc a

     3

--- a/a	Thu Jan 01 00:00:01 1970 +0000

     4

+++ b/a	Thu Jan 01 00:00:02 1970 +0000

     5

@@ -1,2 +1,3 @@ confuse str.splitlines

     6

 confuse str.splitlines

     7

 embedded
newline

     8

+clean diff