From ce76bc8b162838afdcb5cd920244f5750fff30b9 Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Sat, 23 Nov 2019 07:58:02 +0000 Subject: [PATCH] cleanup: rubocop: fix Style/MultilineIfModifier in lib/redmine/scm/adapters/subversion_adapter.rb git-svn-id: http://svn.redmine.org/redmine/trunk@19183 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- .rubocop_todo.yml | 1 - lib/redmine/scm/adapters/subversion_adapter.rb | 18 +++++++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 850e0595a..a9152bb15 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -1264,7 +1264,6 @@ Style/MultilineIfModifier: - 'lib/redmine/access_keys.rb' - 'lib/redmine/helpers/gantt.rb' - 'lib/redmine/scm/adapters/git_adapter.rb' - - 'lib/redmine/scm/adapters/subversion_adapter.rb' - 'lib/redmine/wiki_formatting.rb' - 'lib/redmine/wiki_formatting/textile/redcloth3.rb' - 'test/mocks/open_id_authentication_mock.rb' diff --git a/lib/redmine/scm/adapters/subversion_adapter.rb b/lib/redmine/scm/adapters/subversion_adapter.rb index f3b5a1534..09b4aacb5 100644 --- a/lib/redmine/scm/adapters/subversion_adapter.rb +++ b/lib/redmine/scm/adapters/subversion_adapter.rb @@ -172,13 +172,17 @@ module Redmine doc = parse_xml(output) each_xml_element(doc['log'], 'logentry') do |logentry| paths = [] - each_xml_element(logentry['paths'], 'path') do |path| - paths << {:action => path['action'], - :path => path['__content__'], - :from_path => path['copyfrom-path'], - :from_revision => path['copyfrom-rev'] - } - end if logentry['paths'] && logentry['paths']['path'] + if logentry['paths'] && logentry['paths']['path'] + each_xml_element(logentry['paths'], 'path') do |path| + paths << + { + :action => path['action'], + :path => path['__content__'], + :from_path => path['copyfrom-path'], + :from_revision => path['copyfrom-rev'] + } + end + end paths.sort_by! {|e| e[:path]} revisions << Revision.new({:identifier => logentry['revision'], -- 2.39.5