hgwebdir: use template paths configured in the hgrc (issue2281) stable
authorChristian Fischer <christian@fi12.de>
Mon, 12 Jul 2010 16:07:58 +0200
branchstable
changeset 11649 48163c39e1f1
parent 11646 91af149b5cd7
child 11650 ebaf117c2642
hgwebdir: use template paths configured in the hgrc (issue2281)
mercurial/hgweb/hgwebdir_mod.py
--- a/mercurial/hgweb/hgwebdir_mod.py	Wed Jul 21 17:06:00 2010 -0400
+++ b/mercurial/hgweb/hgwebdir_mod.py	Mon Jul 12 16:07:58 2010 +0200
@@ -86,6 +86,7 @@
         encoding.encoding = self.ui.config('web', 'encoding',
                                            encoding.encoding)
         self.style = self.ui.config('web', 'style', 'paper')
+        self.templatepath = self.ui.config('web', 'templates', None)
         self.stripecount = self.ui.config('web', 'stripes', 1)
         if self.stripecount:
             self.stripecount = int(self.stripecount)
@@ -315,7 +316,7 @@
             config('web', 'style'),
             'paper'
         )
-        style, mapfile = templater.stylemap(styles)
+        style, mapfile = templater.stylemap(styles, self.templatepath)
         if style == styles[0]:
             vars['style'] = style