--- a/mercurial/commands.py	Tue Nov 24 22:58:40 2015 +0900
+++ b/mercurial/commands.py	Tue Nov 24 23:03:54 2015 +0900
@@ -23,6 +23,7 @@
 import phases, obsolete, exchange, bundle2, repair, lock as lockmod
 import ui as uimod
 import streamclone
+import commandserver
 
 table = {}
 
@@ -6184,7 +6185,6 @@
         s.serve_forever()
 
     if opts["cmdserver"]:
-        import commandserver
         service = commandserver.createservice(ui, repo, opts)
     else:
         service = hgweb.createservice(ui, repo, opts)