# HG changeset patch
# User Marcin Kuzminski <marcin@python-blog.com>
# Date 2010-03-04 23:13:12
# Node ID 2963f2894a7a2fe126336b2cb64dca9ff2ca86fb
# Parent  424167fefd6c4b4d8d264ab74492a81f5c1fb844

Tempalting change, bugfix for serving raw files, and diffs. Now raw files are not parsed thruough mako, and diffs are mako safe (not parsed also)

diff --git a/pylons_app/config/middleware.py b/pylons_app/config/middleware.py
--- a/pylons_app/config/middleware.py
+++ b/pylons_app/config/middleware.py
@@ -12,7 +12,7 @@ from routes.middleware import RoutesMidd
 from pylons_app.config.environment import load_environment
 
 
-def make_app(global_conf, full_stack = True, **app_conf):
+def make_app(global_conf, full_stack=True, **app_conf):
     """Create a Pylons WSGI application and return it
 
     ``global_conf``
diff --git a/pylons_app/controllers/hg.py b/pylons_app/controllers/hg.py
--- a/pylons_app/controllers/hg.py
+++ b/pylons_app/controllers/hg.py
@@ -10,7 +10,7 @@ import os
 from mercurial import ui, hg
 from mercurial.error import RepoError
 from ConfigParser import ConfigParser
-
+import encodings
 log = logging.getLogger(__name__)
 
 class HgController(BaseController):
@@ -18,24 +18,28 @@ class HgController(BaseController):
     def __before__(self):
         c.repos_prefix = 'etelko'
 
-
     def view(self, *args, **kwargs):
         response = g.hgapp(request.environ, self.start_response)
-        #for mercurial protocols we can't wrap into mako
-        if request.environ['HTTP_ACCEPT'].find("mercurial") >= 0:
+        #for mercurial protocols and raw files we can't wrap into mako
+        if request.environ['HTTP_ACCEPT'].find("mercurial") != -1 or \
+        request.environ['PATH_INFO'].find('raw-file') != -1:
                     return response
 
-        #wrap the murcurial response in a mako template.
-        template = Template("".join(response),
-                            lookup = request.environ['pylons.pylons']\
+        tmpl = ''.join(response)
+
+        template = Template(tmpl, lookup=request.environ['pylons.pylons']\
                             .config['pylons.g'].mako_lookup)
 
-        return template.render(g = g, c = c, session = session, h = h)
+        return template.render(g=g, c=c, session=session, h=h)
 
 
     def manage_hgrc(self):
         pass
 
+    def hgrc(self, dirname):
+        filename = os.path.join(dirname, '.hg', 'hgrc')
+        return filename
+
     def add_repo(self, new_repo):
         c.staticurl = g.statics
 
diff --git a/pylons_app/lib/app_globals.py b/pylons_app/lib/app_globals.py
--- a/pylons_app/lib/app_globals.py
+++ b/pylons_app/lib/app_globals.py
@@ -38,7 +38,16 @@ class Globals(object):
             baseui.setconfig('web', k, v)
         #magic trick to make our custom template dir working
         templater.path.append(cfg.get('web', 'templates', None))
-        hgwebapp = hgwebdir(paths, baseui = baseui)
+
+        #baseui.setconfig('web', 'description', '')
+        #baseui.setconfig('web', 'name', '')
+        #baseui.setconfig('web', 'contact', '')
+        #baseui.setconfig('web', 'allow_archive', '')
+        #baseui.setconfig('web', 'style', 'monoblue_plain')
+        #baseui.setconfig('web', 'baseurl', '')
+        #baseui.setconfig('web', 'staticurl', '')
+        
+        hgwebapp = hgwebdir(paths, baseui=baseui)
         return hgwebapp
 
 
diff --git a/pylons_app/templates/monoblue_custom/branches.tmpl b/pylons_app/templates/monoblue_custom/branches.tmpl
--- a/pylons_app/templates/monoblue_custom/branches.tmpl
+++ b/pylons_app/templates/monoblue_custom/branches.tmpl
@@ -1,3 +1,4 @@
+## -*- coding: utf-8 -*-
 {header}
     <title>{repo|escape}: Branches</title>
     <link rel="alternate" type="application/atom+xml" href="{url}atom-log" title="Atom feed for {repo|escape}"/>
diff --git a/pylons_app/templates/monoblue_custom/changelog.tmpl b/pylons_app/templates/monoblue_custom/changelog.tmpl
--- a/pylons_app/templates/monoblue_custom/changelog.tmpl
+++ b/pylons_app/templates/monoblue_custom/changelog.tmpl
@@ -1,3 +1,4 @@
+## -*- coding: utf-8 -*-
 {header}
     <title>{repo|escape}: changelog</title>
     <link rel="alternate" type="application/atom+xml" href="{url}atom-log" title="Atom feed for {repo|escape}"/>
diff --git a/pylons_app/templates/monoblue_custom/changelogentry.tmpl b/pylons_app/templates/monoblue_custom/changelogentry.tmpl
--- a/pylons_app/templates/monoblue_custom/changelogentry.tmpl
+++ b/pylons_app/templates/monoblue_custom/changelogentry.tmpl
@@ -1,3 +1,4 @@
+## -*- coding: utf-8 -*-
 <h3 class="changelog"><a class="title" href="{url}rev/{node|short}{sessionvars%urlparameter}">{desc|strip|firstline|escape|nonempty}<span class="logtags"> {inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}</span></a></h3>
 <ul class="changelog-entry">
     <li class="age">{date|age}</li>
diff --git a/pylons_app/templates/monoblue_custom/changeset.tmpl b/pylons_app/templates/monoblue_custom/changeset.tmpl
--- a/pylons_app/templates/monoblue_custom/changeset.tmpl
+++ b/pylons_app/templates/monoblue_custom/changeset.tmpl
@@ -1,3 +1,4 @@
+## -*- coding: utf-8 -*-
 {header}
 <title>{repo|escape}: changeset {rev}:{node|short}</title>
     <link rel="alternate" type="application/atom+xml" href="{url}atom-log" title="Atom feed for {repo|escape}"/>
@@ -57,7 +58,9 @@
     </table>
 
     <div class="diff">
-    {diff}
+    <%text filter="n">
+		{diff}
+	</%text>
     </div>
 
 {footer}
diff --git a/pylons_app/templates/monoblue_custom/error.tmpl b/pylons_app/templates/monoblue_custom/error.tmpl
--- a/pylons_app/templates/monoblue_custom/error.tmpl
+++ b/pylons_app/templates/monoblue_custom/error.tmpl
@@ -1,3 +1,4 @@
+## -*- coding: utf-8 -*-
 {header}
     <title>{repo|escape}: Error</title>
     <link rel="alternate" type="application/atom+xml" href="{url}atom-log" title="Atom feed for {repo|escape}"/>
diff --git a/pylons_app/templates/monoblue_custom/fileannotate.tmpl b/pylons_app/templates/monoblue_custom/fileannotate.tmpl
--- a/pylons_app/templates/monoblue_custom/fileannotate.tmpl
+++ b/pylons_app/templates/monoblue_custom/fileannotate.tmpl
@@ -1,3 +1,4 @@
+## -*- coding: utf-8 -*-
 {header}
 <title>{repo|escape}: {file|escape}@{node|short} (annotated)</title>
     <link rel="alternate" type="application/atom+xml" href="{url}atom-log" title="Atom feed for {repo|escape}"/>
diff --git a/pylons_app/templates/monoblue_custom/filediff.tmpl b/pylons_app/templates/monoblue_custom/filediff.tmpl
--- a/pylons_app/templates/monoblue_custom/filediff.tmpl
+++ b/pylons_app/templates/monoblue_custom/filediff.tmpl
@@ -1,3 +1,4 @@
+## -*- coding: utf-8 -*-
 {header}
 <title>{repo|escape}: diff {file|escape}</title>
     <link rel="alternate" type="application/atom+xml" href="{url}atom-log" title="Atom feed for {repo|escape}"/>
@@ -48,7 +49,9 @@
     </dl>
 
     <div class="diff">
-    {diff}
+    <%text filter="n">
+		{diff}
+	</%text>
     </div>
 
 {footer}
diff --git a/pylons_app/templates/monoblue_custom/filelog.tmpl b/pylons_app/templates/monoblue_custom/filelog.tmpl
--- a/pylons_app/templates/monoblue_custom/filelog.tmpl
+++ b/pylons_app/templates/monoblue_custom/filelog.tmpl
@@ -1,3 +1,4 @@
+## -*- coding: utf-8 -*-
 {header}
 <title>{repo|escape}: File revisions</title>
     <link rel="alternate" type="application/atom+xml" href="{url}atom-log" title="Atom feed for {repo|escape}"/>
diff --git a/pylons_app/templates/monoblue_custom/filerevision.tmpl b/pylons_app/templates/monoblue_custom/filerevision.tmpl
--- a/pylons_app/templates/monoblue_custom/filerevision.tmpl
+++ b/pylons_app/templates/monoblue_custom/filerevision.tmpl
@@ -1,3 +1,4 @@
+## -*- coding: utf-8 -*-
 {header}
 <title>{repo|escape}: {file|escape}@{node|short}</title>
     <link rel="alternate" type="application/atom+xml" href="{url}atom-log" title="Atom feed for {repo|escape}"/>
@@ -57,7 +58,9 @@
     <p class="description">{desc|strip|escape|addbreaks|nonempty}</p>
 
     <div class="source">
-    {text%fileline}
+		<%text filter="n">
+			{text%fileline}
+		</%text>    
     </div>
 
 {footer}
diff --git a/pylons_app/templates/monoblue_custom/footer.tmpl b/pylons_app/templates/monoblue_custom/footer.tmpl
--- a/pylons_app/templates/monoblue_custom/footer.tmpl
+++ b/pylons_app/templates/monoblue_custom/footer.tmpl
@@ -1,3 +1,4 @@
+## -*- coding: utf-8 -*-
     <div class="page-footer">
         <p>Mercurial Repository: {repo|escape}</p>
         <ul class="rss-logo">
diff --git a/pylons_app/templates/monoblue_custom/graph.tmpl b/pylons_app/templates/monoblue_custom/graph.tmpl
--- a/pylons_app/templates/monoblue_custom/graph.tmpl
+++ b/pylons_app/templates/monoblue_custom/graph.tmpl
@@ -1,3 +1,4 @@
+## -*- coding: utf-8 -*-
 {header}
     <title>{repo|escape}: graph</title>
     <link rel="alternate" type="application/atom+xml" href="{url}atom-log" title="Atom feed for {repo|escape}"/>
diff --git a/pylons_app/templates/monoblue_custom/header.tmpl b/pylons_app/templates/monoblue_custom/header.tmpl
--- a/pylons_app/templates/monoblue_custom/header.tmpl
+++ b/pylons_app/templates/monoblue_custom/header.tmpl
@@ -1,3 +1,4 @@
+## -*- coding: utf-8 -*-
 <!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" lang="en">
 <head>
diff --git a/pylons_app/templates/monoblue_custom/index.tmpl b/pylons_app/templates/monoblue_custom/index.tmpl
--- a/pylons_app/templates/monoblue_custom/index.tmpl
+++ b/pylons_app/templates/monoblue_custom/index.tmpl
@@ -1,3 +1,4 @@
+## -*- coding: utf-8 -*-
 {header}
     <title>{repo|escape}: Mercurial repositories index</title>
 </head>
diff --git a/pylons_app/templates/monoblue_custom/manifest.tmpl b/pylons_app/templates/monoblue_custom/manifest.tmpl
--- a/pylons_app/templates/monoblue_custom/manifest.tmpl
+++ b/pylons_app/templates/monoblue_custom/manifest.tmpl
@@ -1,3 +1,4 @@
+## -*- coding: utf-8 -*-
 {header}
 <title>{repo|escape}: files</title>
     <link rel="alternate" type="application/atom+xml" href="{url}atom-log" title="Atom feed for {repo|escape}"/>
diff --git a/pylons_app/templates/monoblue_custom/notfound.tmpl b/pylons_app/templates/monoblue_custom/notfound.tmpl
--- a/pylons_app/templates/monoblue_custom/notfound.tmpl
+++ b/pylons_app/templates/monoblue_custom/notfound.tmpl
@@ -1,3 +1,4 @@
+## -*- coding: utf-8 -*-
 {header}
     <title>{repo|escape}: Mercurial repository not found</title>
 </head>
diff --git a/pylons_app/templates/monoblue_custom/search.tmpl b/pylons_app/templates/monoblue_custom/search.tmpl
--- a/pylons_app/templates/monoblue_custom/search.tmpl
+++ b/pylons_app/templates/monoblue_custom/search.tmpl
@@ -1,3 +1,4 @@
+## -*- coding: utf-8 -*-
 {header}
     <title>{repo|escape}: Search</title>
     <link rel="alternate" type="application/atom+xml" href="{url}atom-log" title="Atom feed for {repo|escape}"/>
diff --git a/pylons_app/templates/monoblue_custom/shortlog.tmpl b/pylons_app/templates/monoblue_custom/shortlog.tmpl
--- a/pylons_app/templates/monoblue_custom/shortlog.tmpl
+++ b/pylons_app/templates/monoblue_custom/shortlog.tmpl
@@ -1,3 +1,4 @@
+## -*- coding: utf-8 -*-
 {header}
     <title>{repo|escape}: shortlog</title>
     <link rel="alternate" type="application/atom+xml" href="{url}atom-log" title="Atom feed for {repo|escape}"/>
diff --git a/pylons_app/templates/monoblue_custom/summary.tmpl b/pylons_app/templates/monoblue_custom/summary.tmpl
--- a/pylons_app/templates/monoblue_custom/summary.tmpl
+++ b/pylons_app/templates/monoblue_custom/summary.tmpl
@@ -1,3 +1,4 @@
+## -*- coding: utf-8 -*-
 {header}
     <title>{repo|escape}: Summary</title>
     <link rel="alternate" type="application/atom+xml" href="{url}atom-log" title="Atom feed for {repo|escape}"/>
diff --git a/pylons_app/templates/monoblue_custom/tags.tmpl b/pylons_app/templates/monoblue_custom/tags.tmpl
--- a/pylons_app/templates/monoblue_custom/tags.tmpl
+++ b/pylons_app/templates/monoblue_custom/tags.tmpl
@@ -1,3 +1,4 @@
+## -*- coding: utf-8 -*-
 {header}
     <title>{repo|escape}: Tags</title>
     <link rel="alternate" type="application/atom+xml" href="{url}atom-log" title="Atom feed for {repo|escape}"/>
diff --git a/pylons_app/templates/monoblue_plain/changelog.tmpl b/pylons_app/templates/monoblue_plain/changelog.tmpl
--- a/pylons_app/templates/monoblue_plain/changelog.tmpl
+++ b/pylons_app/templates/monoblue_plain/changelog.tmpl
@@ -1,3 +1,4 @@
+## -*- coding: utf-8 -*-
 {header}
 <div id="container">
     <div class="page-header">
diff --git a/pylons_app/templates/monoblue_plain/changelogentry.tmpl b/pylons_app/templates/monoblue_plain/changelogentry.tmpl
--- a/pylons_app/templates/monoblue_plain/changelogentry.tmpl
+++ b/pylons_app/templates/monoblue_plain/changelogentry.tmpl
@@ -1,3 +1,4 @@
+## -*- coding: utf-8 -*-
 <h3 class="changelog"><a class="title" href="{url}rev/{node|short}{sessionvars%urlparameter}">{desc|strip|firstline|escape}<span class="logtags"> {inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}</span></a></h3>
     <h4>{date|age} ago, by {author|obfuscate} [{date|rfc822date}] rev {rev}</h4>
     <p>{desc|strip|escape|addbreaks}</p>
diff --git a/pylons_app/templates/monoblue_plain/changeset.tmpl b/pylons_app/templates/monoblue_plain/changeset.tmpl
--- a/pylons_app/templates/monoblue_plain/changeset.tmpl
+++ b/pylons_app/templates/monoblue_plain/changeset.tmpl
@@ -1,3 +1,4 @@
+## -*- coding: utf-8 -*-
 {header}
 <div id="container">
     <div class="page-header">
diff --git a/pylons_app/templates/monoblue_plain/error.tmpl b/pylons_app/templates/monoblue_plain/error.tmpl
--- a/pylons_app/templates/monoblue_plain/error.tmpl
+++ b/pylons_app/templates/monoblue_plain/error.tmpl
@@ -1,3 +1,4 @@
+## -*- coding: utf-8 -*-
 {header}
     <title>{repo|escape}: Error</title>
     <link rel="alternate" type="application/atom+xml" href="{url}atom-log" title="Atom feed for {repo|escape}"/>
diff --git a/pylons_app/templates/monoblue_plain/fileannotate.tmpl b/pylons_app/templates/monoblue_plain/fileannotate.tmpl
--- a/pylons_app/templates/monoblue_plain/fileannotate.tmpl
+++ b/pylons_app/templates/monoblue_plain/fileannotate.tmpl
@@ -1,3 +1,4 @@
+## -*- coding: utf-8 -*-
 {header}
 <div id="container">
     <div class="page-header">
diff --git a/pylons_app/templates/monoblue_plain/filediff.tmpl b/pylons_app/templates/monoblue_plain/filediff.tmpl
--- a/pylons_app/templates/monoblue_plain/filediff.tmpl
+++ b/pylons_app/templates/monoblue_plain/filediff.tmpl
@@ -1,3 +1,4 @@
+## -*- coding: utf-8 -*-
 {header}
 <div id="container">
     <div class="page-header">
diff --git a/pylons_app/templates/monoblue_plain/filelog.tmpl b/pylons_app/templates/monoblue_plain/filelog.tmpl
--- a/pylons_app/templates/monoblue_plain/filelog.tmpl
+++ b/pylons_app/templates/monoblue_plain/filelog.tmpl
@@ -1,3 +1,4 @@
+## -*- coding: utf-8 -*-
 {header}
 <div id="container">
     <div class="page-header">
diff --git a/pylons_app/templates/monoblue_plain/filerevision.tmpl b/pylons_app/templates/monoblue_plain/filerevision.tmpl
--- a/pylons_app/templates/monoblue_plain/filerevision.tmpl
+++ b/pylons_app/templates/monoblue_plain/filerevision.tmpl
@@ -1,3 +1,4 @@
+## -*- coding: utf-8 -*-
 {header}
 <div id="container">
     <div class="page-header">
diff --git a/pylons_app/templates/monoblue_plain/footer.tmpl b/pylons_app/templates/monoblue_plain/footer.tmpl
--- a/pylons_app/templates/monoblue_plain/footer.tmpl
+++ b/pylons_app/templates/monoblue_plain/footer.tmpl
@@ -1,3 +1,4 @@
+## -*- coding: utf-8 -*-
     <div class="page-footer">
         <p>
             Mercurial Repository: {repo|escape}
diff --git a/pylons_app/templates/monoblue_plain/graph.tmpl b/pylons_app/templates/monoblue_plain/graph.tmpl
--- a/pylons_app/templates/monoblue_plain/graph.tmpl
+++ b/pylons_app/templates/monoblue_plain/graph.tmpl
@@ -1,3 +1,4 @@
+## -*- coding: utf-8 -*-
 {header}
 <!--[if IE]><script type="text/javascript" src="{staticurl}excanvas.js"></script><![endif]-->
 <div id="container">
diff --git a/pylons_app/templates/monoblue_plain/header.tmpl b/pylons_app/templates/monoblue_plain/header.tmpl
--- a/pylons_app/templates/monoblue_plain/header.tmpl
+++ b/pylons_app/templates/monoblue_plain/header.tmpl
@@ -1,1 +1,1 @@
-
+## -*- coding: utf-8 -*-
diff --git a/pylons_app/templates/monoblue_plain/index.tmpl b/pylons_app/templates/monoblue_plain/index.tmpl
--- a/pylons_app/templates/monoblue_plain/index.tmpl
+++ b/pylons_app/templates/monoblue_plain/index.tmpl
@@ -1,3 +1,4 @@
+## -*- coding: utf-8 -*-
 {header}
 <div id="container">
     <div class="page-header">
diff --git a/pylons_app/templates/monoblue_plain/manifest.tmpl b/pylons_app/templates/monoblue_plain/manifest.tmpl
--- a/pylons_app/templates/monoblue_plain/manifest.tmpl
+++ b/pylons_app/templates/monoblue_plain/manifest.tmpl
@@ -1,3 +1,4 @@
+## -*- coding: utf-8 -*-
 {header}
 <div id="container">
     <div class="page-header">
diff --git a/pylons_app/templates/monoblue_plain/notfound.tmpl b/pylons_app/templates/monoblue_plain/notfound.tmpl
--- a/pylons_app/templates/monoblue_plain/notfound.tmpl
+++ b/pylons_app/templates/monoblue_plain/notfound.tmpl
@@ -1,3 +1,4 @@
+## -*- coding: utf-8 -*-
 {header}
     <title>{repo|escape}: Mercurial repository not found</title>
     <link rel="alternate" type="application/atom+xml" href="{url}atom-log" title="Atom feed for {repo|escape}"/>
diff --git a/pylons_app/templates/monoblue_plain/search.tmpl b/pylons_app/templates/monoblue_plain/search.tmpl
--- a/pylons_app/templates/monoblue_plain/search.tmpl
+++ b/pylons_app/templates/monoblue_plain/search.tmpl
@@ -1,3 +1,4 @@
+## -*- coding: utf-8 -*-
 {header}
     <title>{repo|escape}: Search</title>
     <link rel="alternate" type="application/atom+xml" href="{url}atom-log" title="Atom feed for {repo|escape}"/>
diff --git a/pylons_app/templates/monoblue_plain/shortlog.tmpl b/pylons_app/templates/monoblue_plain/shortlog.tmpl
--- a/pylons_app/templates/monoblue_plain/shortlog.tmpl
+++ b/pylons_app/templates/monoblue_plain/shortlog.tmpl
@@ -1,3 +1,4 @@
+## -*- coding: utf-8 -*-
 {header}
 <div id="container">
     <div class="page-header">
diff --git a/pylons_app/templates/monoblue_plain/summary.tmpl b/pylons_app/templates/monoblue_plain/summary.tmpl
--- a/pylons_app/templates/monoblue_plain/summary.tmpl
+++ b/pylons_app/templates/monoblue_plain/summary.tmpl
@@ -1,3 +1,4 @@
+## -*- coding: utf-8 -*-
 {header}
 <div id="container">
     <div class="page-header">
diff --git a/pylons_app/templates/monoblue_plain/tags.tmpl b/pylons_app/templates/monoblue_plain/tags.tmpl
--- a/pylons_app/templates/monoblue_plain/tags.tmpl
+++ b/pylons_app/templates/monoblue_plain/tags.tmpl
@@ -1,3 +1,4 @@
+## -*- coding: utf-8 -*-
 {header}
 <div id="container">
     <div class="page-header">