# HG changeset patch
# User Patrick Mezard <pmezard@gmail.com>
# Date 2009-05-21 18:59:36
# Node ID 6419bc7b3d9cf10307df8423f844d556f56d2cfa
# Parent  b48a1e081f23e275827cb926e7fe4017116b85fa

ui: honor interactive=off even if isatty()

diff --git a/mercurial/ui.py b/mercurial/ui.py
--- a/mercurial/ui.py
+++ b/mercurial/ui.py
@@ -246,7 +246,10 @@ class ui(object):
         except: pass
 
     def interactive(self):
-        return self.configbool("ui", "interactive") or sys.stdin.isatty()
+        i = self.configbool("ui", "interactive", None)
+        if i is None:
+            return sys.stdin.isatty()
+        return i
 
     def _readline(self, prompt=''):
         if sys.stdin.isatty():