--- a/mercurial/encoding.py	Wed Apr 01 00:29:22 2015 -0700
+++ b/mercurial/encoding.py	Wed Apr 01 00:30:41 2015 -0700
@@ -338,7 +338,9 @@
     try:
         return asciiupper(s)
     except UnicodeDecodeError:
-        pass
+        return upperfallback(s)
+
+def upperfallback(s):
     try:
         if isinstance(s, localstr):
             u = s._utf8.decode("utf-8")