Mercurial > hg
changeset 36569:bb5f5c1c3c1b
scmutil: fix a repr in an error message on Python 3
Differential Revision: https://phab.mercurial-scm.org/D2545
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Fri, 02 Mar 2018 00:19:30 -0500 |
| parents | a5eefc9cccc5 |
| children | 4df06d2f60e1 |
| files | mercurial/scmutil.py |
| diffstat | 1 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/scmutil.py Fri Mar 02 00:19:16 2018 -0500 +++ b/mercurial/scmutil.py Fri Mar 02 00:19:30 2018 -0500 @@ -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"))