diff -r 94c25f694ec3 -r 24e493ec2229 mercurial/dispatch.py
--- a/mercurial/dispatch.py	Mon Sep 24 22:46:22 2018 -0400
+++ b/mercurial/dispatch.py	Fri Sep 21 19:48:23 2018 -0400
@@ -748,7 +748,7 @@
     """
     if wd is None:
         try:
-            wd = pycompat.getcwd()
+            wd = encoding.getcwd()
         except OSError as e:
             raise error.Abort(_("error getting current working directory: %s") %
                               encoding.strtolocal(e.strerror))
@@ -968,7 +968,7 @@
                         if not path:
                             raise error.RepoError(_("no repository found in"
                                                     " '%s' (.hg not found)")
-                                                  % pycompat.getcwd())
+                                                  % encoding.getcwd())
                         raise
             if repo:
                 ui = repo.ui