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 bar > foo

     6

hg add foo

     7

hg ci -m 'add foo' -d '1000000 0'

     8

     9

echo foobar > foo

    10

hg ci -m 'change foo' -d '1000001 0'

    11

    12

echo 'quiet:'

    13

hg --quiet diff -r 0 -r 1

    14

echo

    15

    16

echo 'normal:'

    17

hg diff -r 0 -r 1

    18

echo

    19

    20

echo 'verbose:'

    21

hg --verbose diff -r 0 -r 1

    22

echo

    23

    24

echo 'debug:'

    25

hg --debug diff -r 0 -r 1

    26

echo