From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Fri, 10 Jun 2011 07:06:11 +0000 (+0000)
Subject: scm: mercurial: fix unit adapter annotate test fails on Windows Mercurial 1.8.4+29... 
X-Git-Tag: 1.3.0~1843
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=3b5db24269fed4044e55665b161341af8e3b0547;p=redmine.git

scm: mercurial: fix unit adapter annotate test fails on Windows Mercurial 1.8.4+29-e597ef52a7c2.

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

diff --git a/lib/redmine/scm/adapters/mercurial_adapter.rb b/lib/redmine/scm/adapters/mercurial_adapter.rb
index d02ed78b0..c84e5d3ca 100644
--- a/lib/redmine/scm/adapters/mercurial_adapter.rb
+++ b/lib/redmine/scm/adapters/mercurial_adapter.rb
@@ -276,7 +276,8 @@ module Redmine
           end
           blame
         rescue HgCommandAborted
-          nil  # means not found or cannot be annotated
+          # means not found or cannot be annotated
+          Annotate.new
         end
 
         class Revision < Redmine::Scm::Adapters::Revision