changeset 36735 | ef345f9e4295 |
parent 35832 | aad39713ef35 |
child 36819 | aff5996f3043 |
--- 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):