--- a/mercurial/commands.py	Sat Sep 27 14:52:09 2014 +0900
+++ b/mercurial/commands.py	Sat Sep 27 15:04:46 2014 +0900
@@ -5536,7 +5536,7 @@
         s.serve_forever()
 
     if opts["cmdserver"]:
-        service = commandserver.pipeservice(ui, repo, opts)
+        service = commandserver.createservice(ui, repo, opts)
         return cmdutil.service(opts, initfn=service.init, runfn=service.run)
 
     # this way we can check if something was given in the command-line