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

# Test for changeset ba7c74081861

     4

# (update dirstate correctly for non-branchmerge updates)

     5

hg init a

     6

cd a

     7

echo a > a

     8

hg add a

     9

hg commit -m a

    10

cd ..

    11

hg clone a b

    12

cd a

    13

hg mv a b

    14

hg commit -m move

    15

echo b >> b

    16

hg commit -m b

    17

cd ../b

    18

hg pull ../a

    19

hg update