py3: compare response of crecord's confirmationwindow with str stable
authorDenis Laxalde <denis.laxalde@logilab.fr>
Wed, 06 Nov 2019 17:12:13 +0100
branchstable
changeset 43458 117b41b1859d
parent 43457 92e24a139ecc
child 43459 7cc913396f8c
py3: compare response of crecord's confirmationwindow with str confirmationwindow() returns a native string, as a result of calling chr() on getch(). On Python 3, response.lower().startswith(b"y") leads to a TypeError. This fixes a crash when typing "r" in the curses interface of interactive commit.
mercurial/crecord.py
--- a/mercurial/crecord.py	Thu Nov 07 08:58:26 2019 +0100
+++ b/mercurial/crecord.py	Wed Nov 06 17:12:13 2019 +0100
@@ -1741,8 +1741,8 @@
         with self.ui.timeblockedsection(b'crecord'):
             response = self.confirmationwindow(confirmtext)
         if response is None:
-            response = b"n"
-        if response.lower().startswith(b"y"):
+            response = "n"
+        if response.lower().startswith("y"):
             return True
         else:
             return False