Patchwork D2261: py3: use pycompat.bytestr to convert str to bytes

login
register
mail settings
Submitter phabricator
Date Feb. 14, 2018, 4:26 p.m.
Message ID <e265f13ec1f140a2dfe9e62562a7ced1@localhost.localdomain>
Download mbox | patch
Permalink /patch/27933/
State Not Applicable
Headers show

Comments

phabricator - Feb. 14, 2018, 4:26 p.m.
pulkit updated this revision to Diff 5726.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D2261?vs=5701&id=5726

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

AFFECTED FILES
  mercurial/changelog.py
  mercurial/ui.py

CHANGE DETAILS




To: pulkit, #hg-reviewers, yuja
Cc: yuja, mercurial-devel

Patch

diff --git a/mercurial/ui.py b/mercurial/ui.py
--- a/mercurial/ui.py
+++ b/mercurial/ui.py
@@ -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):
diff --git a/mercurial/changelog.py b/mercurial/changelog.py
--- a/mercurial/changelog.py
+++ b/mercurial/changelog.py
@@ -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)