Skip to content

O
OHR Support
Commit ffb3d926 authored by Eric Davis's avatar Eric Davis
Browse files
Options

Support leading and trailing spaces in filenames or directories in the git adapter. #6499 

Contributed by Felix Schäfer

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4189 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent bd511194
Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 9 deletions
lib/redmine/scm/adapters/git_adapter.rb
View file @ ffb3d926
...@@ -65,7 +65,7 @@ module Redmine ...@@ -65,7 +65,7 @@ module Redmine
shellout(cmd) do |io| shellout(cmd) do |io|
io.each_line do |line| io.each_line do |line|
e = line.chomp.to_s e = line.chomp.to_s
if e =~ /^\d+\s+(\w+)\s+([0-9a-f]{40})\s+([0-9-]+)\s+(.+)$/ if e =~ /^\d+\s+(\w+)\s+([0-9a-f]{40})\s+([0-9-]+)\t(.+)$/
type = $1 type = $1
sha = $2 sha = $2
size = $3 size = $3
...@@ -165,13 +165,13 @@ module Redmine ...@@ -165,13 +165,13 @@ module Redmine
parsing_descr = 1 parsing_descr = 1
changeset[:description] = "" changeset[:description] = ""
elsif (parsing_descr == 1 || parsing_descr == 2) \ elsif (parsing_descr == 1 || parsing_descr == 2) \
&& line =~ /^:\d+\s+\d+\s+[0-9a-f.]+\s+[0-9a-f.]+\s+(\w)\s+(.+)$/ && line =~ /^:\d+\s+\d+\s+[0-9a-f.]+\s+[0-9a-f.]+\s+(\w)\t(.+)$/
parsing_descr = 2 parsing_descr = 2
fileaction = $1 fileaction = $1
filepath = $2 filepath = $2
files << {:action => fileaction, :path => filepath} files << {:action => fileaction, :path => filepath}
elsif (parsing_descr == 1 || parsing_descr == 2) \ elsif (parsing_descr == 1 || parsing_descr == 2) \
&& line =~ /^:\d+\s+\d+\s+[0-9a-f.]+\s+[0-9a-f.]+\s+(\w)\d+\s+(\S+)\s+(.+)$/ && line =~ /^:\d+\s+\d+\s+[0-9a-f.]+\s+[0-9a-f.]+\s+(\w)\d+\s+(\S+)\t(.+)$/
parsing_descr = 2 parsing_descr = 2
fileaction = $1 fileaction = $1
filepath = $3 filepath = $3
......
test/functional/repositories_git_controller_test.rb
View file @ ffb3d926
...@@ -50,7 +50,7 @@ class RepositoriesGitControllerTest < ActionController::TestCase ...@@ -50,7 +50,7 @@ class RepositoriesGitControllerTest < ActionController::TestCase
assert_response :success assert_response :success
assert_template 'show' assert_template 'show'
assert_not_nil assigns(:entries) assert_not_nil assigns(:entries)
assert_equal 8, assigns(:entries).size assert_equal 9, assigns(:entries).size
assert assigns(:entries).detect {|e| e.name == 'images' && e.kind == 'dir'} assert assigns(:entries).detect {|e| e.name == 'images' && e.kind == 'dir'}
assert assigns(:entries).detect {|e| e.name == 'this_is_a_really_long_and_verbose_directory_name' && e.kind == 'dir'} assert assigns(:entries).detect {|e| e.name == 'this_is_a_really_long_and_verbose_directory_name' && e.kind == 'dir'}
assert assigns(:entries).detect {|e| e.name == 'sources' && e.kind == 'dir'} assert assigns(:entries).detect {|e| e.name == 'sources' && e.kind == 'dir'}
...@@ -59,6 +59,7 @@ class RepositoriesGitControllerTest < ActionController::TestCase ...@@ -59,6 +59,7 @@ class RepositoriesGitControllerTest < ActionController::TestCase
assert assigns(:entries).detect {|e| e.name == 'new_file.txt' && e.kind == 'file'} assert assigns(:entries).detect {|e| e.name == 'new_file.txt' && e.kind == 'file'}
assert assigns(:entries).detect {|e| e.name == 'renamed_test.txt' && e.kind == 'file'} assert assigns(:entries).detect {|e| e.name == 'renamed_test.txt' && e.kind == 'file'}
assert assigns(:entries).detect {|e| e.name == 'filemane with spaces.txt' && e.kind == 'file'} assert assigns(:entries).detect {|e| e.name == 'filemane with spaces.txt' && e.kind == 'file'}
assert assigns(:entries).detect {|e| e.name == ' filename with a leading space.txt ' && e.kind == 'file'}
end end
def test_browse_branch def test_browse_branch
......
test/unit/lib/redmine/scm/adapters/git_adapter_test.rb
View file @ ffb3d926
...@@ -13,7 +13,7 @@ class GitAdapterTest < ActiveSupport::TestCase ...@@ -13,7 +13,7 @@ class GitAdapterTest < ActiveSupport::TestCase
end end
def test_getting_all_revisions def test_getting_all_revisions
assert_equal 14, @adapter.revisions('',nil,nil,:all => true).length assert_equal 15, @adapter.revisions('',nil,nil,:all => true).length
end end
def test_getting_certain_revisions def test_getting_certain_revisions
...@@ -24,6 +24,14 @@ class GitAdapterTest < ActiveSupport::TestCase ...@@ -24,6 +24,14 @@ class GitAdapterTest < ActiveSupport::TestCase
assert_equal 1, @adapter.revisions("filemane with spaces.txt", nil, nil, :all => true).length assert_equal 1, @adapter.revisions("filemane with spaces.txt", nil, nil, :all => true).length
end end
def test_getting_revisions_with_leading_and_trailing_spaces_in_filename
assert_equal " filename with a leading space.txt ", @adapter.revisions(" filename with a leading space.txt ", nil, nil, :all => true)[0].paths[0][:path]
end
def test_getting_entries_with_leading_and_trailing_spaces_in_filename
assert_equal " filename with a leading space.txt ", @adapter.entries('', '83ca5fd546063a3c7dc2e568ba3355661a9e2b2c')[3].name
end
def test_annotate def test_annotate
annotate = @adapter.annotate('sources/watchers_controller.rb') annotate = @adapter.annotate('sources/watchers_controller.rb')
assert_kind_of Redmine::Scm::Adapters::Annotate, annotate assert_kind_of Redmine::Scm::Adapters::Annotate, annotate
......
test/unit/repository_git_test.rb
View file @ ffb3d926
...@@ -34,8 +34,8 @@ class RepositoryGitTest < ActiveSupport::TestCase ...@@ -34,8 +34,8 @@ class RepositoryGitTest < ActiveSupport::TestCase
@repository.fetch_changesets @repository.fetch_changesets
@repository.reload @repository.reload
assert_equal 14, @repository.changesets.count assert_equal 15, @repository.changesets.count
assert_equal 23, @repository.changes.count assert_equal 24, @repository.changes.count
commit = @repository.changesets.find(:first, :order => 'committed_on ASC') commit = @repository.changesets.find(:first, :order => 'committed_on ASC')
assert_equal "Initial import.\nThe repository contains 3 files.", commit.comments assert_equal "Initial import.\nThe repository contains 3 files.", commit.comments
...@@ -57,10 +57,10 @@ class RepositoryGitTest < ActiveSupport::TestCase ...@@ -57,10 +57,10 @@ class RepositoryGitTest < ActiveSupport::TestCase
# Remove the 3 latest changesets # Remove the 3 latest changesets
@repository.changesets.find(:all, :order => 'committed_on DESC', :limit => 3).each(&:destroy) @repository.changesets.find(:all, :order => 'committed_on DESC', :limit => 3).each(&:destroy)
@repository.reload @repository.reload
assert_equal 11, @repository.changesets.count assert_equal 12, @repository.changesets.count
@repository.fetch_changesets @repository.fetch_changesets
assert_equal 14, @repository.changesets.count assert_equal 15, @repository.changesets.count
end end
else else
puts "Git test repository NOT FOUND. Skipping unit tests !!!" puts "Git test repository NOT FOUND. Skipping unit tests !!!"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment