Mercurial > hg > soundsoftware-site

changeset 924:18beae6cb226 cannam_integration

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from branch "cannam"
author Chris Cannam
date Tue, 13 Mar 2012 16:34:52 +0000
parents 39c318bf7263 (current diff) bd2afdf7e446 (diff)
children b73a59a6acbd 9ee5fd0b9bd3 027cc0f5d4a2
files lib/redmine/scm/adapters/abstract_adapter.rb
diffstat 1 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/lib/redmine/scm/adapters/abstract_adapter.rb	Tue Mar 06 14:21:25 2012 +0000
+++ b/lib/redmine/scm/adapters/abstract_adapter.rb	Tue Mar 13 16:34:52 2012 +0000
@@ -262,7 +262,12 @@
 
         def scm_iconv(to, from, str)
           return nil if str.nil?
-          return str if to == from
+          # bug 446: non-utf8 paths in repositories blow up repo viewer and reposman
+          # -- Remove this short-circuit: we want the conversion to
+          #    happen always, so we can trap the error here if the
+          #    source text happens not to be in the advertised
+          #    encoding (instead of having the database blow up later)
+#          return str if to == from
           begin
             Iconv.conv(to, from, str)
           rescue Iconv::Failure => err