OSDN Git Service

scm: cvs: model entries returns nil if revision is not stored in database.
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>
Tue, 12 Apr 2011 05:44:10 +0000 (05:44 +0000)
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>
Tue, 12 Apr 2011 05:44:10 +0000 (05:44 +0000)
Prevent showing invalid revision in repository tab.

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

app/models/repository/cvs.rb

index c11500c..d2504ff 100644 (file)
@@ -42,9 +42,13 @@ class Repository::Cvs < Repository
     rev = identifier.nil? ? nil : changesets.find_by_revision(identifier)
     scm.entry(path, rev.nil? ? nil : rev.committed_on)
   end
-  
+
   def entries(path=nil, identifier=nil)
-    rev = identifier.nil? ? nil : changesets.find_by_revision(identifier)
+    rev = nil
+    if ! identifier.nil?
+      rev = changesets.find_by_revision(identifier)
+      return nil if rev.nil?
+    end
     entries = scm.entries(path, rev.nil? ? nil : rev.committed_on)
     if entries
       entries.each() do |entry|