This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11240

windows: avoid a bytes vs unicode crash reading passwords on py2
AbandonedPublic

Authored by Alphare on Aug 2 2021, 11:00 AM.

Details

Reviewers
marmoute
mharbison72
Group Reviewers
hg-reviewers
Summary

This broke in 5b3513177f2b. Specifically, after typing in the password on py2,
it would crash with:

TypeError: putwch() argument 1 must be cannot convert raw buffers, not str

Diff Detail

Repository
rHG Mercurial
Branch
stable
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

mharbison72 created this revision.Aug 2 2021, 11:00 AM
marmoute accepted this revision.Aug 2 2021, 2:23 PM
marmoute added a subscriber: marmoute.

seems fine. I assume this needs to go to stable.

mharbison72 added a comment.Aug 2 2021, 8:54 PM

This got published as 064cd182555f, without the differential URL. Probably another reviewer needs to accept/close it, because that's not an option for me.

Alphare added a reviewer: mharbison72.Aug 5 2021, 3:25 AM
Alphare commandeered this revision.
Alphare abandoned this revision.

This was taken and is now public.

Revision Contents
Changeset List

PathPackages
Mmercurial/windows.py (14 lines)

Diff 29771

mercurial/windows.py

def get_password(): def get_password():
"""Prompt for password with echo off, using Windows getch(). """Prompt for password with echo off, using Windows getch().
This shouldn't be called directly- use ``ui.getpass()`` instead, which This shouldn't be called directly- use ``ui.getpass()`` instead, which
checks if the session is interactive first. checks if the session is interactive first.
""" """
pw = "" pw = u""
while True: while True:
c = msvcrt.getwch() # pytype: disable=module-attr c = msvcrt.getwch() # pytype: disable=module-attr
if c == '\r' or c == '\n': if c == u'\r' or c == u'\n':
break break
if c == '\003': if c == u'\003':
raise KeyboardInterrupt raise KeyboardInterrupt
if c == '\b': if c == u'\b':
pw = pw[:-1] pw = pw[:-1]
else: else:
pw = pw + c pw = pw + c
msvcrt.putwch('\r') # pytype: disable=module-attr msvcrt.putwch(u'\r') # pytype: disable=module-attr
msvcrt.putwch('\n') # pytype: disable=module-attr msvcrt.putwch(u'\n') # pytype: disable=module-attr
return encoding.strtolocal(pw) return encoding.unitolocal(pw)
class winstdout(object): class winstdout(object):
"""Some files on Windows misbehave. """Some files on Windows misbehave.
When writing to a broken pipe, EINVAL instead of EPIPE may be raised. When writing to a broken pipe, EINVAL instead of EPIPE may be raised.
When writing too many bytes to a console at the same, a "Not enough space" When writing too many bytes to a console at the same, a "Not enough space"