diff mercurial/hgweb/hgwebdir_mod.py @ 8859:580a79dde2a3

hgweb: web.encoding should override encoding.encoding (issue1183)
author Matt Mackall <mpm@selenic.com>
date Sat, 20 Jun 2009 13:00:25 -0500
parents 45f626a39def
children f6eb03027411
line wrap: on
line diff
--- a/mercurial/hgweb/hgwebdir_mod.py	Sat Jun 20 11:50:51 2009 -0500
+++ b/mercurial/hgweb/hgwebdir_mod.py	Sat Jun 20 13:00:25 2009 -0500
@@ -70,6 +70,8 @@
         elif isinstance(self.conf, dict):
             paths = self.conf.items()
 
+        encoding.encoding = self.ui.config('web', 'encoding',
+                                           encoding.encoding)
         self.motd = self.ui.config('web', 'motd')
         self.style = self.ui.config('web', 'style', 'paper')
         self.stripecount = self.ui.config('web', 'stripes', 1)