3
# IVLE - Informatics Virtual Learning Environment
4
# Copyright (C) 2007-2008 The University of Melbourne
6
# This program is free software; you can redistribute it and/or modify
7
# it under the terms of the GNU General Public License as published by
8
# the Free Software Foundation; either version 2 of the License, or
9
# (at your option) any later version.
11
# This program is distributed in the hope that it will be useful,
12
# but WITHOUT ANY WARRANTY; without even the implied warranty of
13
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14
# GNU General Public License for more details.
16
# You should have received a copy of the GNU General Public License
17
# along with this program; if not, write to the Free Software
18
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
24
# A CGI script for generating a diff report page in HTML. It is intended to be
25
# run from the trampoline by the Diff application.
27
from common import cgirequest
34
def htmlfy_diff(difftext):
35
"""Adds HTML markup to a udiff string"""
36
output = cgi.escape(difftext)
38
r'^([\+\-]{3})\s(\S+)\s\((.+)\)$':
39
r'<span class="diff-files">\1 \2 <em>(\3)</em></span>',
41
r'<span class="diff-range">@@ \1 @@</span>',
43
r'<span class="diff-add">+\1</span>',
45
r'<span class="diff-sub">-\1</span>',
47
r'<span class="diff-special">\\\1</span>'
51
output = re.compile(match, re.MULTILINE).sub(subs[match], output)
55
# Use a CGIRequest object to make the CGI environment look like the normal
56
# IVLE handler environment.
58
req = cgirequest.CGIRequest()
59
req.install_error_handler()
60
req.content_type = "text/html"
62
# Beginning of the page
63
req.write('<div id="ivle_padding">\n')
64
req.write('<h1>Diff</h1>\n')
67
revs = [pysvn.Revision(x) for x in [pysvn.opt_revision_kind.base,
68
pysvn.opt_revision_kind.working]]
69
# Override revisions from query string
70
fields = req.get_fieldstorage()
71
field_r = fields.getlist("r")
72
for ri in range(len(field_r)):
73
r = common.svn.revision_from_string(field_r[ri])
77
# Attempt to get the diff for these revisons
79
svnclient = pysvn.Client()
81
diff_text = diff( '/tmp/svndiff',
82
os.path.join('/home', req.path),
87
# Split up the udiff into individual files
88
diff_matcher = re.compile(
89
r'^Index: (.*)\n\=+\n((?:[^I].*\n)*)',re.MULTILINE
91
split_diff = diff_matcher.findall(diff_text)
94
for filediff in split_diff:
95
filename = filediff[0]
96
diffbody = htmlfy_diff(filediff[1])
97
req.write('<p><b>File:</b> %s</p>\n'
98
% cgi.escape(filename))
99
req.write('<pre class="diff">%s</pre>\n' % diffbody)
101
except pysvn._pysvn_2_5.ClientError, e:
102
req.write('<p><b>Error:</b></p>\n')
103
req.write('<pre class="diff">%s</pre>\n' % cgi.escape(str(e)))
105
req.write('</div>\n')