# HG changeset patch # User Yuya Nishihara # Date 1529135798 -32400 # Node ID 5cb39a368c803683fd8bc944480486a618ab785a # Parent c924e7dbcd0ff8bf2f7ab9e5bde5f6679d70a894 py3: cast bytes encoding name to str in fileset.py diff -r c924e7dbcd0f -r 5cb39a368c80 mercurial/fileset.py --- a/mercurial/fileset.py Thu Jun 14 15:12:28 2018 -0700 +++ b/mercurial/fileset.py Sat Jun 16 16:56:38 2018 +0900 @@ -427,7 +427,7 @@ for f in mctx.existing(): d = mctx.ctx[f].data() try: - d.decode(enc) + d.decode(pycompat.sysstr(enc)) except LookupError: raise error.Abort(_("unknown encoding '%s'") % enc) except UnicodeDecodeError: