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 a

     4

cd a

     5

echo 'root' >root

     6

hg add root

     7

hg commit -d '0 0' -u test -m "Adding root node"

     8

     9

echo 'a' >a

    10

hg add a

    11

hg branch a

    12

hg commit -d '1 0' -u test -m "Adding a branch"

    13

    14

hg update -C 0

    15

echo 'b' >b

    16

hg add b

    17

hg branch b

    18

hg commit -d '2 0' -u test -m "Adding b branch"

    19

    20

echo 'bh1' >bh1

    21

hg add bh1

    22

hg commit -d '3 0' -u test -m "Adding b branch head 1"

    23

    24

hg update -C 2

    25

echo 'bh2' >bh2

    26

hg add bh2

    27

hg commit -d '4 0' -u test -m "Adding b branch head 2"

    28

    29

echo 'c' >c

    30

hg add c

    31

hg branch c

    32

hg commit -d '5 0' -u test -m "Adding c branch"

    33

    34

hg branches

    35

echo '-------'

    36

hg branches -a