| @@ -229,7 +229,7 module Redmine | |||||
| 229 | def diff(path, identifier_from, identifier_to=nil) |
|
229 | def diff(path, identifier_from, identifier_to=nil) | |
| 230 | logger.debug "<cvs> diff path:'#{path}',identifier_from #{identifier_from}, identifier_to #{identifier_to}" |
|
230 | logger.debug "<cvs> diff path:'#{path}',identifier_from #{identifier_from}, identifier_to #{identifier_to}" | |
| 231 | path_with_project="#{url}#{with_leading_slash(path)}" |
|
231 | path_with_project="#{url}#{with_leading_slash(path)}" | |
| 232 |
cmd = "#{CVS_BIN} -d #{shell_quote root_url} rdiff -u -r#{identifier_to |
|
232 | cmd = "#{CVS_BIN} -d #{shell_quote root_url} rdiff -u -r#{identifier_to} -r#{identifier_from} #{shell_quote path_with_project}" | |
| 233 | diff = [] |
|
233 | diff = [] | |
| 234 | shellout(cmd) do |io| |
|
234 | shellout(cmd) do |io| | |
| 235 | io.each_line do |line| |
|
235 | io.each_line do |line| | |
| @@ -22,6 +22,7 require 'repositories_controller' | |||||
| 22 | class RepositoriesController; def rescue_action(e) raise e end; end |
|
22 | class RepositoriesController; def rescue_action(e) raise e end; end | |
| 23 |
|
23 | |||
| 24 | class RepositoriesCvsControllerTest < ActionController::TestCase |
|
24 | class RepositoriesCvsControllerTest < ActionController::TestCase | |
|
|
25 | fixtures :projects, :users, :roles, :members, :member_roles, :repositories, :enabled_modules | |||
| 25 |
|
26 | |||
| 26 | # No '..' in the repository path |
|
27 | # No '..' in the repository path | |
| 27 | REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/cvs_repository' |
|
28 | REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/cvs_repository' | |
General Comments 0
You need to be logged in to leave comments.
Login now