D2545: scmutil: fix a repr in an error message on Python 3

durin42 (Augie Fackler) phabricator at mercurial-scm.org
Fri Mar 2 11:18:54 EST 2018


This revision was automatically updated to reflect the committed changes.
Closed by commit rHGbb5f5c1c3c1b: scmutil: fix a repr in an error message on Python 3 (authored by durin42, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D2545?vs=6338&id=6358

REVISION DETAIL
  https://phab.mercurial-scm.org/D2545

AFFECTED FILES
  mercurial/scmutil.py

CHANGE DETAILS

diff --git a/mercurial/scmutil.py b/mercurial/scmutil.py
--- a/mercurial/scmutil.py
+++ b/mercurial/scmutil.py
@@ -261,7 +261,8 @@
         raise error.Abort(_("the name '%s' is reserved") % lbl)
     for c in (':', '\0', '\n', '\r'):
         if c in lbl:
-            raise error.Abort(_("%r cannot be used in a name") % c)
+            raise error.Abort(
+                _("%r cannot be used in a name") % pycompat.bytestr(c))
     try:
         int(lbl)
         raise error.Abort(_("cannot use an integer as a name"))



To: durin42, #hg-reviewers
Cc: mercurial-devel


More information about the Mercurial-devel mailing list