# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1358588450 0
# Node ID 531804688bf5b421391e2d9c3605405d0d333a1b
# Parent  e475cc6eff08f2f3f5a79fa3b9f95a6a9176f20b# Parent  469ccfe7aa92d258897ffda7411ac574df007435
Merge with stable

diff -r e475cc6eff08 -r 531804688bf5 tests/run-tests.py
--- a/tests/run-tests.py	Wed Jan 16 20:56:02 2013 +0000
+++ b/tests/run-tests.py	Sat Jan 19 09:40:50 2013 +0000
@@ -751,8 +751,7 @@
     Return a tuple (exitcode, output).  output is None in debug mode."""
     # TODO: Use subprocess.Popen if we're running on Python 2.4
     if options.debug:
-        proc = subprocess.Popen(cmd, shell=True, cwd=wd, stdin=subprocess.PIPE)
-        proc.stdin.close()
+        proc = subprocess.Popen(cmd, shell=True, cwd=wd)
         ret = proc.wait()
         return (ret, None)
 
@@ -875,6 +874,7 @@
     hgrc = open(HGRCPATH, 'w+')
     hgrc.write('[ui]\n')
     hgrc.write('slash = True\n')
+    hgrc.write('interactive = False\n')
     hgrc.write('[defaults]\n')
     hgrc.write('backout = -d "0 0"\n')
     hgrc.write('commit = -d "0 0"\n')