merge with crew-stable

mercurial/templater.py

@@ -203,7 +203,7 b' def nl2br(text):'
     return text.replace('\n', '<br/>\n')
 
 def obfuscate(text):
-    text = unicode(text, 'utf-8', 'replace')
+    text = unicode(text, util._encoding, 'replace')
     return ''.join(['&#%d;' % ord(c) for c in text])
 
 def domain(author):

mercurial/util.py

@@ -500,6 +500,9 b' def system(cmd, environ={}, cwd=None, on'
         oldenv[k] = os.environ.get(k)
     if cwd is not None:
         oldcwd = os.getcwd()
+    origcmd = cmd
+    if os.name == 'nt':
+        cmd = '"%s"' % cmd
     try:
         for k, v in environ.iteritems():
             os.environ[k] = py2shell(v)
@@ -507,7 +510,7 b' def system(cmd, environ={}, cwd=None, on'
             os.chdir(cwd)
         rc = os.system(cmd)
         if rc and onerr:
-            errmsg = '%s %s' % (os.path.basename(cmd.split(None, 1)[0]),
+            errmsg = '%s %s' % (os.path.basename(origcmd.split(None, 1)[0]),
                                 explain_exit(rc)[0])
             if errprefix:
                 errmsg = '%s: %s' % (errprefix, errmsg)