##// END OF EJS Templates
jro_apps » redmine
RSS
Switch order of current and previous revisions in side-by-side diff (#1903)....
Jean-Philippe Lang -
r1893:8cb75be0dbd7
parent child
Show More
Side by Side Unified
Context file:
r1893:8cb75be0dbd7 Loading diff...:
Show file before | Show file after | Hide comments
@@ -54,8 +54,8 module Redmine
54 @file_name = $2
54 @file_name = $2
55 return false
55 return false
56 elsif line =~ /^@@ (\+|\-)(\d+)(,\d+)? (\+|\-)(\d+)(,\d+)? @@/
56 elsif line =~ /^@@ (\+|\-)(\d+)(,\d+)? (\+|\-)(\d+)(,\d+)? @@/
57 @line_num_l = $5.to_i
57 @line_num_l = $2.to_i
58 @line_num_r = $2.to_i
58 @line_num_r = $5.to_i
59 @parsing = true
59 @parsing = true
60 end
60 end
61 else
61 else
@@ -63,8 +63,8 module Redmine
63 @parsing = false
63 @parsing = false
64 return false
64 return false
65 elsif line =~ /^@@ (\+|\-)(\d+)(,\d+)? (\+|\-)(\d+)(,\d+)? @@/
65 elsif line =~ /^@@ (\+|\-)(\d+)(,\d+)? (\+|\-)(\d+)(,\d+)? @@/
66 @line_num_l = $5.to_i
66 @line_num_l = $2.to_i
67 @line_num_r = $2.to_i
67 @line_num_r = $5.to_i
68 else
68 else
69 @nb_line += 1 if parse_line(line, @type)
69 @nb_line += 1 if parse_line(line, @type)
70 end
70 end
@@ -116,18 +116,18 module Redmine
116 if line[0, 1] == "+"
116 if line[0, 1] == "+"
117 diff = sbs? type, 'add'
117 diff = sbs? type, 'add'
118 @before = 'add'
118 @before = 'add'
119 diff.line_left = escapeHTML line[1..-1]
119 diff.line_right = escapeHTML line[1..-1]
120 diff.nb_line_left = @line_num_l
120 diff.nb_line_right = @line_num_r
121 diff.type_diff_left = 'diff_in'
121 diff.type_diff_right = 'diff_in'
122 @line_num_l += 1
122 @line_num_r += 1
123 true
123 true
124 elsif line[0, 1] == "-"
124 elsif line[0, 1] == "-"
125 diff = sbs? type, 'remove'
125 diff = sbs? type, 'remove'
126 @before = 'remove'
126 @before = 'remove'
127 diff.line_right = escapeHTML line[1..-1]
127 diff.line_left = escapeHTML line[1..-1]
128 diff.nb_line_right = @line_num_r
128 diff.nb_line_left = @line_num_l
129 diff.type_diff_right = 'diff_out'
129 diff.type_diff_left = 'diff_out'
130 @line_num_r += 1
130 @line_num_l += 1
131 true
131 true
132 elsif line[0, 1] =~ /\s/
132 elsif line[0, 1] =~ /\s/
133 @before = 'same'
133 @before = 'same'
General Comments 0
You need to be logged in to leave comments. Login now