diff lib/redmine/scm/adapters/.svn/text-base/mercurial_adapter.rb.svn-base @ 508:851510f1b535 cannam

Merge from branch "redmine-1.2"

--- a/lib/redmine/scm/adapters/.svn/text-base/mercurial_adapter.rb.svn-base	Thu Jul 14 10:21:43 2011 +0100
+++ b/lib/redmine/scm/adapters/.svn/text-base/mercurial_adapter.rb.svn-base	Thu Jul 14 10:37:36 2011 +0100
@@ -95,6 +95,10 @@
           Info.new(:root_url => CGI.unescape(summary['repository']['root']),
                    :lastrev => Revision.new(:revision => tip['revision'],
                                             :scmid => tip['node']))
+        # rescue HgCommandAborted
+        rescue Exception => e
+          logger.error "hg: error during getting info: #{e.message}"
+          nil
         end
 
         def tags
@@ -276,7 +280,8 @@
           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