--- a/mercurial/debugcommands.py Thu Mar 11 17:16:29 2021 -0500
+++ b/mercurial/debugcommands.py Thu Mar 11 17:27:31 2021 -0500
@@ -2041,7 +2041,9 @@
try:
manifest = m[store.lookup(n)]
except error.LookupError as e:
- raise error.Abort(e, hint=b"Check your manifest node id")
+ raise error.Abort(
+ bytes(e), hint=b"Check your manifest node id"
+ )
manifest.read() # stores revisision in cache too
return
@@ -2376,7 +2378,7 @@
tr.close()
except ValueError as exc:
raise error.Abort(
- _(b'bad obsmarker input: %s') % pycompat.bytestr(exc)
+ _(b'bad obsmarker input: %s') % stringutil.forcebytestr(exc)
)
finally:
tr.release()