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

# 0-2-4

     4

#  \ \ \

     5

#   1-3-5

     6

#

     7

# rename in #1, content change in #4.

     8

     9

hg init t

    10

cd t

    11

    12

touch 1

    13

touch 2

    14

hg commit -Am init -d "0 0"  # 0

    15

    16

hg rename 1 1a

    17

hg commit -m rename -d "0 0" # 1

    18

    19

hg co -C 0

    20

echo unrelated >> 2

    21

hg ci -m unrelated1 -d "0 0"  # 2

    22

    23

hg merge --debug 1

    24

hg ci -m merge1 -d "0 0" # 3

    25

    26

hg co -C 2

    27

echo hello >> 1

    28

hg ci -m unrelated2 -d "0 0" # 4

    29

    30

hg co -C 3

    31

hg merge -y --debug 4

    32

    33

hg co -C 4

    34

hg merge -y --debug 3

    35