From eea06ab7702fad35f993ed16dec6a9b131647f1b Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Fri, 11 Mar 2011 01:48:18 +0000 Subject: [PATCH] scm: cvs: use scm_cmd() in adapter revisions(). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5085 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- lib/redmine/scm/adapters/cvs_adapter.rb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/redmine/scm/adapters/cvs_adapter.rb b/lib/redmine/scm/adapters/cvs_adapter.rb index 800b4cbc1..cc3ebcd2a 100644 --- a/lib/redmine/scm/adapters/cvs_adapter.rb +++ b/lib/redmine/scm/adapters/cvs_adapter.rb @@ -145,10 +145,10 @@ module Redmine logger.debug " revisions path:'#{path}',identifier_from #{identifier_from}, identifier_to #{identifier_to}" path_with_project="#{url}#{with_leading_slash(path)}" - cmd = "#{self.class.sq_bin} -d #{shell_quote root_url} rlog" - cmd << " -d\">#{time_to_cvstime_rlog(identifier_from)}\"" if identifier_from - cmd << " #{shell_quote path_with_project}" - shellout(cmd) do |io| + cmd_args = %w|rlog| + cmd_args << "-d" << ">#{time_to_cvstime_rlog(identifier_from)}" if identifier_from + cmd_args << path_with_project + scm_cmd(*cmd_args) do |io| state="entry_start" commit_log=String.new @@ -261,6 +261,8 @@ module Redmine end end end + rescue ScmCommandAborted + Revisions.new end def diff(path, identifier_from, identifier_to=nil)