# HG changeset patch
# User Julian Cowley <julian@lava.net>
# Date 1276123304 36000
# Node ID 716e176a4e0123c531b641b76d906520fda4413b
# Parent  997ab9af81df27edefaaf2629baaf305e68a3fb3
hgweb: specify a charset when sending raw text files

Gets the charset from encoding.encoding parameter.

diff -r 997ab9af81df -r 716e176a4e01 mercurial/hgweb/webcommands.py
--- a/mercurial/hgweb/webcommands.py	Wed Jun 09 16:39:25 2010 -0500
+++ b/mercurial/hgweb/webcommands.py	Wed Jun 09 12:41:44 2010 -1000
@@ -7,7 +7,7 @@
 
 import os, mimetypes, re, cgi, copy
 import webutil
-from mercurial import error, archival, templater, templatefilters
+from mercurial import error, encoding, archival, templater, templatefilters
 from mercurial.node import short, hex
 from mercurial.util import binary
 from common import paritygen, staticfile, get_contact, ErrorResponse
@@ -51,6 +51,8 @@
     mt = mimetypes.guess_type(path)[0]
     if mt is None:
         mt = binary(text) and 'application/octet-stream' or 'text/plain'
+    if mt.startswith('text/'):
+        mt += '; charset="%s"' % encoding.encoding
 
     req.respond(HTTP_OK, mt, path, len(text))
     return [text]