Chris@441
|
1 # Redmine - project management software
|
Chris@1494
|
2 # Copyright (C) 2006-2014 Jean-Philippe Lang
|
Chris@0
|
3 #
|
Chris@0
|
4 # This program is free software; you can redistribute it and/or
|
Chris@0
|
5 # modify it under the terms of the GNU General Public License
|
Chris@0
|
6 # as published by the Free Software Foundation; either version 2
|
Chris@0
|
7 # of the License, or (at your option) any later version.
|
Chris@909
|
8 #
|
Chris@0
|
9 # This program is distributed in the hope that it will be useful,
|
Chris@0
|
10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
|
Chris@0
|
11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
Chris@0
|
12 # GNU General Public License for more details.
|
Chris@909
|
13 #
|
Chris@0
|
14 # You should have received a copy of the GNU General Public License
|
Chris@0
|
15 # along with this program; if not, write to the Free Software
|
Chris@0
|
16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
Chris@0
|
17
|
Chris@0
|
18 module Redmine
|
Chris@0
|
19 # Class used to parse unified diffs
|
Chris@441
|
20 class UnifiedDiff < Array
|
Chris@1115
|
21 attr_reader :diff_type, :diff_style
|
Chris@909
|
22
|
Chris@0
|
23 def initialize(diff, options={})
|
Chris@1115
|
24 options.assert_valid_keys(:type, :style, :max_lines)
|
Chris@0
|
25 diff = diff.split("\n") if diff.is_a?(String)
|
Chris@441
|
26 @diff_type = options[:type] || 'inline'
|
Chris@1115
|
27 @diff_style = options[:style]
|
Chris@0
|
28 lines = 0
|
Chris@0
|
29 @truncated = false
|
Chris@1115
|
30 diff_table = DiffTable.new(diff_type, diff_style)
|
Chris@1464
|
31 diff.each do |line_raw|
|
Chris@1464
|
32 line = Redmine::CodesetUtil.to_utf8_by_setting(line_raw)
|
Chris@1464
|
33 unless diff_table.add_line(line)
|
Chris@245
|
34 self << diff_table if diff_table.length > 0
|
Chris@1115
|
35 diff_table = DiffTable.new(diff_type, diff_style)
|
Chris@0
|
36 end
|
Chris@0
|
37 lines += 1
|
Chris@0
|
38 if options[:max_lines] && lines > options[:max_lines]
|
Chris@0
|
39 @truncated = true
|
Chris@0
|
40 break
|
Chris@0
|
41 end
|
Chris@0
|
42 end
|
Chris@0
|
43 self << diff_table unless diff_table.empty?
|
Chris@0
|
44 self
|
Chris@0
|
45 end
|
Chris@245
|
46
|
Chris@0
|
47 def truncated?; @truncated; end
|
Chris@0
|
48 end
|
Chris@0
|
49
|
Chris@0
|
50 # Class that represents a file diff
|
Chris@909
|
51 class DiffTable < Array
|
Chris@441
|
52 attr_reader :file_name
|
Chris@0
|
53
|
Chris@0
|
54 # Initialize with a Diff file and the type of Diff View
|
Chris@0
|
55 # The type view must be inline or sbs (side_by_side)
|
Chris@1115
|
56 def initialize(type="inline", style=nil)
|
Chris@0
|
57 @parsing = false
|
Chris@441
|
58 @added = 0
|
Chris@441
|
59 @removed = 0
|
Chris@0
|
60 @type = type
|
Chris@1115
|
61 @style = style
|
Chris@1115
|
62 @file_name = nil
|
Chris@1115
|
63 @git_diff = false
|
Chris@0
|
64 end
|
Chris@0
|
65
|
Chris@0
|
66 # Function for add a line of this Diff
|
Chris@0
|
67 # Returns false when the diff ends
|
Chris@0
|
68 def add_line(line)
|
Chris@0
|
69 unless @parsing
|
Chris@0
|
70 if line =~ /^(---|\+\+\+) (.*)$/
|
Chris@1115
|
71 self.file_name = $2
|
Chris@0
|
72 elsif line =~ /^@@ (\+|\-)(\d+)(,\d+)? (\+|\-)(\d+)(,\d+)? @@/
|
Chris@0
|
73 @line_num_l = $2.to_i
|
Chris@0
|
74 @line_num_r = $5.to_i
|
Chris@0
|
75 @parsing = true
|
Chris@0
|
76 end
|
Chris@0
|
77 else
|
Chris@1464
|
78 if line =~ %r{^[^\+\-\s@\\]}
|
Chris@0
|
79 @parsing = false
|
Chris@0
|
80 return false
|
Chris@0
|
81 elsif line =~ /^@@ (\+|\-)(\d+)(,\d+)? (\+|\-)(\d+)(,\d+)? @@/
|
Chris@0
|
82 @line_num_l = $2.to_i
|
Chris@0
|
83 @line_num_r = $5.to_i
|
Chris@0
|
84 else
|
Chris@909
|
85 parse_line(line, @type)
|
Chris@0
|
86 end
|
Chris@0
|
87 end
|
Chris@0
|
88 return true
|
Chris@0
|
89 end
|
Chris@909
|
90
|
Chris@441
|
91 def each_line
|
Chris@441
|
92 prev_line_left, prev_line_right = nil, nil
|
Chris@441
|
93 each do |line|
|
Chris@441
|
94 spacing = prev_line_left && prev_line_right && (line.nb_line_left != prev_line_left+1) && (line.nb_line_right != prev_line_right+1)
|
Chris@441
|
95 yield spacing, line
|
Chris@441
|
96 prev_line_left = line.nb_line_left.to_i if line.nb_line_left.to_i > 0
|
Chris@441
|
97 prev_line_right = line.nb_line_right.to_i if line.nb_line_right.to_i > 0
|
Chris@441
|
98 end
|
Chris@441
|
99 end
|
Chris@0
|
100
|
Chris@0
|
101 def inspect
|
Chris@0
|
102 puts '### DIFF TABLE ###'
|
Chris@0
|
103 puts "file : #{file_name}"
|
Chris@0
|
104 self.each do |d|
|
Chris@0
|
105 d.inspect
|
Chris@0
|
106 end
|
Chris@0
|
107 end
|
Chris@0
|
108
|
Chris@441
|
109 private
|
Chris@0
|
110
|
Chris@1115
|
111 def file_name=(arg)
|
Chris@1115
|
112 both_git_diff = false
|
Chris@1115
|
113 if file_name.nil?
|
Chris@1115
|
114 @git_diff = true if arg =~ %r{^(a/|/dev/null)}
|
Chris@1115
|
115 else
|
Chris@1115
|
116 both_git_diff = (@git_diff && arg =~ %r{^(b/|/dev/null)})
|
Chris@1115
|
117 end
|
Chris@1115
|
118 if both_git_diff
|
Chris@1115
|
119 if file_name && arg == "/dev/null"
|
Chris@1115
|
120 # keep the original file name
|
Chris@1115
|
121 @file_name = file_name.sub(%r{^a/}, '')
|
Chris@1115
|
122 else
|
Chris@1115
|
123 # remove leading b/
|
Chris@1115
|
124 @file_name = arg.sub(%r{^b/}, '')
|
Chris@1115
|
125 end
|
Chris@1115
|
126 elsif @style == "Subversion"
|
Chris@1115
|
127 # removing trailing "(revision nn)"
|
Chris@1115
|
128 @file_name = arg.sub(%r{\t+\(.*\)$}, '')
|
Chris@1115
|
129 else
|
Chris@1115
|
130 @file_name = arg
|
Chris@1115
|
131 end
|
Chris@1115
|
132 end
|
Chris@1115
|
133
|
Chris@441
|
134 def diff_for_added_line
|
Chris@441
|
135 if @type == 'sbs' && @removed > 0 && @added < @removed
|
Chris@441
|
136 self[-(@removed - @added)]
|
Chris@441
|
137 else
|
Chris@441
|
138 diff = Diff.new
|
Chris@441
|
139 self << diff
|
Chris@441
|
140 diff
|
Chris@441
|
141 end
|
Chris@441
|
142 end
|
Chris@0
|
143
|
Chris@0
|
144 def parse_line(line, type="inline")
|
Chris@0
|
145 if line[0, 1] == "+"
|
Chris@441
|
146 diff = diff_for_added_line
|
Chris@929
|
147 diff.line_right = line[1..-1]
|
Chris@0
|
148 diff.nb_line_right = @line_num_r
|
Chris@0
|
149 diff.type_diff_right = 'diff_in'
|
Chris@0
|
150 @line_num_r += 1
|
Chris@441
|
151 @added += 1
|
Chris@0
|
152 true
|
Chris@0
|
153 elsif line[0, 1] == "-"
|
Chris@441
|
154 diff = Diff.new
|
Chris@929
|
155 diff.line_left = line[1..-1]
|
Chris@0
|
156 diff.nb_line_left = @line_num_l
|
Chris@0
|
157 diff.type_diff_left = 'diff_out'
|
Chris@441
|
158 self << diff
|
Chris@0
|
159 @line_num_l += 1
|
Chris@441
|
160 @removed += 1
|
Chris@0
|
161 true
|
Chris@441
|
162 else
|
Chris@441
|
163 write_offsets
|
Chris@441
|
164 if line[0, 1] =~ /\s/
|
Chris@441
|
165 diff = Diff.new
|
Chris@929
|
166 diff.line_right = line[1..-1]
|
Chris@441
|
167 diff.nb_line_right = @line_num_r
|
Chris@929
|
168 diff.line_left = line[1..-1]
|
Chris@441
|
169 diff.nb_line_left = @line_num_l
|
Chris@441
|
170 self << diff
|
Chris@441
|
171 @line_num_l += 1
|
Chris@441
|
172 @line_num_r += 1
|
Chris@441
|
173 true
|
Chris@441
|
174 elsif line[0, 1] = "\\"
|
Chris@0
|
175 true
|
Chris@0
|
176 else
|
Chris@0
|
177 false
|
Chris@0
|
178 end
|
Chris@0
|
179 end
|
Chris@0
|
180 end
|
Chris@909
|
181
|
Chris@441
|
182 def write_offsets
|
Chris@441
|
183 if @added > 0 && @added == @removed
|
Chris@441
|
184 @added.times do |i|
|
Chris@441
|
185 line = self[-(1 + i)]
|
Chris@441
|
186 removed = (@type == 'sbs') ? line : self[-(1 + @added + i)]
|
Chris@441
|
187 offsets = offsets(removed.line_left, line.line_right)
|
Chris@441
|
188 removed.offsets = line.offsets = offsets
|
Chris@441
|
189 end
|
Chris@441
|
190 end
|
Chris@441
|
191 @added = 0
|
Chris@441
|
192 @removed = 0
|
Chris@441
|
193 end
|
Chris@909
|
194
|
Chris@441
|
195 def offsets(line_left, line_right)
|
Chris@441
|
196 if line_left.present? && line_right.present? && line_left != line_right
|
Chris@441
|
197 max = [line_left.size, line_right.size].min
|
Chris@441
|
198 starting = 0
|
Chris@441
|
199 while starting < max && line_left[starting] == line_right[starting]
|
Chris@441
|
200 starting += 1
|
Chris@441
|
201 end
|
Chris@1464
|
202 if (! "".respond_to?(:force_encoding)) && starting < line_left.size
|
Chris@1464
|
203 while line_left[starting].ord.between?(128, 191) && starting > 0
|
Chris@1464
|
204 starting -= 1
|
Chris@1464
|
205 end
|
Chris@1464
|
206 end
|
Chris@441
|
207 ending = -1
|
Chris@1464
|
208 while ending >= -(max - starting) && (line_left[ending] == line_right[ending])
|
Chris@441
|
209 ending -= 1
|
Chris@441
|
210 end
|
Chris@1464
|
211 if (! "".respond_to?(:force_encoding)) && ending > (-1 * line_left.size)
|
Chris@1464
|
212 while line_left[ending].ord.between?(128, 255) && ending < -1
|
Chris@1464
|
213 if line_left[ending].ord.between?(128, 191)
|
Chris@1464
|
214 if line_left[ending + 1].ord.between?(128, 191)
|
Chris@1464
|
215 ending += 1
|
Chris@1464
|
216 else
|
Chris@1464
|
217 break
|
Chris@1464
|
218 end
|
Chris@1464
|
219 else
|
Chris@1464
|
220 ending += 1
|
Chris@1464
|
221 end
|
Chris@1464
|
222 end
|
Chris@1464
|
223 end
|
Chris@441
|
224 unless starting == 0 && ending == -1
|
Chris@441
|
225 [starting, ending]
|
Chris@441
|
226 end
|
Chris@441
|
227 end
|
Chris@441
|
228 end
|
Chris@441
|
229 end
|
Chris@0
|
230
|
Chris@0
|
231 # A line of diff
|
Chris@909
|
232 class Diff
|
Chris@0
|
233 attr_accessor :nb_line_left
|
Chris@0
|
234 attr_accessor :line_left
|
Chris@0
|
235 attr_accessor :nb_line_right
|
Chris@0
|
236 attr_accessor :line_right
|
Chris@0
|
237 attr_accessor :type_diff_right
|
Chris@0
|
238 attr_accessor :type_diff_left
|
Chris@441
|
239 attr_accessor :offsets
|
Chris@909
|
240
|
Chris@0
|
241 def initialize()
|
Chris@0
|
242 self.nb_line_left = ''
|
Chris@0
|
243 self.nb_line_right = ''
|
Chris@0
|
244 self.line_left = ''
|
Chris@0
|
245 self.line_right = ''
|
Chris@0
|
246 self.type_diff_right = ''
|
Chris@0
|
247 self.type_diff_left = ''
|
Chris@0
|
248 end
|
Chris@909
|
249
|
Chris@441
|
250 def type_diff
|
Chris@441
|
251 type_diff_right == 'diff_in' ? type_diff_right : type_diff_left
|
Chris@441
|
252 end
|
Chris@909
|
253
|
Chris@441
|
254 def line
|
Chris@441
|
255 type_diff_right == 'diff_in' ? line_right : line_left
|
Chris@441
|
256 end
|
Chris@909
|
257
|
Chris@441
|
258 def html_line_left
|
Chris@929
|
259 line_to_html(line_left, offsets)
|
Chris@441
|
260 end
|
Chris@909
|
261
|
Chris@441
|
262 def html_line_right
|
Chris@929
|
263 line_to_html(line_right, offsets)
|
Chris@441
|
264 end
|
Chris@909
|
265
|
Chris@441
|
266 def html_line
|
Chris@929
|
267 line_to_html(line, offsets)
|
Chris@441
|
268 end
|
Chris@0
|
269
|
Chris@0
|
270 def inspect
|
Chris@0
|
271 puts '### Start Line Diff ###'
|
Chris@0
|
272 puts self.nb_line_left
|
Chris@0
|
273 puts self.line_left
|
Chris@0
|
274 puts self.nb_line_right
|
Chris@0
|
275 puts self.line_right
|
Chris@0
|
276 end
|
Chris@929
|
277
|
Chris@929
|
278 private
|
Chris@929
|
279
|
Chris@929
|
280 def line_to_html(line, offsets)
|
Chris@1464
|
281 html = line_to_html_raw(line, offsets)
|
Chris@1464
|
282 html.force_encoding('UTF-8') if html.respond_to?(:force_encoding)
|
Chris@1464
|
283 html
|
Chris@1464
|
284 end
|
Chris@1464
|
285
|
Chris@1464
|
286 def line_to_html_raw(line, offsets)
|
Chris@929
|
287 if offsets
|
Chris@929
|
288 s = ''
|
Chris@929
|
289 unless offsets.first == 0
|
Chris@929
|
290 s << CGI.escapeHTML(line[0..offsets.first-1])
|
Chris@929
|
291 end
|
Chris@929
|
292 s << '<span>' + CGI.escapeHTML(line[offsets.first..offsets.last]) + '</span>'
|
Chris@929
|
293 unless offsets.last == -1
|
Chris@929
|
294 s << CGI.escapeHTML(line[offsets.last+1..-1])
|
Chris@929
|
295 end
|
Chris@929
|
296 s
|
Chris@929
|
297 else
|
Chris@929
|
298 CGI.escapeHTML(line)
|
Chris@929
|
299 end
|
Chris@929
|
300 end
|
Chris@0
|
301 end
|
Chris@0
|
302 end
|