Mercurial Mercurial > hg-stable / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: use pycompat.bytestr to convert str to bytes
authorPulkit Goyal <7895pulkit@gmail.com>
Wed, 14 Feb 2018 16:37:46 +0530
changeset 36266 ddeb7653b31c
parent 36265 69080ee1fb0e
child 36267 6ea0b78ddcac
py3: use pycompat.bytestr to convert str to bytes Differential Revision: https://phab.mercurial-scm.org/D2261
mercurial/changelog.py file | annotate | diff | comparison | revisions
mercurial/ui.py file | annotate | diff | comparison | revisions 
--- a/mercurial/changelog.py	Mon Feb 12 10:41:00 2018 -0500
+++ b/mercurial/changelog.py	Wed Feb 14 16:37:46 2018 +0530
@@ -20,6 +20,7 @@
 from . import (
     encoding,
     error,
+    pycompat,
     revlog,
     util,
 )
@@ -517,8 +518,8 @@
         if not user:
             raise error.RevlogError(_("empty username"))
         if "\n" in user:
-            raise error.RevlogError(_("username %s contains a newline")
-                                    % repr(user))
+            raise error.RevlogError(_("username %r contains a newline")
+                                    % pycompat.bytestr(user))
 
         desc = stripdesc(desc)
 
--- a/mercurial/ui.py	Mon Feb 12 10:41:00 2018 -0500
+++ b/mercurial/ui.py	Wed Feb 14 16:37:46 2018 +0530
@@ -808,8 +808,8 @@
                              hint=_("use 'hg config --edit' "
                                     'to set your username'))
         if "\n" in user:
-            raise error.Abort(_("username %s contains a newline\n")
-                              % repr(user))
+            raise error.Abort(_("username %r contains a newline\n")
+                              % pycompat.bytestr(user))
         return user
 
     def shortuser(self, user):
hg-stable