--- a/hgext/fastannotate/commands.py	Mon Sep 24 22:46:22 2018 -0400
+++ b/hgext/fastannotate/commands.py	Fri Sep 21 19:48:23 2018 -0400
@@ -12,6 +12,7 @@
 from mercurial.i18n import _
 from mercurial import (
     commands,
+    encoding,
     error,
     extensions,
     patch,
@@ -41,7 +42,7 @@
     if perfhack:
         # cwd related to reporoot
         reporoot = os.path.dirname(repo.path)
-        reldir = os.path.relpath(pycompat.getcwd(), reporoot)
+        reldir = os.path.relpath(encoding.getcwd(), reporoot)
         if reldir == '.':
             reldir = ''
         if any(opts.get(o[1]) for o in commands.walkopts): # a)