kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed: Darcs adapter works on Win32 only (wrong quotes in commands #2402). 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/0.8-stable@2231 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2009-01-04 13:24:56 +00:00
parent 49b6f9e4dd
commit 567c8ed9b0
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/redmine/scm/adapters/darcs_adapter.rb
View File

@ -67,8 +67,8 @@ module Redmine
path = '.' if path.blank? path = '.' if path.blank?
entries = Entries.new entries = Entries.new
cmd = "#{DARCS_BIN} annotate --repodir #{@url} --xml-output" cmd = "#{DARCS_BIN} annotate --repodir #{@url} --xml-output"
cmd << " --match \"hash #{identifier}\"" if identifier cmd << " --match #{shell_quote("hash #{identifier}")}" if identifier
cmd << " #{path}" cmd << " #{shell_quote path}"
shellout(cmd) do |io| shellout(cmd) do |io|
begin begin
doc = REXML::Document.new(io) doc = REXML::Document.new(io)
@ -91,7 +91,7 @@ module Redmine
path = '.' if path.blank? path = '.' if path.blank?
revisions = Revisions.new revisions = Revisions.new
cmd = "#{DARCS_BIN} changes --repodir #{@url} --xml-output" cmd = "#{DARCS_BIN} changes --repodir #{@url} --xml-output"
cmd << " --from-match \"hash #{identifier_from}\"" if identifier_from cmd << " --from-match #{shell_quote("hash #{identifier_from}")}" if identifier_from
cmd << " --last #{options[:limit].to_i}" if options[:limit] cmd << " --last #{options[:limit].to_i}" if options[:limit]
shellout(cmd) do |io| shellout(cmd) do |io|
begin begin
@ -118,12 +118,12 @@ module Redmine
path = '*' if path.blank? path = '*' if path.blank?
cmd = "#{DARCS_BIN} diff --repodir #{@url}" cmd = "#{DARCS_BIN} diff --repodir #{@url}"
if identifier_to.nil? if identifier_to.nil?
cmd << " --match \"hash #{identifier_from}\"" cmd << " --match #{shell_quote("hash #{identifier_from}")}"
else else
cmd << " --to-match \"hash #{identifier_from}\"" cmd << " --to-match #{shell_quote("hash #{identifier_from}")}"
cmd << " --from-match \"hash #{identifier_to}\"" cmd << " --from-match #{shell_quote("hash #{identifier_to}")}"
end end
cmd << " -u #{path}" cmd << " -u #{shell_quote path}"
diff = [] diff = []
shellout(cmd) do |io| shellout(cmd) do |io|
io.each_line do |line| io.each_line do |line|
@ -136,7 +136,7 @@ module Redmine
def cat(path, identifier=nil) def cat(path, identifier=nil)
cmd = "#{DARCS_BIN} show content --repodir #{@url}" cmd = "#{DARCS_BIN} show content --repodir #{@url}"
cmd << " --match \"hash #{identifier}\"" if identifier cmd << " --match #{shell_quote("hash #{identifier}")}" if identifier
cmd << " #{shell_quote path}" cmd << " #{shell_quote path}"
cat = nil cat = nil
shellout(cmd) do |io| shellout(cmd) do |io|
@ -171,7 +171,7 @@ module Redmine
# Retrieve changed paths for a single patch # Retrieve changed paths for a single patch
def get_paths_for_patch(hash) def get_paths_for_patch(hash)
cmd = "#{DARCS_BIN} annotate --repodir #{@url} --summary --xml-output" cmd = "#{DARCS_BIN} annotate --repodir #{@url} --summary --xml-output"
cmd << " --match \"hash #{hash}\" " cmd << " --match #{shell_quote("hash #{hash}")} "
paths = [] paths = []
shellout(cmd) do |io| shellout(cmd) do |io|
begin begin