From 23ffcd2dd06e7193fa7c54aa3f4956922aafdf2a Mon Sep 17 00:00:00 2001 From: bnewbold Date: Fri, 1 Jun 2007 03:53:36 -0400 Subject: diff pygmentation for git_browse --- bn_django/git_browse/templates/git_browse/commit.html | 13 ++++++++++--- bn_django/git_browse/views.py | 6 ++++++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/bn_django/git_browse/templates/git_browse/commit.html b/bn_django/git_browse/templates/git_browse/commit.html index b4ee4a6..b586eb8 100644 --- a/bn_django/git_browse/templates/git_browse/commit.html +++ b/bn_django/git_browse/templates/git_browse/commit.html @@ -1,4 +1,7 @@ {% extends "git_browse/base.html" %} +{% block stylesheets %}{{ block.super }} + +{% endblock %} {% block gitbrowse %} {% if commit %}

Commit sha1 hash

@@ -21,9 +24,13 @@ {{ commit.committer }}

Committer Date

{{ commit.committer_date }}
- {% if commit.rawdiff %} -
{{ commit.rawdiff|escape|wordwrap:80 }}
- {% else %}No diff{% endif %} + {% if commit.pretty_diff %} +
{{ commit.pretty_diff }}
+ {% else %} + {% if commit.rawdiff %} +
{{ commit.rawdiff|escape|wordwrap:80 }}
+ {% else %}No diff{% endif %} + {% endif %} {% else %}

No such object: {{ hash }}

{% endif %} {% endblock %} diff --git a/bn_django/git_browse/views.py b/bn_django/git_browse/views.py index ed653df..2722db2 100644 --- a/bn_django/git_browse/views.py +++ b/bn_django/git_browse/views.py @@ -107,6 +107,12 @@ def view_commit(request, repo, hash): c = Commit(id=hash,repo=therepo) 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_browse/commit.html', dict(object=therepo, heads=heads, tags=tags, commit=c)) -- cgit v1.2.3