Project

General

Profile

Download (1.53 KB)

Defect #7176 » cvs-diff.diff

Toshi MARUYAMA, 2010-12-27 06:05

View differences:

lib/redmine/scm/adapters/cvs_adapter.rb
229 229 
        def diff(path, identifier_from, identifier_to=nil)
230 230 
          logger.debug "<cvs> diff path:'#{path}',identifier_from #{identifier_from}, identifier_to #{identifier_to}"
231 231 
          path_with_project="#{url}#{with_leading_slash(path)}"
232 
          cmd = "#{CVS_BIN} -d #{shell_quote root_url} rdiff -u -r#{identifier_to.to_i} -r#{identifier_from.to_i} #{shell_quote path_with_project}"
232 
          cmd = "#{CVS_BIN} -d #{shell_quote root_url} rdiff -u -r#{identifier_to} -r#{identifier_from} #{shell_quote path_with_project}"
233 233 
          diff = []
234 234 
          shellout(cmd) do |io|
235 235 
            io.each_line do |line|
test/functional/repositories_cvs_controller_test.rb
22 22 
class RepositoriesController; def rescue_action(e) raise e end; end
23 23 

  		




  24
  24
  
    
class RepositoriesCvsControllerTest < ActionController::TestCase

  		




  
  25
  
    
  fixtures :projects, :users, :roles, :members, :member_roles, :repositories, :enabled_modules

  		




  25
  26
  
    

  		




  26
  27
  
    
  # No '..' in the repository path

  		




  27
  28
  
    
  REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/cvs_repository'

  		















  (3-3/3)