diff -r 138ab7c6a6ff -r f70f61a8c5bc mercurial/encoding.py --- a/mercurial/encoding.py Wed Jul 10 17:16:19 2024 -0400 +++ b/mercurial/encoding.py Wed Jul 10 17:37:35 2024 -0400 @@ -103,14 +103,15 @@ if pycompat.iswindows: _encodingrewrites[b'cp65001'] = b'utf-8' +encoding: bytes = b'' # help pytype avoid seeing None value try: - encoding = environ.get(b"HGENCODING") + encoding = environ.get(b"HGENCODING", b'') if not encoding: encoding = locale.getpreferredencoding().encode('ascii') or b'ascii' encoding = _encodingrewrites.get(encoding, encoding) except locale.Error: encoding = b'ascii' -encodingmode = environ.get(b"HGENCODINGMODE", b"strict") +encodingmode: bytes = environ.get(b"HGENCODINGMODE", b"strict") fallbackencoding = b'ISO-8859-1'