jro_apps/redmine Commit - r4842:06f078a8137a

scm: ignore log encoding setting in Subversion and Mercurial (#7597)....

Toshi MARUYAMA -

r4842:06f078a8137a

parent child

Context file:

r4842:06f078a8137a

Collapse all files

app/models/changeset.rb +13 -16

                 end
               end
-              def comments=(comment)
-                write_attribute(:comments, Changeset.normalize_comments(comment))
-              end
               def committed_on=(date)
                 self.commit_date = date
                 super
                 end
               end
-              def committer=(arg)
-                write_attribute(:committer, self.class.to_utf8(arg.to_s))
-              end
               def project
                 repository.project
               end
               end
               def before_create
-                self.user = repository.find_committer_user(committer)
+                self.committer = self.class.to_utf8(self.committer, repository.repo_log_encoding)
+                self.comments  = self.class.normalize_comments(self.comments, repository.repo_log_encoding)
+                self.user = repository.find_committer_user(self.committer)
               end
               def after_create
                 @next ||= Changeset.find(:first, :conditions => ['id > ? AND repository_id = ?', self.id, self.repository_id], :order => 'id ASC')
               end
-              # Strips and reencodes a commit log before insertion into the database
-              def self.normalize_comments(str)
-                to_utf8(str.to_s.strip)
-              end
               # Creates a new Change from it's common parameters
               def create_change(change)
                 Change.create(:changeset => self,
                 return @short_comments, @long_comments
               end
-              def self.to_utf8(str)
+              public
+              # Strips and reencodes a commit log before insertion into the database
+              def self.normalize_comments(str, encoding)
+                Changeset.to_utf8(str.to_s.strip, encoding)
+              end
+              private
+              def self.to_utf8(str, encoding)
                 return str if str.blank?
-                encoding = Setting.commit_logs_encoding.to_s.strip
                 unless encoding.blank? || encoding == 'UTF-8'
                   begin
                     str = Iconv.conv('UTF-8', encoding, str)

app/models/repository.rb +5 0

                 end
               end
+              def repo_log_encoding
+                encoding = Setting.commit_logs_encoding.to_s.strip
+                encoding.blank? ? 'UTF-8' : encoding
+              end
               # Fetches new changesets for all repositories of active projects
               # Can be called periodically by an external script
               # eg. ruby script/runner "Repository.fetch_changesets"

app/models/repository/cvs.rb +2 -1

                     tmp_time = revision.time.clone
                     unless changes.find_by_path_and_revision(
             	           scm.with_leading_slash(revision.paths[0][:path]), revision.paths[0][:revision])
+                      cmt = Changeset.normalize_comments(revision.message, repo_log_encoding)
                       cs = changesets.find(:first, :conditions=>{
                         :committed_on=>tmp_time - time_delta .. tmp_time + time_delta,
                         :committer=>revision.author,
-                        :comments=>Changeset.normalize_comments(revision.message)
+                        :comments=>cmt
                       })
                       # create a new changeset....

app/models/repository/mercurial.rb +4 0

                 'Mercurial'
               end
+              def repo_log_encoding
+                'UTF-8'
+              end
               # Returns the readable identifier for the given mercurial changeset
               def self.format_changeset_identifier(changeset)
                 "#{changeset.revision}:#{changeset.scmid}"

app/models/repository/subversion.rb +4 0

                 'Subversion'
               end
+              def repo_log_encoding
+                'UTF-8'
+              end
               def latest_changesets(path, rev, limit=10)
                 revisions = scm.revisions(path, rev, nil, :limit => limit)
                 revisions ? changesets.find_all_by_revision(revisions.collect(&:identifier), :order => "committed_on DESC", :include => :user) : []

test/unit/repository_subversion_test.rb +22 0

@@ -137,6 +137,28 class RepositorySubversionTest < ActiveSupport::TestCase
137	assert c.event_title.include?('123456789:')	137	assert c.event_title.include?('123456789:')
138	assert_equal '123456789', c.event_url[:rev]	138	assert_equal '123456789', c.event_url[:rev]
139	end	139	end
		140
		141	def test_log_encoding_ignore_setting
		142	with_settings :commit_logs_encoding => 'windows-1252' do
		143	s1 = "\xC2\x80"
		144	s2 = "\xc3\x82\xc2\x80"
		145	if s1.respond_to?(:force_encoding)
		146	s3 = s1
		147	s4 = s2
		148	s1.force_encoding('ASCII-8BIT')
		149	s2.force_encoding('ASCII-8BIT')
		150	s3.force_encoding('ISO-8859-1')
		151	s4.force_encoding('UTF-8')
		152	assert_equal s3.encode('UTF-8'), s4
		153	end
		154	c = Changeset.new(:repository => @repository,
		155	:comments=>s2,
		156	:revision=>'123',
		157	:committed_on => Time.now)
		158	assert c.save
		159	assert_equal s2, c.comments
		160	end
		161	end
140	else	162	else
141	puts "Subversion test repository NOT FOUND. Skipping unit tests !!!"	163	puts "Subversion test repository NOT FOUND. Skipping unit tests !!!"
142	def test_fake; assert true end	164	def test_fake; assert true end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages