diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index b0350ddb7..b4f5fbd76 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -1216,10 +1216,6 @@ Style/MixinUsage: Exclude: - 'test/test_helper.rb' -Style/MultilineBlockChain: - Exclude: - - 'lib/redmine/scm/adapters/mercurial_adapter.rb' - # Cop supports --auto-correct. Style/MultilineIfModifier: Exclude: diff --git a/lib/redmine/scm/adapters/mercurial_adapter.rb b/lib/redmine/scm/adapters/mercurial_adapter.rb index 82a773224..fd3c80de3 100644 --- a/lib/redmine/scm/adapters/mercurial_adapter.rb +++ b/lib/redmine/scm/adapters/mercurial_adapter.rb @@ -211,7 +211,8 @@ module Redmine :path => with_leading_slash(p), :from_path => (cpmap.member?(p) ? with_leading_slash(cpmap[p]) : nil), :from_revision => (cpmap.member?(p) ? le['node'] : nil)} - end.sort_by { |e| e[:path] } + end + paths.sort_by!{|e| e[:path]} parents_ary = [] as_ary(le['parents']['parent']).map do |par| parents_ary << par['__content__'] if par['__content__'] != "0000000000000000000000000000000000000000"