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

# http://www.selenic.com/mercurial/bts/issue352

     3

     4

"$TESTDIR/hghave" eol-in-paths || exit 80

     5

     6

hg init foo

     7

cd foo

     8

     9

A=`printf 'he\rllo'`

    10

    11

echo foo > "$A"

    12

hg add

    13

hg ci -A -m m

    14

rm "$A"

    15

    16

echo foo > "hell

    17

o"

    18

hg add

    19

hg ci -A -m m

    20

    21

echo foo > "$A"

    22

hg debugwalk

    23

    24

exit 0