Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
subrepo: use util.forcebytestr() instead of str() on exception
authorAugie Fackler <augie@google.com>
Sun, 25 Feb 2018 22:30:14 -0500
changeset 36421 1df7e7b8558e
parent 36420 a39126a40be6
child 36422 04c319a07c7b
subrepo: use util.forcebytestr() instead of str() on exception Differential Revision: https://phab.mercurial-scm.org/D2437
mercurial/subrepo.py file | annotate | diff | comparison | revisions 
--- a/mercurial/subrepo.py	Sun Feb 25 22:29:28 2018 -0500
+++ b/mercurial/subrepo.py	Sun Feb 25 22:30:14 2018 -0500
@@ -73,7 +73,8 @@
             raise ex
         except error.Abort as ex:
             subrepo = subrelpath(self)
-            errormsg = str(ex) + ' ' + _('(in subrepository "%s")') % subrepo
+            errormsg = (util.forcebytestr(ex) + ' '
+                        + _('(in subrepository "%s")') % subrepo)
             # avoid handling this exception by raising a SubrepoAbort exception
             raise SubrepoAbort(errormsg, hint=ex.hint, subrepo=subrepo,
                                cause=sys.exc_info())
Mercurial