diff -r 8b0fa4de0064 -r 5f2a8dabb0d8 mercurial/encoding.py --- a/mercurial/encoding.py Wed Nov 06 15:19:23 2019 -0500 +++ b/mercurial/encoding.py Wed Nov 06 15:13:23 2019 -0500 @@ -241,8 +241,15 @@ strfromlocal = unifromlocal strmethod = unimethod else: - strtolocal = pycompat.identity - strfromlocal = pycompat.identity + + def strtolocal(s): + # type: (str) -> bytes + return s + + def strfromlocal(s): + # type: (bytes) -> str + return s + strmethod = pycompat.identity if not _nativeenviron: