--- a/mercurial/commandserver.py	Mon Sep 24 22:46:22 2018 -0400
+++ b/mercurial/commandserver.py	Fri Sep 21 19:48:23 2018 -0400
@@ -26,7 +26,6 @@
 from . import (
     encoding,
     error,
-    pycompat,
     util,
 )
 from .utils import (
@@ -161,7 +160,7 @@
     based stream to fout.
     """
     def __init__(self, ui, repo, fin, fout):
-        self.cwd = pycompat.getcwd()
+        self.cwd = encoding.getcwd()
 
         # developer config: cmdserver.log
         logpath = ui.config("cmdserver", "log")