##// END OF EJS Templates
jro_apps » redmine
RSS
SCM AbstractAdapter use shell_quote to more properly escape path (closes #838 by John Goerzen)....
Jean-Philippe Lang -
r1224:2c1e63720ec9
parent child
Show More
Side by Side Unified
Context file:
r1224:2c1e63720ec9 Loading diff...:
Show file before | Show file after | Hide comments
@@ -101,9 +101,9 module Redmine
101 end
101 end
102
102
103 def target(path)
103 def target(path)
104 path ||= ""
104 path ||= ''
105 base = path.match(/^\//) ? root_url : url
105 base = path.match(/^\//) ? root_url : url
106 " \"" << "#{base}/#{path}".gsub(/["?<>\*]/, '') << "\""
106 shell_quote("#{base}/#{path}".gsub(/[?<>\*]/, ''))
107 end
107 end
108
108
109 def logger
109 def logger
Show file before | Show file after | Hide comments
@@ -100,7 +100,7 module Redmine
100 cmd = "#{SVN_BIN} log --xml -r #{identifier_from}:#{identifier_to}"
100 cmd = "#{SVN_BIN} log --xml -r #{identifier_from}:#{identifier_to}"
101 cmd << credentials_string
101 cmd << credentials_string
102 cmd << " --verbose " if options[:with_paths]
102 cmd << " --verbose " if options[:with_paths]
103 cmd << target(path)
103 cmd << ' ' + target(path)
104 shellout(cmd) do |io|
104 shellout(cmd) do |io|
105 begin
105 begin
106 doc = REXML::Document.new(io)
106 doc = REXML::Document.new(io)
@@ -139,7 +139,7 module Redmine
139 cmd = "#{SVN_BIN} diff -r "
139 cmd = "#{SVN_BIN} diff -r "
140 cmd << "#{identifier_to}:"
140 cmd << "#{identifier_to}:"
141 cmd << "#{identifier_from}"
141 cmd << "#{identifier_from}"
142 cmd << "#{target(path)}@#{identifier_from}"
142 cmd << " #{target(path)}@#{identifier_from}"
143 cmd << credentials_string
143 cmd << credentials_string
144 diff = []
144 diff = []
145 shellout(cmd) do |io|
145 shellout(cmd) do |io|
General Comments 0
You need to be logged in to leave comments. Login now