upstream/mercurial-mirror Commit - r3781:713e35dc

hgweb: report detected character set...

Matt Mackall -

r3781:713e35dc default

parent child

hgweb.cgi

0 +7 0

             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")

hgwebdir.cgi

0 +7 0

             # 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")

mercurial/hgweb/hgweb_mod.py

0 +2 -1

                 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()

templates/gitweb/header.tmpl

0 +2 -3

-            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" />

templates/header.tmpl

0 +1 -1

-            Content-type: text/html
+            Content-type: text/html; charset={encoding}
             <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
             <html>

templates/raw/header.tmpl

0 +2 -1

@@ -1,1 +1,2 b''
1	Content-type: text/plain	1	Content-type: text/plain; charset={encoding}
		2

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages