Mercurial > hg-stable

changeset 36792:e3732c3ab92d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: fix type of default username
author Yuya Nishihara <yuya@tcha.org>
date Sun, 04 Mar 2018 18:34:46 -0500
parents 1fbbb8e83392
children e2c0c0884b1f
files contrib/python3-whitelist mercurial/ui.py
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/contrib/python3-whitelist	Sun Mar 04 18:21:16 2018 -0500
+++ b/contrib/python3-whitelist	Sun Mar 04 18:34:46 2018 -0500
@@ -48,6 +48,7 @@
 test-commit-amend.t
 test-commit-unresolved.t
 test-commit.t
+test-committer.t
 test-completion.t
 test-config-env.py
 test-config.t
--- a/mercurial/ui.py	Sun Mar 04 18:21:16 2018 -0500
+++ b/mercurial/ui.py	Sun Mar 04 18:34:46 2018 -0500
@@ -800,7 +800,8 @@
             user = self.prompt(_("enter a commit username:"), default=None)
         if user is None and not self.interactive():
             try:
-                user = '%s@%s' % (util.getuser(), socket.getfqdn())
+                user = '%s@%s' % (util.getuser(),
+                                  encoding.strtolocal(socket.getfqdn()))
                 self.warn(_("no username found, using '%s' instead\n") % user)
             except KeyError:
                 pass