mercurial/dispatch.py

--- a/mercurial/dispatch.py	Sun Mar 19 12:44:45 2017 -0400
+++ b/mercurial/dispatch.py	Sun Mar 19 14:23:30 2017 -0400
@@ -92,13 +92,8 @@
     if inst.hint:
         write(_("(%s)\n") % inst.hint)
 
-def _mayberepr(a):
-    if ' ' in a:
-        return encoding.strtolocal(repr(a))
-    return a
-
 def _formatargs(args):
-    return ' '.join(_mayberepr(a) for a in args)
+    return ' '.join(util.shellquote(a) for a in args)
 
 def dispatch(req):
     "run the command specified in req.args"