diff --git a/lib/redmine/scm/adapters/abstract_adapter.rb b/lib/redmine/scm/adapters/abstract_adapter.rb index 0ad3d7f45..6edc9c9de 100644 --- a/lib/redmine/scm/adapters/abstract_adapter.rb +++ b/lib/redmine/scm/adapters/abstract_adapter.rb @@ -161,21 +161,31 @@ module Redmine path.start_with?('/') ? path : "/#{path}" end - def with_trailling_slash(path) + def with_trailing_slash(path) path ||= '' path.end_with?('/') ? path : "#{path}/" end + def with_trailling_slash(path) + ActiveSupport::Deprecation.warn 'Redmine::Scm::Adapters::AbstractAdapter#with_trailling_slash is deprecated and will be removed in Redmine 6.0. Please use #with_trailing_slash instead.' + with_trailing_slash(path) + end + def without_leading_slash(path) path ||= '' path.gsub(%r{^/+}, '') end - def without_trailling_slash(path) + def without_trailing_slash(path) path ||= '' path.end_with?('/') ? path[0..-2] : path end + def without_trailling_slash(path) + ActiveSupport::Deprecation.warn 'Redmine::Scm::Adapters::AbstractAdapter#without_trailling_slash is deprecated and will be removed in Redmine 6.0. Please use #without_trailing_slash instead.' + without_trailing_slash(path) + end + def valid_name?(name) return true if name.nil? return true if name.is_a?(Integer) && name > 0 diff --git a/lib/redmine/scm/adapters/filesystem_adapter.rb b/lib/redmine/scm/adapters/filesystem_adapter.rb index 5b98d5314..550c19b92 100644 --- a/lib/redmine/scm/adapters/filesystem_adapter.rb +++ b/lib/redmine/scm/adapters/filesystem_adapter.rb @@ -36,7 +36,7 @@ module Redmine def initialize(url, root_url=nil, login=nil, password=nil, path_encoding=nil) - @url = with_trailling_slash(url) + @url = with_trailing_slash(url) @path_encoding = path_encoding.blank? ? 'UTF-8' : path_encoding end @@ -47,8 +47,8 @@ module Redmine def format_path_ends(path, leading=true, trailling=true) path = leading ? with_leading_slash(path) : without_leading_slash(path) - trailling ? with_trailling_slash(path) : - without_trailling_slash(path) + trailling ? with_trailing_slash(path) : + without_trailing_slash(path) end def info diff --git a/lib/redmine/scm/adapters/mercurial_adapter.rb b/lib/redmine/scm/adapters/mercurial_adapter.rb index da831323f..ad8a435dd 100644 --- a/lib/redmine/scm/adapters/mercurial_adapter.rb +++ b/lib/redmine/scm/adapters/mercurial_adapter.rb @@ -154,7 +154,7 @@ module Redmine # do nothing end end - path_prefix = path.blank? ? '' : with_trailling_slash(path) + path_prefix = path.blank? ? '' : with_trailing_slash(path) entries = Entries.new as_ary(manifest['dir']).each do |e|