# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 2020-03-26 01:50:40
# Node ID 2141427533d29f403283eb63d166c66fe48dc157
# Parent  bda050bc99874291aff4c4cc627626cde9b9fb81

py3: require values in changelog extras to be bytes

I don't know what happened here because b436059c1cca (py3: use
pycompat.bytestr() on extra values because it can be int, 2019-02-05)
came about b44a47214122 (py3: use string for "close" value in commit
extras, 2018-02-11). Whatever happened, we shouldn't need to convert
the values to bytes now. It's better to not convert because that might
cover up bugs where someone sets a unicode value in the extras and
that works until the unicode value happens to contain non-ascii (at
which point it will fail because `bytestr()` expects its argument to
be ascii if it's unicode).

Differential Revision: https://phab.mercurial-scm.org/D8332

diff --git a/mercurial/changelog.py b/mercurial/changelog.py
--- a/mercurial/changelog.py
+++ b/mercurial/changelog.py
@@ -82,10 +82,7 @@ def decodeextra(text):
 
 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)