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

mkdir t

     4

cd t

     5

hg init

     6

echo a > a

     7

hg ci -Ama -d '1000000000 0'

     8

echo b > b

     9

hg branch b

    10

hg ci -Amb -d '1000000000 0'

    11

hg co -C 0

    12

    13

echo fast-forward

    14

hg merge b

    15

hg ci -Ammerge -d '1000000000 0'

    16

    17

echo bogus fast-forward should fail

    18

hg merge b

    19

    20

echo done