@@ -159,10 +159,15 @@ def _startipython(ui, repo, env) -> None:
     config.InteractiveShell.banner2 = bannermsg
     config.InteractiveShell.confirm_exit = False
 
-    shell = InteractiveShellEmbed.instance(config=config)
-    _configipython(ui, shell)
+    if util.istest():
+        # Disable history during tests.
+        config.HistoryAccessor.enabled = False
 
-    locals().update(env)
+    globals().update(env)
+    shell = InteractiveShellEmbed.instance(
+        config=config, user_ns=globals(), user_module=sys.modules[__name__]
+    )
+    _configipython(ui, shell)
     shell()
 
 
 
@@ -3,18 +3,29 @@
 
   $ eagerepo
   $ cat >> foo.py << EOF
-  > def f(x): return x + 1
-  > ui.write('%r\n' % [f(i) for i in [1]])
+  > def f1(x): return x + 1
+  > ui.write('OUT: %r\n' % [f1(i) for i in [1]])
   > EOF
 
   $ hg debugshell < foo.py
-  [2]
+  OUT: [2]
 
   $ hg debugshell foo.py
-  [2]
+  OUT: [2]
 
-  $ hg debugshell -c 'def f(x):
+  $ hg debugshell -c 'def f2(x):
   >   return x+1
-  > ui.write("%r\n" % [f(i) for i in [1]])
+  > ui.write("OUT: %r\n" % [f2(i) for i in [1]])
   > '
-  [2]
+  OUT: [2]
+
+  $ hg debugshell --config ui.interactive=true << 'EOF' | dos2unix
+  > def f3(x): return x + 1
+  > ui.write('OUT: %r\n' % [f3(i) for i in [1]])
+  > ui.flush()
+  > exit()
+  > EOF
+  ...
+  In [1]: 
+  In [2]: OUT: [2]
+  ...