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

% init foo-base

     2

% create alpha in first repo

     3

adding alpha

     4

% clone foo-base to foo-work

     5

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

     6

% create beta in second repo

     7

adding beta

     8

% create gamma in first repo

     9

adding gamma

    10

% pull into work and merge

    11

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

    12

(branch merge, don't forget to commit)

    13

% revert to changeset 1 to simulate a failed merge

    14

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