From 6b602a2f97bbf27c8858643efeabce23195414cb Mon Sep 17 00:00:00 2001 From: Ben Keene Date: Tue, 11 Feb 2020 18:57:58 +0000 Subject: git-p4: rewrite prompt to be Windows compatible The existing function prompt(prompt_text) does not work correctly when run on Windows 10 bash terminal when launched from the sourcetree GUI application. The stdout is not flushed properly so the prompt text is not displayed to the user until the next flush of stdout, which is quite confusing. Change this method by: * Adding flush to stderr, stdout, and stdin * Use readline from sys.stdin instead of raw_input. The existing strip().lower() are retained. Signed-off-by: Ben Keene Signed-off-by: Junio C Hamano --- git-p4.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'git-p4.py') diff --git a/git-p4.py b/git-p4.py index 40d9e7c594..65b6d4dca0 100755 --- a/git-p4.py +++ b/git-p4.py @@ -175,7 +175,10 @@ def prompt(prompt_text): """ choices = set(m.group(1) for m in re.finditer(r"\[(.)\]", prompt_text)) while True: - response = raw_input(prompt_text).strip().lower() + sys.stderr.flush() + sys.stdout.write(prompt_text) + sys.stdout.flush() + response=sys.stdin.readline().strip().lower() if not response: continue response = response[0] -- cgit v1.2.3