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

cat > $HGRCPATH <<EOF

     4

[extensions]

     5

alias=

     6

     7

[alias]

     8

myinit = init

     9

cleanstatus = status -c

    10

unknown = bargle

    11

ambiguous = s

    12

recursive = recursive

    13

EOF

    14

    15

echo '% basic'

    16

hg myinit alias

    17

    18

echo '% unknown'

    19

hg unknown

    20

    21

echo '% ambiguous'

    22

hg ambiguous

    23

    24

echo '% recursive'

    25

hg recursive

    26

    27

cd alias

    28

echo foo > foo

    29

hg ci -Amfoo

    30

    31

echo '% with opts'

    32

hg cleanst