From c21fcbc9cb3837495549161817f5d02dd9be5d3b Mon Sep 17 00:00:00 2001 From: bnewbold Date: Fri, 1 Jun 2007 02:27:17 -0400 Subject: pygments highlighting for wiki commits --- bn_django/git_wiki/templates/git_wiki/commit.html | 14 +++++++++++--- bn_django/git_wiki/views.py | 6 ++++++ 2 files changed, 17 insertions(+), 3 deletions(-) (limited to 'bn_django') diff --git a/bn_django/git_wiki/templates/git_wiki/commit.html b/bn_django/git_wiki/templates/git_wiki/commit.html index 8497311..82aace4 100644 --- a/bn_django/git_wiki/templates/git_wiki/commit.html +++ b/bn_django/git_wiki/templates/git_wiki/commit.html @@ -1,5 +1,9 @@ {% extends "git_wiki/base.html" %} +{% block stylesheets %}{{ block.super }} + +{% endblock %} + {% block title %}Commit: {{ commit.committer_date}} {% endblock %} {% block gitwiki %} {% if commit %} @@ -23,9 +27,13 @@ {{ commit.committer }}
Committer Date: {{ commit.committer_date }}
- {% if commit.rawdiff %} -
{{ commit.rawdiff }}
- {% else %}No diff{% endif %} + {% if commit.pretty_diff %} +
{{ commit.pretty_diff}}
+ {% else %} + {% if commit.rawdiff %} +
{{ commit.rawdiff }}
+ {% else %}No difference?{% endif %} + {% endif %} {% else %}

No such object: {{ hash }}

{% endif %} {% endblock %} diff --git a/bn_django/git_wiki/views.py b/bn_django/git_wiki/views.py index 5a4efbd..dcd1646 100644 --- a/bn_django/git_wiki/views.py +++ b/bn_django/git_wiki/views.py @@ -224,6 +224,12 @@ def view_commit(request, hash): c = Commit(id=hash) c.update() + from pygments import highlight + from pygments.lexers import DiffLexer + from pygments.formatters import HtmlFormatter + + c.pretty_diff = highlight(c.rawdiff, DiffLexer(), HtmlFormatter()) + return render_to_response('git_wiki/commit.html', dict(heads=heads, tags=tags, commit=c)) -- cgit v1.2.3