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

"$TESTDIR/hghave" symlink || exit 80

     4

     5

origdir=`pwd`

     6

     7

cat >> readlink.py <<EOF

     8

import os

     9

import sys

    10

    11

for f in sys.argv[1:]:

    12

    print f, '->', os.readlink(f)

    13

EOF

    14

    15

hg init repo

    16

cd repo

    17

ln -s nothing dangling

    18

hg ci -qAm 'add symlink'

    19

    20

hg archive -t files ../archive

    21

hg archive -t tar -p tar ../archive.tar

    22

hg archive -t zip -p zip ../archive.zip

    23

    24

echo '% files'

    25

cd "$origdir"

    26

cd archive

    27

python ../readlink.py dangling

    28

    29

echo '% tar'

    30

cd "$origdir"

    31

tar xf archive.tar

    32

cd tar

    33

python ../readlink.py dangling

    34

    35

echo '% zip'

    36

cd "$origdir"

    37

unzip archive.zip > /dev/null

    38

cd zip

    39

python ../readlink.py dangling