merge with crew-stable
authorThomas Arendsen Hein <thomas@intevation.de>
Fri, 07 Sep 2007 17:54:38 +0200
changeset 5290 05889b6b1468
parent 5288 18091102a633 (current diff)
parent 5289 ed6df6b1c29a (diff)
child 5293 32ec518ee3cb
child 5294 e14118f92730
merge with crew-stable
mercurial/hgweb/hgweb_mod.py
mercurial/hgweb/hgwebdir_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
 
--- 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)