From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Mon, 11 Apr 2011 15:43:50 +0000 (+0000)
Subject: scm: cvs: override annotate() in model.
X-Git-Tag: 1.2.0~442
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=0a0819f81ee351ccec8072b0e83e67d12afc5bbc;p=redmine.git

scm: cvs: override annotate() in model.

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

diff --git a/app/models/repository/cvs.rb b/app/models/repository/cvs.rb
index c8f98852e..c11500c56 100644
--- a/app/models/repository/cvs.rb
+++ b/app/models/repository/cvs.rb
@@ -63,7 +63,7 @@ class Repository::Cvs < Repository
     end
     entries
   end
-  
+
   def cat(path, identifier=nil)
     rev = nil
     if ! identifier.nil?
@@ -72,7 +72,16 @@ class Repository::Cvs < Repository
     end
     scm.cat(path, rev.nil? ? nil : rev.committed_on)
   end
-  
+
+  def annotate(path, identifier=nil)
+    rev = nil
+    if ! identifier.nil?
+      rev = changesets.find_by_revision(identifier)
+      return nil if rev.nil?
+    end
+    scm.annotate(path, rev.nil? ? nil : rev.committed_on)
+  end
+
   def diff(path, rev, rev_to)
     # convert rev to revision. CVS can't handle changesets here
     diff=[]