diff app/models/repository/cvs.rb @ 1517:dffacf8a6908 redmine-2.5

Update to Redmine SVN revision 13367 on 2.5-stable branch

--- a/app/models/repository/cvs.rb	Tue Sep 09 09:28:31 2014 +0100
+++ b/app/models/repository/cvs.rb	Tue Sep 09 09:29:00 2014 +0100
@@ -47,7 +47,7 @@
     scm.entry(path, rev.nil? ? nil : rev.committed_on)
   end
 
-  def entries(path=nil, identifier=nil)
+  def scm_entries(path=nil, identifier=nil)
     rev = nil
     if ! identifier.nil?
       rev = changesets.find_by_revision(identifier)
@@ -69,9 +69,9 @@
         end
       end
     end
-    load_entries_changesets(entries)
     entries
   end
+  protected :scm_entries
 
   def cat(path, identifier=nil)
     rev = nil
@@ -186,7 +186,7 @@
         order('committed_on ASC, id ASC').
         where("repository_id = ? AND revision LIKE 'tmp%'", id).
         each do |changeset|
-        changeset.update_attribute :revision, next_revision_number
+          changeset.update_attribute :revision, next_revision_number
       end
     end # transaction
     @current_revision_number = nil