dinislage/redmine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scm: add feature of per project repository log encoding setting (#1735).

Browse Source 
Subversion, Mercurial and Git supports UTF-8 log.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4982 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA
2011-03-01 10:27:30 +00:00
parent c09b6edaf4
commit 5f5dec16f2
14 changed files with 63 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/unit/changeset_test.rb
+11 -10
View File
@@ -220,12 +220,13 @@ class ChangesetTest < ActiveSupport::TestCase
changeset = Changeset.find_by_revision('10')
assert_nil changeset.next
end
def test_comments_should_be_converted_to_utf8
with_settings :commit_logs_encoding => 'ISO-8859-1' do
proj = Project.find(3)
str = File.read("#{RAILS_ROOT}/test/fixtures/encoding/iso-8859-1.txt")
r = Repository::Bazaar.create!(:project => proj, :url => '/tmp/test/bazaar')
r = Repository::Bazaar.create!(
:project => proj, :url => '/tmp/test/bazaar',
:log_encoding => 'ISO-8859-1' )
assert r
c = Changeset.new(:repository => r,
:committed_on => Time.now,
@@ -234,14 +235,14 @@ class ChangesetTest < ActiveSupport::TestCase
:comments => str)
assert( c.save )
assert_equal "Texte encodé en ISO-8859-1.", c.comments
end
end
def test_invalid_utf8_sequences_in_comments_should_be_stripped
with_settings :commit_logs_encoding => 'UTF-8' do
proj = Project.find(3)
str = File.read("#{RAILS_ROOT}/test/fixtures/encoding/iso-8859-1.txt")
r = Repository::Bazaar.create!(:project => proj, :url => '/tmp/test/bazaar')
r = Repository::Bazaar.create!(
:project => proj, :url => '/tmp/test/bazaar',
:log_encoding => 'UTF-8' )
assert r
c = Changeset.new(:repository => r,
:committed_on => Time.now,
@@ -254,11 +255,9 @@ class ChangesetTest < ActiveSupport::TestCase
else
assert_equal "Texte encod en ISO-8859-1.", c.comments
end
end
end
def test_comments_should_be_converted_all_latin1_to_utf8
with_settings :commit_logs_encoding => 'ISO-8859-1' do
s1 = "\xC2\x80"
s2 = "\xc3\x82\xc2\x80"
if s1.respond_to?(:force_encoding)
@@ -271,7 +270,10 @@ class ChangesetTest < ActiveSupport::TestCase
assert_equal s3.encode('UTF-8'), s4
end
proj = Project.find(3)
r = Repository::Bazaar.create!(:project => proj, :url => '/tmp/test/bazaar')
r = Repository::Bazaar.create!(
:project => proj, :url => '/tmp/test/bazaar',
:log_encoding => 'ISO-8859-1' )
assert r
assert r
c = Changeset.new(:repository => r,
:committed_on => Time.now,
@@ -280,7 +282,6 @@ class ChangesetTest < ActiveSupport::TestCase
:comments => s1)
assert( c.save )
assert_equal s2, c.comments
end
end
def test_identifier
test/unit/helpers/application_helper_test.rb
+3 -1
View File
@@ -292,7 +292,9 @@ RAW
'commit:20080308225258-98289-abcd456efg.gz' => changeset_link,
}
@project = Project.find(3)
r = Repository::Darcs.create!(:project => @project, :url => '/tmp/test/darcs')
r = Repository::Darcs.create!(
:project => @project, :url => '/tmp/test/darcs',
:log_encoding => 'UTF-8')
assert r
c = Changeset.new(:repository => r,
:committed_on => Time.now,
test/unit/repository_bazaar_test.rb
+5 -2
View File
@@ -19,14 +19,17 @@ require File.expand_path('../../test_helper', __FILE__)
class RepositoryBazaarTest < ActiveSupport::TestCase
fixtures :projects
# No '..' in the repository path
REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/bazaar_repository'
REPOSITORY_PATH.gsub!(/\/+/, '/')
def setup
@project = Project.find(3)
assert @repository = Repository::Bazaar.create(:project => @project, :url => "file:///#{REPOSITORY_PATH}")
@repository = Repository::Bazaar.create(
:project => @project, :url => "file:///#{REPOSITORY_PATH}",
:log_encoding => 'UTF-8')
assert @repository
end
if File.directory?(REPOSITORY_PATH)
test/unit/repository_cvs_test.rb
+5 -3
View File
@@ -28,9 +28,11 @@ class RepositoryCvsTest < ActiveSupport::TestCase
def setup
@project = Project.find(3)
assert @repository = Repository::Cvs.create(:project => @project,
:root_url => REPOSITORY_PATH,
:url => MODULE_NAME)
@repository = Repository::Cvs.create(:project => @project,
:root_url => REPOSITORY_PATH,
:url => MODULE_NAME,
:log_encoding => 'UTF-8')
assert @repository
end
if File.directory?(REPOSITORY_PATH)
test/unit/repository_darcs_test.rb
+3 -1
View File
@@ -25,7 +25,9 @@ class RepositoryDarcsTest < ActiveSupport::TestCase
def setup
@project = Project.find(3)
@repository = Repository::Darcs.create(:project => @project, :url => REPOSITORY_PATH)
@repository = Repository::Darcs.create(
:project => @project, :url => REPOSITORY_PATH,
:log_encoding => 'UTF-8')
assert @repository
end
test/unit/repository_test.rb
+7 -4
View File
@@ -125,16 +125,19 @@ class RepositoryTest < ActiveSupport::TestCase
assert_not_equal( comment, changeset.comments )
assert_equal( 'This is a loooooooooooooooooooooooooooong comment', changeset.comments )
end
def test_for_urls_strip
repository = Repository::Cvs.create(:project => Project.find(4), :url => ' :pserver:login:password@host:/path/to/the/repository',
:root_url => 'foo ')
repository = Repository::Cvs.create(
:project => Project.find(4),
:url => ' :pserver:login:password@host:/path/to/the/repository',
:root_url => 'foo ',
:log_encoding => 'UTF-8')
assert repository.save
repository.reload
assert_equal ':pserver:login:password@host:/path/to/the/repository', repository.url
assert_equal 'foo', repository.root_url
end
def test_manual_user_mapping
assert_no_difference "Changeset.count(:conditions => 'user_id <> 2')" do
c = Changeset.create!(:repository => @repository, :committer => 'foo', :committed_on => Time.now, :revision => 100, :comments => 'Committed by foo.')