# HG changeset patch # User FUJIWARA Katsunori # Date 1366890529 -32400 # Node ID be207d9b7e4bc222f4ba72ad9a266df83d939ca4 # Parent 70675d77fd4a78d3e57723550d9f3031345d38e4 i18n: show the non-ASCII password prompt text correctly Before this patch, the prompt text for asking password is directly passed to "getpass.getpass()" of Python standard library. In "getpass.getpass()" implementation on Windows environment, the prompt text is split into byte sequence and "msvcrt.putch()" is applied on each bytes in it. This splitting causes non-ASCII prompt text to be broken. This patch shows the prompt text for asking password on "ui.getpass()" side, and invokes "getpass.getpass()" with empty prompt text. This prevents non-ASCII prompt text from being broken in "getpass.getpass()" implementation. This patch also sets "ui.prompt" label to prompt text to follow "ui.prompt()" style. diff -r 70675d77fd4a -r be207d9b7e4b mercurial/ui.py --- a/mercurial/ui.py Tue Apr 23 17:26:00 2013 -0500 +++ b/mercurial/ui.py Thu Apr 25 20:48:49 2013 +0900 @@ -663,7 +663,8 @@ if not self.interactive(): return default try: - return getpass.getpass(prompt or _('password: ')) + self.write(self.label(prompt or _('password: '), 'ui.prompt')) + return getpass.getpass('') except EOFError: raise util.Abort(_('response expected')) def status(self, *msg, **opts):