Skip to content

O
OHR Support
Commit 8cb75be0 authored by Jean-Philippe Lang's avatar Jean-Philippe Lang
Browse files
Options

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

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1895 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent b09a1897
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 12 deletions
lib/redmine/unified_diff.rb
View file @ 8cb75be0
......@@ -54,8 +54,8 @@ module Redmine
@file_name = $2
return false
elsif line =~ /^@@ (\+|\-)(\d+)(,\d+)? (\+|\-)(\d+)(,\d+)? @@/
@line_num_l = $5.to_i
@line_num_r = $2.to_i
@line_num_l = $2.to_i
@line_num_r = $5.to_i
@parsing = true
end
else
......@@ -63,8 +63,8 @@ module Redmine
@parsing = false
return false
elsif line =~ /^@@ (\+|\-)(\d+)(,\d+)? (\+|\-)(\d+)(,\d+)? @@/
@line_num_l = $5.to_i
@line_num_r = $2.to_i
@line_num_l = $2.to_i
@line_num_r = $5.to_i
else
@nb_line += 1 if parse_line(line, @type)
end
......@@ -116,18 +116,18 @@ module Redmine
if line[0, 1] == "+"
diff = sbs? type, 'add'
@before = 'add'
diff.line_left = escapeHTML line[1..-1]
diff.nb_line_left = @line_num_l
diff.type_diff_left = 'diff_in'
@line_num_l += 1
diff.line_right = escapeHTML line[1..-1]
diff.nb_line_right = @line_num_r
diff.type_diff_right = 'diff_in'
@line_num_r += 1
true
elsif line[0, 1] == "-"
diff = sbs? type, 'remove'
@before = 'remove'
diff.line_right = escapeHTML line[1..-1]
diff.nb_line_right = @line_num_r
diff.type_diff_right = 'diff_out'
@line_num_r += 1
diff.line_left = escapeHTML line[1..-1]
diff.nb_line_left = @line_num_l
diff.type_diff_left = 'diff_out'
@line_num_l += 1
true
elsif line[0, 1] =~ /\s/
@before = 'same'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment