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

2018-03-02 Thread durin42 (Augie Fackler) 
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
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

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

2018-03-02 Thread durin42 (Augie Fackler) 
durin42 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REPOSITORY
  rHG Mercurial

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
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel