# HG changeset patch
# User Thomas Arendsen Hein <thomas@intevation.de>
# Date 1189180478 -7200
# Node ID 05889b6b1468e98f9305ed6823287a2d3a542429
# Parent  18091102a6333d38c68fd6e590e6bfea0970b771# Parent  ed6df6b1c29af317bf130c65bb51c09989a809d0
merge with crew-stable

diff -r 18091102a633 -r 05889b6b1468 mercurial/hgweb/hgweb_mod.py
--- a/mercurial/hgweb/hgweb_mod.py	Fri Sep 07 16:35:43 2007 +0200
+++ b/mercurial/hgweb/hgweb_mod.py	Fri Sep 07 17:54:38 2007 +0200
@@ -65,7 +65,8 @@
 class hgweb(object):
     def __init__(self, repo, name=None):
         if isinstance(repo, str):
-            self.repo = hg.repository(ui.ui(report_untrusted=False), repo)
+            parentui = ui.ui(report_untrusted=False, interactive=False)
+            self.repo = hg.repository(parentui, repo)
         else:
             self.repo = repo
 
diff -r 18091102a633 -r 05889b6b1468 mercurial/hgweb/hgwebdir_mod.py
--- a/mercurial/hgweb/hgwebdir_mod.py	Fri Sep 07 16:35:43 2007 +0200
+++ b/mercurial/hgweb/hgwebdir_mod.py	Fri Sep 07 17:54:38 2007 +0200
@@ -82,7 +82,8 @@
             else:
                 yield config('web', 'motd', '')
 
-        parentui = self.parentui or ui.ui(report_untrusted=False)
+        parentui = self.parentui or ui.ui(report_untrusted=False,
+                                          interactive=False)
 
         def config(section, name, default=None, untrusted=True):
             return parentui.config(section, name, default, untrusted)