hgweb: trust config file passed into hgwebdir
authorDirkjan Ochtman <dirkjan@ochtman.nl>
Tue, 12 May 2009 10:57:55 +0200
changeset 8359 07ddec2ea203
parent 8358 be2277c1dfcc
child 8360 acc202b71619
hgweb: trust config file passed into hgwebdir Before this patch, hgwebdir suddenly showed up empty for a webdir-conf file that was for some reason not trusted. This was previously not a problem because the trust mechanism wasn't required for the very separate webdir-conf.
mercurial/hgweb/hgwebdir_mod.py
--- a/mercurial/hgweb/hgwebdir_mod.py	Tue May 12 11:05:13 2009 +0200
+++ b/mercurial/hgweb/hgwebdir_mod.py	Tue May 12 10:57:55 2009 +0200
@@ -35,7 +35,7 @@
         elif isinstance(conf, dict):
             self.repos = sorted(cleannames(conf.items()))
         else:
-            self.ui.readconfig(conf, remap={'paths': 'hgweb-paths'})
+            self.ui.readconfig(conf, remap={'paths': 'hgweb-paths'}, trust=True)
             self.repos = []
 
         self.motd = self.ui.config('web', 'motd')