Mercurial > hg > soundsoftware-site

changeset 925:5bf2b9fac683 luisf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge from live
author luisf <luis.figueira@eecs.qmul.ac.uk>
date Fri, 11 May 2012 15:58:58 +0100
parents 154205fd9f8b (current diff) ad295b270cd4 (diff)
children b73a59a6acbd
files
diffstat 1 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/lib/redmine/scm/adapters/abstract_adapter.rb	Thu Feb 02 17:06:23 2012 +0000
+++ b/lib/redmine/scm/adapters/abstract_adapter.rb	Fri May 11 15:58:58 2012 +0100
@@ -242,7 +242,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