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

# Corrupt an hg repo with two pulls.

     4

#

     5

     6

# create one repo with a long history

     7

hg init source1

     8

cd source1

     9

touch foo

    10

hg add foo

    11

for i in 1 2 3 4 5 6 7 8 9 10; do

    12

    echo $i >> foo

    13

    hg ci -m $i

    14

done

    15

cd ..

    16

    17

# create a third repo to pull both other repos into it

    18

hg init version2

    19

hg -R version2 pull source1 &

    20

sleep 1

    21

    22

hg clone --pull -U version2 corrupted

    23

wait

    24

hg -R corrupted verify

    25

hg -R version2 verify