aboutsummaryrefslogtreecommitdiffstats
path: root/bn_django
diff options
context:
space:
mode:
Diffstat (limited to 'bn_django')
-rw-r--r--bn_django/git_browse/templates/git_browse/commit.html13
-rw-r--r--bn_django/git_browse/views.py6
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 }}
+<link rel="STYLESHEET" type="text/css" href="/static/style/pygments-default.css" />
+{% endblock %}
{% block gitbrowse %} {% if commit %}
<h3>Commit sha1 hash</h3>
@@ -21,9 +24,13 @@
{{ commit.committer }}<br />
<h3>Committer Date</h3>
{{ commit.committer_date }}<br />
- {% if commit.rawdiff %}
- <pre class="large">{{ commit.rawdiff|escape|wordwrap:80 }}</pre>
- {% else %}No diff{% endif %}
+ {% if commit.pretty_diff %}
+ <pre class="large">{{ commit.pretty_diff }}</pre>
+ {% else %}
+ {% if commit.rawdiff %}
+ <pre class="large">{{ commit.rawdiff|escape|wordwrap:80 }}</pre>
+ {% else %}No diff{% endif %}
+ {% endif %}
{% else %}
<h3>No such object: {{ hash }}</h3>
{% 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))