Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ui: fix echo back of ui.prompt() to not concatenate None as bytes stable
authorYuya Nishihara <yuya@tcha.org>
Fri, 23 Oct 2020 20:10:17 +0900
branchstable
changeset 45758 14ac6a74e7e7
parent 45757 067707e026b4
child 45759 ff48eea4a926
ui: fix echo back of ui.prompt() to not concatenate None as bytes Spotted while writing tests for the issue6425. The default value may be None.
mercurial/ui.py file | annotate | diff | comparison | revisions 
--- a/mercurial/ui.py	Thu Oct 29 07:51:13 2020 +0100
+++ b/mercurial/ui.py	Fri Oct 23 20:10:17 2020 +0900
@@ -1659,7 +1659,9 @@
             if not r:
                 r = default
             if self.configbool(b'ui', b'promptecho'):
-                self._writemsg(self._fmsgout, r, b"\n", type=b'promptecho')
+                self._writemsg(
+                    self._fmsgout, r or b'', b"\n", type=b'promptecho'
+                )
             return r
         except EOFError:
             raise error.ResponseExpected()
mercurial