diff lib/redmine/scm/adapters/mercurial_adapter.rb @ 507:0c939c159af4 redmine-1.2

Update to Redmine 1.2.1 on 1.2-stable branch (Redmine SVN rev 6270)

--- a/lib/redmine/scm/adapters/mercurial_adapter.rb	Mon Jun 06 14:24:13 2011 +0100
+++ b/lib/redmine/scm/adapters/mercurial_adapter.rb	Thu Jul 14 10:32:19 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