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

# a test for issue586

     3

     4

hg init a

     5

cd a

     6

echo a > a

     7

hg ci -Ama

     8

     9

hg init ../b

    10

cd ../b

    11

echo b > b

    12

hg ci -Amb

    13

    14

hg pull -f ../a

    15

hg merge

    16

hg rm -f a

    17

hg ci -Amc

    18

    19

hg st -A