From 42ba6d04f84b722bc1212378633cd8c05a2c6ded Mon Sep 17 00:00:00 2001
From: Saito <saitowu@gmail.com>
Date: Thu, 1 Dec 2011 15:59:49 +0800
Subject: [PATCH] refactor each_line detect to detect all diff file

---
 app/views/commits/_text_file.html.haml | 6 +++---
 lib/utils.rb                           | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/views/commits/_text_file.html.haml b/app/views/commits/_text_file.html.haml
index e39cf11700e..22fe5582dfd 100644
--- a/app/views/commits/_text_file.html.haml
+++ b/app/views/commits/_text_file.html.haml
@@ -1,9 +1,9 @@
 %table
   - line_old = 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|
-    - line = encode(line)
     - next if line.match(/^--- \/dev\/null/)
     - next if line.match(/^--- a/)
     - next if line.match(/^\+\+\+ b/)
@@ -18,7 +18,7 @@
         = link_to raw(diff_line_class(line) == "new" ? "&nbsp;" : line_old), "#OLD#{index}-#{line_old}", :id => "OLD#{index}-#{line_old}"
       %td.new_line
         = link_to raw(diff_line_class(line) == "old" ? "&nbsp;" : line_new) , "#NEW#{index}-#{line_new}", :id => "NEW#{index}-#{line_new}"
-      %td.line_content{:class => diff_line_class(full_line)}= raw "#{full_line} &nbsp;"  
+      %td.line_content{:class => diff_line_class(full_line)}= raw "#{full_line} &nbsp;"
     - if line[0] == "+"
       - line_new += 1
     - elsif line[0] == "-"
diff --git a/lib/utils.rb b/lib/utils.rb
index d0339c2b271..411abef2f69 100644
--- a/lib/utils.rb
+++ b/lib/utils.rb
@@ -23,6 +23,8 @@ module Utils
         string.force_encoding(cd.encoding)
       end
       string.encode("utf-8", :undef => :replace, :replace => "?", :invalid => :replace)
+    rescue
+      "Invalid code encoding"
     end
   end