merge with crew-stable

This commit is contained in:
Thomas Arendsen Hein 2007-09-07 17:54:38 +02:00
commit 128a411ed1
2 changed files with 4 additions and 2 deletions

View File

@ -65,7 +65,8 @@ def revnavgen(pos, pagelen, limit, nodefunc):
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

View File

@ -82,7 +82,8 @@ class hgwebdir(object):
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)