Mercurial > hg

diff mercurial/commands.py @ 36422:04c319a07c7b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: hunt down str(exception) instances and use util.forcebytestr I decided to grep around for \sstr\( and see what low-hanging fruit that showed me. This was part of that hunt. That grep pattern still has some things worth exploring. Differential Revision: https://phab.mercurial-scm.org/D2440
author Augie Fackler <augie@google.com>
date Sun, 25 Feb 2018 23:08:41 -0500
parents 199443c55463
children ab5f18a9dcac
line wrap: on
line diff
--- a/mercurial/commands.py	Sun Feb 25 22:30:14 2018 -0500
+++ b/mercurial/commands.py	Sun Feb 25 23:08:41 2018 -0500
@@ -3899,7 +3899,7 @@
         try:
             return hg.updatetotally(ui, repo, checkout, brev)
         except error.UpdateAbort as inst:
-            msg = _("not updating: %s") % str(inst)
+            msg = _("not updating: %s") % util.forcebytestr(inst)
             hint = inst.hint
             raise error.UpdateAbort(msg, hint=hint)
     if modheads > 1: