--- a/mercurial/dispatch.py	Mon Dec 12 08:01:52 2016 +0000
+++ b/mercurial/dispatch.py	Tue Dec 13 20:53:40 2016 +0530
@@ -803,7 +803,8 @@
 
         msg = ' '.join(' ' in a and repr(a) or a for a in fullargs)
         ui.log("command", '%s\n', msg)
-        d = lambda: util.checksignature(func)(ui, *args, **cmdoptions)
+        strcmdopt = pycompat.strkwargs(cmdoptions)
+        d = lambda: util.checksignature(func)(ui, *args, **strcmdopt)
         try:
             return runcommand(lui, repo, cmd, fullargs, ui, options, d,
                               cmdpats, cmdoptions)