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

echo % test --time

     4

hg --time help -q help 2>&1 | grep Time > /dev/null || echo --time failed

     5

     6

echo % test --profile

     7

if "$TESTDIR/hghave" -q hotshot; then

     8

    # hotshot might be missing for licensing issues

     9

    hg --profile help -q help 2>&1 | grep ncalls > /dev/null || echo --profile failed

    10

fi

    11

    12

echo % test --lsprof

    13

if "$TESTDIR/hghave" -q lsprof; then

    14

    hg --lsprof help -q help 2>&1 | grep CallCount > /dev/null || echo --lsprof failed

    15

fi