Commit 2ce8b25cf2b28aaac54a5783a7afeff00b57c929
- Date: Fri Jan 11 19:38:28 +0000 2008
- Committer: Johan Sørensen (johan@johansorensen.com)
- Author: Johan Sørensen (johan@johansorensen.com)
- Commit SHA1: 2ce8b25cf2b28aaac54a5783a7afeff00b57c929
- Tree SHA1: ddc7b82167ddf232436785c258b83ca092f51495
elaborate on the silly workaround for diffs
Commit diff
| | |
| 44 | 44 | out = "<table class=\"codediff\">\n" |
| 45 | 45 | |
| 46 | 46 | lines = udiff.split("\n") |
| 47 | | lines.reject!{ |line| line =~ /^new file mode [0-9]+/ } |
| 47 | lines.reject!{ |line| line =~ /^(new|deleted) file mode [0-9]+/ } |
| 48 | lines.reject!{ |line| line =~ /^index [a-z0-9]+\.\.[a-z0-9]+/ } |
| 48 | 49 | |
| 49 | 50 | lines_that_differs = /@@ -(\d+),?(\d*) \+(\d+),?(\d*) @@/ |
| 50 | 51 | |
| … | … | |
| 57 | 57 | prev_counter = 0 |
| 58 | 58 | cur_counter = 0 |
| 59 | 59 | change_num = 0 |
| 60 | | if lines.size < 3 |
| 60 | |
| 61 | if lines.size < 2 |
| 61 | 62 | return |
| 62 | 63 | end |
| 63 | | lines[4..lines.length].each do |line| |
| 64 | |
| 65 | lines[3..lines.length].each do |line| |
| 64 | 66 | if line_nums = line.match(lines_that_differs) |
| 65 | 67 | prev_line_numbers = line_nums[1].to_i...(line_nums[1].to_i + (line_nums[2]).to_i) |
| 66 | 68 | cur_line_numbers = line_nums[3].to_i...(line_nums[3].to_i + (line_nums[4]).to_i) |
| toggle raw diff |
--- a/app/helpers/browse_helper.rb
+++ b/app/helpers/browse_helper.rb
@@ -44,7 +44,8 @@ module BrowseHelper
out = "<table class=\"codediff\">\n"
lines = udiff.split("\n")
- lines.reject!{ |line| line =~ /^new file mode [0-9]+/ }
+ lines.reject!{ |line| line =~ /^(new|deleted) file mode [0-9]+/ }
+ lines.reject!{ |line| line =~ /^index [a-z0-9]+\.\.[a-z0-9]+/ }
lines_that_differs = /@@ -(\d+),?(\d*) \+(\d+),?(\d*) @@/
@@ -56,10 +57,12 @@ module BrowseHelper
prev_counter = 0
cur_counter = 0
change_num = 0
- if lines.size < 3
+
+ if lines.size < 2
return
end
- lines[4..lines.length].each do |line|
+
+ lines[3..lines.length].each do |line|
if line_nums = line.match(lines_that_differs)
prev_line_numbers = line_nums[1].to_i...(line_nums[1].to_i + (line_nums[2]).to_i)
cur_line_numbers = line_nums[3].to_i...(line_nums[3].to_i + (line_nums[4]).to_i) |
