diff -r ef54bd33b476 -r 55e8da487b8a mercurial/wireprotov1peer.py
--- a/mercurial/wireprotov1peer.py	Tue Dec 04 11:05:06 2018 +0100
+++ b/mercurial/wireprotov1peer.py	Mon Dec 24 14:04:16 2018 -0500
@@ -240,13 +240,16 @@
 
             # Encoded arguments and future holding remote result.
             try:
-                encodedargs, fremote = next(batchable)
+                encargsorres, fremote = next(batchable)
             except Exception:
                 pycompat.future_set_exception_info(f, sys.exc_info()[1:])
                 return
 
-            requests.append((command, encodedargs))
-            states.append((command, f, batchable, fremote))
+            if not fremote:
+                f.set_result(encargsorres)
+            else:
+                requests.append((command, encargsorres))
+                states.append((command, f, batchable, fremote))
 
         if not requests:
             return