Skip to content

O
OHR Support
Commit 2c1e6372 authored by Jean-Philippe Lang's avatar Jean-Philippe Lang
Browse files
Options

SCM AbstractAdapter use shell_quote to more properly escape path (closes #838 by John Goerzen). 

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1238 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent d4429a54
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
lib/redmine/scm/adapters/abstract_adapter.rb
View file @ 2c1e6372
......@@ -101,9 +101,9 @@ module Redmine
end
def target(path)
path ||= ""
base = path.match(/^\//) ? root_url : url
" \"" << "#{base}/#{path}".gsub(/["?<>\*]/, '') << "\""
path ||= ''
base = path.match(/^\//) ? root_url : url
shell_quote("#{base}/#{path}".gsub(/[?<>\*]/, ''))
end
def logger
......
lib/redmine/scm/adapters/subversion_adapter.rb
View file @ 2c1e6372
......@@ -100,7 +100,7 @@ module Redmine
cmd = "#{SVN_BIN} log --xml -r #{identifier_from}:#{identifier_to}"
cmd << credentials_string
cmd << " --verbose " if options[:with_paths]
cmd << target(path)
cmd << ' ' + target(path)
shellout(cmd) do |io|
begin
doc = REXML::Document.new(io)
......@@ -139,7 +139,7 @@ module Redmine
cmd = "#{SVN_BIN} diff -r "
cmd << "#{identifier_to}:"
cmd << "#{identifier_from}"
cmd << "#{target(path)}@#{identifier_from}"
cmd << " #{target(path)}@#{identifier_from}"
cmd << credentials_string
diff = []
shellout(cmd) do |io|
......
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