kolan/obsolete.ChilliProject
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Switch order of current and previous revisions in side-by-side diff (#1903).

Browse Source 
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1895 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2008-09-21 18:45:30 +00:00
parent b09a18972d
commit 8cb75be0db
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/redmine/unified_diff.rb
View File

@ -54,8 +54,8 @@ module Redmine
@file_name = $2 @file_name = $2
return false return false
elsif line =~ /^@@ (\+|\-)(\d+)(,\d+)? (\+|\-)(\d+)(,\d+)? @@/ elsif line =~ /^@@ (\+|\-)(\d+)(,\d+)? (\+|\-)(\d+)(,\d+)? @@/
@line_num_l = $5.to_i @line_num_l = $2.to_i
@line_num_r = $2.to_i @line_num_r = $5.to_i
@parsing = true @parsing = true
end end
else else
@ -63,8 +63,8 @@ module Redmine
@parsing = false @parsing = false
return false return false
elsif line =~ /^@@ (\+|\-)(\d+)(,\d+)? (\+|\-)(\d+)(,\d+)? @@/ elsif line =~ /^@@ (\+|\-)(\d+)(,\d+)? (\+|\-)(\d+)(,\d+)? @@/
@line_num_l = $5.to_i @line_num_l = $2.to_i
@line_num_r = $2.to_i @line_num_r = $5.to_i
else else
@nb_line += 1 if parse_line(line, @type) @nb_line += 1 if parse_line(line, @type)
end end
@ -116,18 +116,18 @@ module Redmine
if line[0, 1] == "+" if line[0, 1] == "+"
diff = sbs? type, 'add' diff = sbs? type, 'add'
@before = 'add' @before = 'add'
diff.line_left = escapeHTML line[1..-1] diff.line_right = escapeHTML line[1..-1]
diff.nb_line_left = @line_num_l diff.nb_line_right = @line_num_r
diff.type_diff_left = 'diff_in' diff.type_diff_right = 'diff_in'
@line_num_l += 1 @line_num_r += 1
true true
elsif line[0, 1] == "-" elsif line[0, 1] == "-"
diff = sbs? type, 'remove' diff = sbs? type, 'remove'
@before = 'remove' @before = 'remove'
diff.line_right = escapeHTML line[1..-1] diff.line_left = escapeHTML line[1..-1]
diff.nb_line_right = @line_num_r diff.nb_line_left = @line_num_l
diff.type_diff_right = 'diff_out' diff.type_diff_left = 'diff_out'
@line_num_r += 1 @line_num_l += 1
true true
elsif line[0, 1] =~ /\s/ elsif line[0, 1] =~ /\s/
@before = 'same' @before = 'same'