1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
|
# encoding: utf-8
#--
# Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies)
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#++
module DiffHelper
# Takes a unified diff as input and renders it as html
def render_diff(udiff, display_mode = "inline")
return if udiff.blank?
udiff = force_utf8(udiff)
if sidebyside_diff?
render_sidebyside_diff(udiff)
else
render_inline_diff(udiff)
end
end
def sidebyside_diff?
@diffmode == "sidebyside"
end
def render_diffs(diffs)
if sidebyside_diff?
diffs.map do |file|
out = %Q{<a name="#{h(force_utf8(file.a_path))}"></a>}
out << "<h4>"
out << link_to(h(file.a_path), file_path(@repository, file.a_path, @commit.id))
out << "</h4>"
out << force_utf8(render_diff(file.diff))
out
end.join("\n")
else
'<div class="clear"></div><div id="commit-diff-container">' +
render_inline_diffs_controls("commits") +
render_inline_diffs_with_stats(diffs, :open) + "</div>"
end
end
# Supply a block that fetches an array of comments with the file path as parameter
def render_inline_diffs_with_stats(file_diffs, state = :closed)
file_diffs.map do |file|
diff_renderer = Diff::Display::Unified.new(file.diff)
out = %Q{<div class="file-diff" data-diff-path="#{file.a_path}">}
out << %Q{<div class="header round-top-10 #{state == :closed ? 'closed' : 'open'}">}
out << %Q{<span class="title"><span class="icon"></span>#{h(file.a_path)}</span>}
out << %Q{<div class="diff-stats">}
out << render_compact_diff_stats(diff_renderer.stats)
out << "</div></div>"
out << %Q{<div class="diff-hunks" #{state == :closed ? 'style="display:none"' : ''}>}
if file.diff[0..256].include?("\000")
out << "Binary files differ"
else
diff_options = {}
diff_options[:comments] = if block_given?
yield(file)
end
out << force_utf8(render_inline_diff(file.diff, diff_renderer, diff_options))
end
out << "</div></div>"
out
end.join("\n")
end
def render_inline_diffs_controls(cookie_prefix)
%Q{<div class="file-diff-controls">
<small>
<a href="#" id="expand-all" gts:cookie-prefix="#{cookie_prefix}">expand all</a> /
<a href="#" id="collapse-all" gts:cookie-prefix="#{cookie_prefix}">collapse all</a>
</small>
</div>}
end
def render_inline_diff(udiff, differ = nil, options = {})
differ ||= Diff::Display::Unified.new(udiff)
out = %Q{<table class="codediff inline">\n}
out << "<thead>\n"
out << %Q{<tr><td class="inline_comments"> </td>}
out << %Q{<td class="line-numbers"></td>}
out << %Q{<td class="line-numbers"></td>}
out << "<td> </td></tr>\n"
out << "</thead>\n"
if comments = options[:comments]
render_callback = Gitorious::Diff::InlineTableCallback.with_comments(comments, self)
out << differ.render(render_callback)
else
out << differ.render(Gitorious::Diff::InlineTableCallback.new)
end
out << "</table>"
out
end
def render_sidebyside_diff(udiff)
differ = Diff::Display::Unified.new(udiff)
out = %Q{<table class="codediff sidebyside">\n}
out << %Q{<colgroup class="left"><col class="lines"/><col class="code"/></colgroup>}
out << %Q{<colgroup class="right"><col class="lines"/><col class="code"/></colgroup>}
out << %Q{<thead><th class="line-numbers"></th><th></th>}
out << %Q{<th class="line-numbers"></th><th></th></thead>}
out << differ.render(Gitorious::Diff::SidebysideTableCallback.new)
out << "</table>"
out
end
def render_diffmode_selector
out = %Q{<ul class="mode_selector">}
out << %Q{<li class="list_header">Diff rendering mode:</li>}
if @diffmode == "sidebyside"
out << %Q{<li><a href="?diffmode=inline">inline</a></li>}
out << %Q{<li class="selected">side by side</li>}
else
out << %Q{<li class="selected">inline</li>}
out << %Q{<li><a href="?diffmode=sidebyside">side by side</a></li>}
end
out << "</ul>"
out
end
def render_diff_stats(stats)
out = %Q{<ul class="diff_stats">\n}
stats.files.each do |filename, adds, deletes, total|
out << %Q{<li><a href="##{h(filename)}">#{h(filename)}</a> #{total} }
out << %Q{<small class="deletions">#{(0...deletes).map{|i| "-" }.join}</small>}
out << %Q{<small class="insertions">#{(0...adds).map{|i| "+" }.join}</small>}
out << %Q{</li>}
end
out << "</ul>\n"
out
end
def render_compact_diff_stats(stats)
%Q{(<span class="additions">#{stats[:additions].to_s}</span> / } +
%Q{<span class="deletions">#{stats[:deletions].to_s}</span>)}
end
end
|
