# HG changeset patch
# User Dirkjan Ochtman <dirkjan@ochtman.nl>
# Date 2009-05-26 08:16:17
# Node ID 13613221caf147c959cb4c5761e41029d9789cc6
# Parent  b38f275bb5c28a75bccd0adb94d166555b01a2c0

hgweb: extract config values after reading webdir-config

diff --git a/mercurial/hgweb/hgwebdir_mod.py b/mercurial/hgweb/hgwebdir_mod.py
--- a/mercurial/hgweb/hgwebdir_mod.py
+++ b/mercurial/hgweb/hgwebdir_mod.py
@@ -61,13 +61,6 @@ class hgwebdir(object):
             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 @@ class hgwebdir(object):
         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)