From 46cbe5418947ab58c919432b9013252ada6a3bc3 Mon Sep 17 00:00:00 2001 From: Saito Date: Mon, 28 Nov 2011 17:46:41 +0800 Subject: fix the issue on github #157. directly force_encoding is wrong, must detect the file string's encoding. then force_encoding the string to it's encoding. last convert it to utf-8. --- lib/graph_commit.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'lib/graph_commit.rb') diff --git a/lib/graph_commit.rb b/lib/graph_commit.rb index 18b1702250c..1fcb9e78ef0 100644 --- a/lib/graph_commit.rb +++ b/lib/graph_commit.rb @@ -1,6 +1,7 @@ require "grit" class GraphCommit + include Utils::CharEncode attr_accessor :time, :space attr_accessor :refs @@ -65,7 +66,7 @@ class GraphCommit # @param [GraphCommit] the commit object. # @param [Hash] map of commits # - # @return [Fixnum] max space used. + # @return [Fixnum] max space used. def self.mark_chain(mark, commit, map) commit.space = mark if commit.space == 0 m1 = mark - 1 @@ -96,13 +97,13 @@ class GraphCommit h[:parents] = self.parents.collect do |p| [p.id,0,0] end - h[:author] = author.name.force_encoding("UTF-8") + h[:author] = encode(author.name) h[:time] = time h[:space] = space h[:refs] = refs.collect{|r|r.name}.join(" ") unless refs.nil? h[:id] = sha h[:date] = date - h[:message] = message.force_encoding("UTF-8") + h[:message] = encode(message) h[:login] = author.email h end -- cgit v1.2.1