# HG changeset patch
# User Augie Fackler <augie@google.com>
# Date 1520197875 18000
# Node ID ef345f9e42955460d877fb1a5d6d5798a4553071
# Parent  b77ff4fbe9ad2a27454f0edc9a9772bbc3128b28
transaction: fix an error string with bytestr() on a repr()d value

Fixes test-rollback.t on Python 3.

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

diff -r b77ff4fbe9ad -r ef345f9e4295 contrib/python3-whitelist
--- a/contrib/python3-whitelist	Sun Mar 04 16:23:10 2018 -0500
+++ b/contrib/python3-whitelist	Sun Mar 04 16:11:15 2018 -0500
@@ -347,6 +347,7 @@
 test-revlog-packentry.t
 test-revset-dirstate-parents.t
 test-revset-outgoing.t
+test-rollback.t
 test-run-tests.py
 test-schemes.t
 test-serve.t
diff -r b77ff4fbe9ad -r ef345f9e4295 mercurial/transaction.py
--- a/mercurial/transaction.py	Sun Mar 04 16:23:10 2018 -0500
+++ b/mercurial/transaction.py	Sun Mar 04 16:11:15 2018 -0500
@@ -18,6 +18,7 @@
 from .i18n import _
 from . import (
     error,
+    pycompat,
     util,
 )
 
@@ -604,7 +605,8 @@
             f, o = l.split('\0')
             entries.append((f, int(o), None))
         except ValueError:
-            report(_("couldn't read journal entry %r!\n") % l)
+            report(
+                _("couldn't read journal entry %r!\n") % pycompat.bytestr(l))
 
     backupjournal = "%s.backupfiles" % file
     if opener.exists(backupjournal):