scm: cvs: fix parsing revisions if author is not ASCII.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5455 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/models/changeset.rb b/app/models/changeset.rb
index 9b8ac5d70a89adb15fc40a3c4823c2e5e3b3007b..0bc35a7f1dc27062e31f30e7df91f5278774d5df 100644 (file)
--- a/app/models/changeset.rb
+++ b/app/models/changeset.rb
@@ -252,8 +252,6 @@ class Changeset < ActiveRecord::Base
     Changeset.to_utf8(str.to_s.strip, encoding)
   end
 
-  private
-
   def self.to_utf8(str, encoding)
     return str if str.nil?
     str.force_encoding("ASCII-8BIT") if str.respond_to?(:force_encoding)

diff --git a/app/models/repository/cvs.rb b/app/models/repository/cvs.rb
index 4112f3ecd5dc70ee557a990ead4e1ed7673a605e..a0202f19b99e2de92c4fed65d5d497205074ca6e 100644 (file)
--- a/app/models/repository/cvs.rb
+++ b/app/models/repository/cvs.rb
@@ -137,11 +137,12 @@ class Repository::Cvs < Repository
                                 revision.paths[0][:revision]
                                   )
           cmt = Changeset.normalize_comments(revision.message, repo_log_encoding)
+          author_utf8 = Changeset.to_utf8(revision.author, repo_log_encoding)
           cs  = changesets.find(
             :first,
             :conditions => {
                 :committed_on => tmp_time - time_delta .. tmp_time + time_delta,
-                :committer    => revision.author,
+                :committer    => author_utf8,
                 :comments     => cmt
                 }
              )