diff options
| author | Ben Keene <seraphire@gmail.com> | 2020-02-11 18:57:58 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-02-11 12:04:05 -0800 |
| commit | 6b602a2f97bbf27c8858643efeabce23195414cb (patch) | |
| tree | f766946e9dbc9f1f68b35a51a525fc0b53c55be1 | |
| parent | d0654dc308b0ba76dd8ed7bbb33c8d8f7aacd783 (diff) | |
| download | git-6b602a2f97bbf27c8858643efeabce23195414cb.tar.gz | |
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 <seraphire@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | git-p4.py | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -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] |