revert r13901

git-svn-id: http://svn.redmine.org/redmine/trunk@13903 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/models/repository/cvs.rb b/app/models/repository/cvs.rb
index 9503e98a178bcb729a07d1239772e6d80bef2dd9..e61ede50d77ec369550dec2de33beaa3b3000bfc 100644 (file)
--- a/app/models/repository/cvs.rb
+++ b/app/models/repository/cvs.rb
@@ -57,16 +57,9 @@ class Repository::Cvs < Repository
     if entries
       entries.each() do |entry|
         if ( ! entry.lastrev.nil? ) && ( ! entry.lastrev.revision.nil? )
-          if ActiveRecord::Base.connection.adapter_name =~ /sqlite/i &&
-                Rails::VERSION::MAJOR == 4 && Rails::VERSION::MINOR == 2 &&
-                Rails::VERSION::TINY == 0
-            change_rev = filechanges.where(:revision => entry.lastrev.revision)
-            change = change_rev.find { |c| c.path == scm.with_leading_slash(entry.path) }
-          else
-            change = filechanges.where(
-                       :revision => entry.lastrev.revision,
-                       :path => scm.with_leading_slash(entry.path)).first
-          end
+          change = filechanges.find_by_revision_and_path(
+                     entry.lastrev.revision,
+                     scm.with_leading_slash(entry.path) )
           if change
             entry.lastrev.identifier = change.changeset.revision
             entry.lastrev.revision   = change.changeset.revision