Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgweb: report detected character set
authorMatt Mackall <mpm@selenic.com>
Sun, 03 Dec 2006 18:47:05 -0600
changeset 3781 713e35dcc321
parent 3780 d0a48313b0f6
child 3782 a8725ae15c7c
hgweb: report detected character set Add comments on overriding charset to CGI scripts
hgweb.cgi file | annotate | diff | comparison | revisions
hgwebdir.cgi file | annotate | diff | comparison | revisions
mercurial/hgweb/hgweb_mod.py file | annotate | diff | comparison | revisions
templates/gitweb/header.tmpl file | annotate | diff | comparison | revisions
templates/header.tmpl file | annotate | diff | comparison | revisions
templates/raw/header.tmpl file | annotate | diff | comparison | revisions 
--- a/hgweb.cgi	Sun Dec 03 17:28:58 2006 -0600
+++ b/hgweb.cgi	Sun Dec 03 18:47:05 2006 -0600
@@ -10,6 +10,13 @@
 from mercurial.hgweb.request import wsgiapplication
 import mercurial.hgweb.wsgicgi as wsgicgi
 
+# If you'd like to serve pages with UTF-8 instead of your default
+# locale charset, you can do so by uncommenting the following lines.
+# Note that this will cause your .hgrc files to be interpreted in
+# UTF-8 and all your repo files to be displayed using UTF-8.
+#
+# os.environ["HGENCODING"] = "UTF-8"
+
 def make_web_app():
     return hgweb("/path/to/repo", "repository name")
 
--- a/hgwebdir.cgi	Sun Dec 03 17:28:58 2006 -0600
+++ b/hgwebdir.cgi	Sun Dec 03 18:47:05 2006 -0600
@@ -29,6 +29,13 @@
 # Alternatively you can pass a list of ('virtual/path', '/real/path') tuples
 # or use a dictionary with entries like 'virtual/path': '/real/path'
 
+# If you'd like to serve pages with UTF-8 instead of your default
+# locale charset, you can do so by uncommenting the following lines.
+# Note that this will cause your .hgrc files to be interpreted in
+# UTF-8 and all your repo files to be displayed using UTF-8.
+#
+# os.environ["HGENCODING"] = "UTF-8"
+
 def make_web_app():
     return hgwebdir("hgweb.config")
 
--- a/mercurial/hgweb/hgweb_mod.py	Sun Dec 03 17:28:58 2006 -0600
+++ b/mercurial/hgweb/hgweb_mod.py	Sun Dec 03 18:47:05 2006 -0600
@@ -654,7 +654,8 @@
 
     def run_wsgi(self, req):
         def header(**map):
-            header_file = cStringIO.StringIO(''.join(self.t("header", **map)))
+            header_file = cStringIO.StringIO(
+                ''.join(self.t("header", encoding = util._encoding, **map)))
             msg = mimetools.Message(header_file, 0)
             req.header(msg.items())
             yield header_file.read()
--- a/templates/gitweb/header.tmpl	Sun Dec 03 17:28:58 2006 -0600
+++ b/templates/gitweb/header.tmpl	Sun Dec 03 18:47:05 2006 -0600
@@ -1,11 +1,10 @@
-Content-type: text/html
+Content-type: text/html; charset={encoding}
 
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="{encoding}"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US" lang="en-US">
 <head>
 <link rel="icon" href="{url}static/hgicon.png" type="image/png">
-<meta http-equiv="content-type" content="text/html; charset=utf-8"/>
 <meta name="robots" content="index, nofollow"/>
 <link rel="stylesheet" href="{url}static/style-gitweb.css" type="text/css" />
 
--- a/templates/header.tmpl	Sun Dec 03 17:28:58 2006 -0600
+++ b/templates/header.tmpl	Sun Dec 03 18:47:05 2006 -0600
@@ -1,4 +1,4 @@
-Content-type: text/html
+Content-type: text/html; charset={encoding}
 
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
--- a/templates/raw/header.tmpl	Sun Dec 03 17:28:58 2006 -0600
+++ b/templates/raw/header.tmpl	Sun Dec 03 18:47:05 2006 -0600
@@ -1,1 +1,2 @@
-Content-type: text/plain
+Content-type: text/plain; charset={encoding}
+
mercurial