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

echo This is file a1 > a

     5

hg add a

     6

hg commit -m "commit #0" -d "1000000 0"

     7

echo This is file b1 > b

     8

hg add b

     9

hg commit -m "commit #1" -d "1000000 0"

    10

hg update 0

    11

echo This is file c1 > c

    12

hg add c

    13

hg commit -m "commit #2" -d "1000000 0"

    14

hg merge 1

    15

rm b

    16

echo This is file c22 > c

    17

hg commit -m "commit #3" -d "1000000 0"