kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Ruby 1.9 compatibility of unified_diff.rb. 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4897 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2011-02-21 03:59:50 +00:00
parent 3e463c4e69
commit 7a9136f93a
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/redmine/unified_diff.rb
View File

@ -22,12 +22,20 @@ module Redmine
options.assert_valid_keys(:type, :max_lines) options.assert_valid_keys(:type, :max_lines)
diff = diff.split("\n") if diff.is_a?(String) diff = diff.split("\n") if diff.is_a?(String)
diff_type = options[:type] || 'inline' diff_type = options[:type] || 'inline'
lines = 0 lines = 0
@truncated = false @truncated = false
diff_table = DiffTable.new(diff_type) diff_table = DiffTable.new(diff_type)
diff.each do |line| diff.each do |line|
line_encoding = nil
if line.respond_to?(:force_encoding)
line_encoding = line.encoding
# TODO: UTF-16 and Japanese CP932 which is imcompatible with ASCII
# In Japan, diffrence between file path encoding
# and file contents encoding is popular.
line.force_encoding('ASCII-8BIT')
end
unless diff_table.add_line line unless diff_table.add_line line
line.force_encoding(line_encoding) if line_encoding
self << diff_table if diff_table.length > 1 self << diff_table if diff_table.length > 1
diff_table = DiffTable.new(diff_type) diff_table = DiffTable.new(diff_type)
end end
@ -40,7 +48,7 @@ module Redmine
self << diff_table unless diff_table.empty? self << diff_table unless diff_table.empty?
self self
end end
def truncated?; @truncated; end def truncated?; @truncated; end
end end