From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 21 Sep 2008 18:45:30 +0000 (+0000)
Subject: Switch order of current and previous revisions in side-by-side diff (#1903).
X-Git-Tag: 0.8.0-RC1~198
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=8cb75be0dbd7bd54fba71fc989fb4e1cbeb746af;p=redmine.git

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
---

diff --git a/lib/redmine/unified_diff.rb b/lib/redmine/unified_diff.rb
index aa8994454..36a36cba5 100644
--- a/lib/redmine/unified_diff.rb
+++ b/lib/redmine/unified_diff.rb
@@ -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'