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