From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Mon, 11 Jul 2011 02:08:03 +0000 (+0000)
Subject: Merged r6245 from trunk.
X-Git-Tag: 1.2.1~4
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=94f5c737465e371d80a1448e93782182ef93cd33;p=redmine.git

Merged r6245 from trunk.

scm: mercurial: catch exception and return nil during getting info.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@6253 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/lib/redmine/scm/adapters/mercurial_adapter.rb b/lib/redmine/scm/adapters/mercurial_adapter.rb
index c84e5d3ca..6ef816b73 100644
--- a/lib/redmine/scm/adapters/mercurial_adapter.rb
+++ b/lib/redmine/scm/adapters/mercurial_adapter.rb
@@ -95,6 +95,10 @@ module Redmine
           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