From 7f59b33e390c979fd3bdc4ff6f42123c4482a596 Mon Sep 17 00:00:00 2001
From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Fri, 8 Nov 2019 02:09:51 +0000
Subject: [PATCH] cleanup: rubocop: fix Style/RescueModifier in
 lib/redmine/scm/adapters/mercurial_adapter.rb

git-svn-id: http://svn.redmine.org/redmine/trunk@18946 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 .rubocop_todo.yml                             | 1 -
 lib/redmine/scm/adapters/mercurial_adapter.rb | 7 ++++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 18316f1d6..a12c36736 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1487,7 +1487,6 @@ Style/RescueModifier:
     - 'app/models/repository.rb'
     - 'lib/redmine/export/csv.rb'
     - 'lib/redmine/field_format.rb'
-    - 'lib/redmine/scm/adapters/mercurial_adapter.rb'
     - 'lib/redmine/search.rb'
     - 'lib/redmine/wiki_formatting.rb'
     - 'test/unit/lib/redmine/wiki_formatting/markdown_formatter_test.rb'
diff --git a/lib/redmine/scm/adapters/mercurial_adapter.rb b/lib/redmine/scm/adapters/mercurial_adapter.rb
index 7325e3df3..ce6f1daf9 100644
--- a/lib/redmine/scm/adapters/mercurial_adapter.rb
+++ b/lib/redmine/scm/adapters/mercurial_adapter.rb
@@ -218,7 +218,12 @@ module Redmine
             end
             yield Revision.new(:revision => le['revision'],
                                :scmid    => le['node'],
-                               :author   => (le['author']['__content__'] rescue ''),
+                               :author   =>
+                                         (begin
+                                            le['author']['__content__']
+                                          rescue
+                                            ''
+                                          end),
                                :time     => Time.parse(le['date']['__content__']),
                                :message  => le['msg']['__content__'],
                                :paths    => paths,