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