Commit 4e5e9534 authored by jplang's avatar jplang

Removes duplicate shell_quote method (#26149).

Patch by Jens Krämer.

git-svn-id: https://svn.redmine.org/redmine/trunk@16667 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent 9361cc1a
......@@ -22,21 +22,23 @@ module Redmine
module Scm
module Adapters
class AbstractAdapter #:nodoc:
include Redmine::Utils::Shell
# raised if scm command exited with error, e.g. unknown revision.
class ScmCommandAborted < ::Redmine::Scm::Adapters::CommandFailed; end
class << self
def client_command
""
end
def shell_quote(str)
Redmine::Utils::Shell.shell_quote str
end
def shell_quote_command
if Redmine::Platform.mswin? && RUBY_PLATFORM == 'java'
client_command
else
shell_quote(client_command)
end
Redmine::Utils::Shell.shell_quote_command client_command
end
# Returns the version of the scm client
......@@ -64,13 +66,6 @@ module Redmine
true
end
def shell_quote(str)
if Redmine::Platform.mswin?
'"' + str.gsub(/"/, '\\"') + '"'
else
"'" + str.gsub(/'/, "'\"'\"'") + "'"
end
end
end
def initialize(url, root_url=nil, login=nil, password=nil,
......@@ -180,10 +175,6 @@ module Redmine
(path[-1,1] == "/") ? path[0..-2] : path
end
def shell_quote(str)
self.class.shell_quote(str)
end
private
def retrieve_root_url
info = self.info
......
......@@ -64,6 +64,9 @@ module Redmine
end
module Shell
module_function
def shell_quote(str)
if Redmine::Platform.mswin?
'"' + str.gsub(/"/, '\\"') + '"'
......@@ -71,6 +74,14 @@ module Redmine
"'" + str.gsub(/'/, "'\"'\"'") + "'"
end
end
def shell_quote_command(command)
if Redmine::Platform.mswin? && RUBY_PLATFORM == 'java'
command
else
shell_quote(command)
end
end
end
module DateCalculation
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment