From 94f5c737465e371d80a1448e93782182ef93cd33 Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Mon, 11 Jul 2011 02:08:03 +0000 Subject: [PATCH] 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 --- lib/redmine/scm/adapters/mercurial_adapter.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/redmine/scm/adapters/mercurial_adapter.rb b/lib/redmine/scm/adapters/mercurial_adapter.rb index c84e5d3c..6ef816b7 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 -- 2.11.0