diff mercurial/changelog.py @ 44661:e147748f750b

merge with stable

--- a/mercurial/changelog.py	Sun Mar 29 01:57:17 2020 +0900
+++ b/mercurial/changelog.py	Thu Apr 02 21:58:10 2020 +0530
@@ -82,10 +82,7 @@
 
 def encodeextra(d):
     # keys must be sorted to produce a deterministic changelog entry
-    items = [
-        _string_escape(b'%s:%s' % (k, pycompat.bytestr(d[k])))
-        for k in sorted(d)
-    ]
+    items = [_string_escape(b'%s:%s' % (k, d[k])) for k in sorted(d)]
     return b"\0".join(items)