--- a/mercurial/commandserver.py	Sun May 22 13:53:32 2016 +0900
+++ b/mercurial/commandserver.py	Sat Jul 16 14:46:31 2016 +0900
@@ -484,7 +484,7 @@
                     conn.close()  # release handle in parent process
             else:
                 try:
-                    self._serveworker(conn)
+                    self._runworker(conn)
                     conn.close()
                     os._exit(0)
                 except:  # never return, hence no re-raises
@@ -514,7 +514,7 @@
             self.ui.debug('worker process exited (pid=%d)\n' % pid)
             self._workerpids.discard(pid)
 
-    def _serveworker(self, conn):
+    def _runworker(self, conn):
         signal.signal(signal.SIGCHLD, self._oldsigchldhandler)
         _initworkerprocess()
         h = self._servicehandler