upstream/mercurial-mirror Commit - r5928:3340aa5a

mercurial/hgweb/hgweb_mod.py

0 +4 -6

             # This software may be used and distributed according to the terms
             # of the GNU General Public License, incorporated herein by reference.
-            import os, mimetypes, re, mimetools, cStringIO
+            import os, mimetypes, re
             from mercurial.node import *
             from mercurial import mdiff, ui, hg, util, archival, patch, hook
             from mercurial import revlog, templater
                     # some functions for the templater
                     def header(**map):
-                        header_file = cStringIO.StringIO(
+                        ctype = tmpl('mimetype', encoding=self.encoding)
-                            ''.join(tmpl("header", encoding=self.encoding, **map)))
+                        req.httphdr(templater.stringify(ctype))
-                        msg = mimetools.Message(header_file, 0)
+                        yield tmpl('header', encoding=self.encoding, **map)
-                        req.header(msg.items())
-                        yield header_file.read()
                     def footer(**map):
                         yield tmpl("footer", **map)

mercurial/hgweb/hgwebdir_mod.py

0 +5 -6

             # This software may be used and distributed according to the terms
             # of the GNU General Public License, incorporated herein by reference.
-            import os, mimetools, cStringIO
+            import os
             from mercurial.i18n import gettext as _
             from mercurial import ui, hg, util, templater
             from common import ErrorResponse, get_mtime, staticfile, style_map, paritygen, \
                              "%s%s" % ((not descending and column == sortcolumn)
                                         and "-" or "", column))
                             for column in sortable]
                     req.write(tmpl("index", entries=entries, subdir=subdir,
                                    sortcolumn=sortcolumn, descending=descending,
                                    **dict(sort)))
                 def templater(self, req):
                     def header(**map):
-                        header_file = cStringIO.StringIO(
+                        ctype = tmpl('mimetype', encoding=util._encoding)
-                            ''.join(tmpl("header", encoding=util._encoding, **map)))
+                        req.httphdr(templater.stringify(ctype))
-                        msg = mimetools.Message(header_file, 0)
+                        yield tmpl('header', encoding=util._encoding, **map)
-                        req.header(msg.items())
-                        yield header_file.read()
                     def footer(**map):
                         yield tmpl("footer", **map)

templates/atom/header.tmpl

0 0 -2

-            Content-type: application/atom+xml; charset={encoding}
             <?xml version="1.0" encoding="{encoding}"?>
             <feed xmlns="http://www.w3.org/2005/Atom">

templates/atom/map

0 +1 0

             default = 'changelog'
             feedupdated = '<updated>#date|rfc3339date#</updated>'
+            mimetype = 'application/atom+xml; charset={encoding}'
             header = header.tmpl
             changelog = changelog.tmpl
             changelogentry = changelogentry.tmpl

templates/gitweb/header.tmpl

0 0 -2

-            Content-type: text/html; charset={encoding}
             <?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">

templates/gitweb/map

0 +1 0

             default = 'summary'
+            mimetype = 'text/html; charset={encoding}'
             header = header.tmpl
             footer = footer.tmpl
             search = search.tmpl

templates/header.tmpl

0 0 -2

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

templates/map

0 +1 0

             default = 'shortlog'
+            mimetype = 'text/html; charset={encoding}'
             header = header.tmpl
             footer = footer.tmpl
             search = search.tmpl

templates/old/header.tmpl

0 0 -2

-            Content-type: text/html
             <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
             <html>
             <head>

templates/old/map

0 +1 0

             default = 'changelog'
+            mimetype = 'text/html'
             header = header.tmpl
             footer = footer.tmpl
             search = search.tmpl

templates/raw/map

0 +2 -1

-            header = header.tmpl
+            mimetype = 'text/plain; charset={encoding}'
+            header = ''
             footer = ''
             changeset = changeset.tmpl
             difflineplus = '#line#'

templates/rss/header.tmpl

0 0 -2

-            Content-type: text/xml; charset={encoding}
             <?xml version="1.0" encoding="{encoding}"?>
             <rss version="2.0">
               <channel>

templates/rss/map

0 +1 0

             default = 'changelog'
+            mimetype = 'text/xml; charset={encoding}'
             header = header.tmpl
             changelog = changelog.tmpl
             changelogentry = changelogentry.tmpl

tests/test-hgweb-no-request-uri.out

0 +4 -4

             ---- HEADERS
 Script output follows
             ---- DATA
-            [('content-type', 'application/atom+xml; charset=ascii')]
+            [('Content-type', 'application/atom+xml; charset=ascii')]
             <?xml version="1.0" encoding="ascii"?>
             <feed xmlns="http://www.w3.org/2005/Atom">
              <!-- Changelog -->
             ---- HEADERS
 Script output follows
             ---- DATA
-            [('content-type', 'text/plain; charset=ascii')]
+            [('Content-type', 'text/plain; charset=ascii')]
             -rw-r--r-- 4 bar
             ---- HEADERS
 Script output follows
             ---- DATA
-            [('content-type', 'text/plain; charset=ascii')]
+            [('Content-type', 'text/plain; charset=ascii')]
             /repo/
             ---- HEADERS
 Script output follows
             ---- DATA
-            [('content-type', 'text/plain; charset=ascii')]
+            [('Content-type', 'text/plain; charset=ascii')]
             -rw-r--r-- 4 bar

tests/test-non-interactive-wsgi.out

0 +1 -1

             ---- HEADERS
 Script output follows
             ---- DATA
-            [('content-type', 'text/html; charset=ascii')]
+            [('Content-type', 'text/html; charset=ascii')]
             ---- ERRORS

templates/raw/header.tmpl

0 removed 0 -2

NO CONTENT: file was removed

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	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