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

adding bar

     2

adding foo

     3

adding quux1

     4

adding quux2

     5

merging bar

     6

merging bar failed!

     7

merging foo and baz

     8

merging baz failed!

     9

1 files updated, 0 files merged, 0 files removed, 2 files unresolved

    10

There are unresolved merges, you can redo the full merge using:

    11

  hg update -C 2

    12

  hg merge 1

    13

3 files updated, 0 files merged, 1 files removed, 0 files unresolved

    14

merging bar

    15

merging bar failed!

    16

merging baz and foo

    17

merging baz failed!

    18

1 files updated, 0 files merged, 0 files removed, 2 files unresolved

    19

There are unresolved merges, you can redo the full merge using:

    20

  hg update -C 1

    21

  hg merge 2