deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

refactor each_line detect to detect all diff file

Browse source
This commit is contained in:
Saito 2011-12-01 15:59:49 +08:00
parent c2cfc52e44
commit 42ba6d04f8
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/views/commits/_text_file.html.haml
View file

@ -1,9 +1,9 @@
%table %table
- line_old = 0 - line_old = 0
- line_new = 0 - line_new = 0
- lines_arr = diff.diff.lines.to_a - diff_str = encode(diff.diff)
- lines_arr = diff_str.lines.to_a
- lines_arr.each do |line| - lines_arr.each do |line|
- line = encode(line)
- next if line.match(/^--- \/dev\/null/) - next if line.match(/^--- \/dev\/null/)
- next if line.match(/^--- a/) - next if line.match(/^--- a/)
- next if line.match(/^\+\+\+ b/) - next if line.match(/^\+\+\+ b/)
@ -18,7 +18,7 @@
= link_to raw(diff_line_class(line) == "new" ? " " : line_old), "#OLD#{index}-#{line_old}", :id => "OLD#{index}-#{line_old}" = link_to raw(diff_line_class(line) == "new" ? " " : line_old), "#OLD#{index}-#{line_old}", :id => "OLD#{index}-#{line_old}"
%td.new_line %td.new_line
= link_to raw(diff_line_class(line) == "old" ? " " : line_new) , "#NEW#{index}-#{line_new}", :id => "NEW#{index}-#{line_new}" = link_to raw(diff_line_class(line) == "old" ? " " : line_new) , "#NEW#{index}-#{line_new}", :id => "NEW#{index}-#{line_new}"
%td.line_content{:class => diff_line_class(full_line)}= raw "#{full_line}  " %td.line_content{:class => diff_line_class(full_line)}= raw "#{full_line}  "
- if line[0] == "+" - if line[0] == "+"
- line_new += 1 - line_new += 1
- elsif line[0] == "-" - elsif line[0] == "-"

2
lib/utils.rb
View file

@ -23,6 +23,8 @@ module Utils
string.force_encoding(cd.encoding) string.force_encoding(cd.encoding)
end end
string.encode("utf-8", :undef => :replace, :replace => "?", :invalid => :replace) string.encode("utf-8", :undef => :replace, :replace => "?", :invalid => :replace)
rescue
"Invalid code encoding"
end end
end end