hgweb: extract config values after reading webdir-config
authorDirkjan Ochtman <dirkjan@ochtman.nl>
Tue, 26 May 2009 10:16:17 +0200
changeset 8621 13613221caf1
parent 8620 b38f275bb5c2
child 8622 0a4f6e1b78dc
hgweb: extract config values after reading webdir-config
mercurial/hgweb/hgwebdir_mod.py
--- a/mercurial/hgweb/hgwebdir_mod.py	Mon May 25 18:34:35 2009 +0200
+++ b/mercurial/hgweb/hgwebdir_mod.py	Tue May 26 10:16:17 2009 +0200
@@ -61,13 +61,6 @@
             self.ui.setconfig('ui', 'report_untrusted', 'off')
             self.ui.setconfig('ui', 'interactive', 'off')
 
-        self.motd = self.ui.config('web', 'motd')
-        self.style = self.ui.config('web', 'style', 'paper')
-        self.stripecount = self.ui.config('web', 'stripes', 1)
-        if self.stripecount:
-            self.stripecount = int(self.stripecount)
-        self._baseurl = self.ui.config('web', 'baseurl')
-
         if not isinstance(self.conf, (dict, list, tuple)):
             map = {'paths': 'hgweb-paths'}
             self.ui.readconfig(self.conf, remap=map, trust=True)
@@ -77,6 +70,13 @@
         elif isinstance(self.conf, dict):
             paths = self.conf.items()
 
+        self.motd = self.ui.config('web', 'motd')
+        self.style = self.ui.config('web', 'style', 'paper')
+        self.stripecount = self.ui.config('web', 'stripes', 1)
+        if self.stripecount:
+            self.stripecount = int(self.stripecount)
+        self._baseurl = self.ui.config('web', 'baseurl')
+
         self.repos = findrepos(paths)
         for prefix, root in self.ui.configitems('collections'):
             prefix = util.pconvert(prefix)