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

# test that we don't interrupt the merge session if

     4

# a file-level merge failed

     5

     6

hg init repo

     7

cd repo

     8

     9

echo foo > foo

    10

echo a > bar

    11

hg ci -Am 'add foo' -d '0 0'

    12

    13

hg mv foo baz

    14

echo b >> bar

    15

echo quux > quux1

    16

hg ci -Am 'mv foo baz' -d '0 0'

    17

    18

hg up -qC 0

    19

echo >> foo

    20

echo c >> bar

    21

echo quux > quux2

    22

hg ci -Am 'change foo' -d '0 0'

    23

    24

# test with the rename on the remote side

    25

HGMERGE=false hg merge

    26

    27

# test with the rename on the local side

    28

hg up -C 1

    29

HGMERGE=false hg merge

    30

    31

true