# HG changeset patch
# User Chris Cannam
# Date 1331656492 0
# Node ID 18beae6cb22658192982722025dd14001963f39a
# Parent  39c318bf726316e8f29fb63811b440e520c0bb2e# Parent  bd2afdf7e446fa6d8a1b873d8e16dc6bc166f789
Merge from branch "cannam"

diff -r 39c318bf7263 -r 18beae6cb226 lib/redmine/scm/adapters/abstract_adapter.rb
--- 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