Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 747a0ff

Browse files
committed
apveyor, #519: FIX incomplete Popen pump
+ The code in `_read_lines_from_fno()` was reading the stream only once per invocation, so when input was larger than `mmap.PAGESIZE`, bytes were forgotten in the stream. + Replaced buffer-banging code with iterate-on-file-descriptors. + Also set deamon-threads.
1 parent d12fdca commit 747a0ff

File tree

2 files changed

+16
-4
lines changed

2 files changed

+16
-4
lines changed

‎git/cmd.py

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -193,14 +193,24 @@ def _deplete_buffer(fno, handler, buf_list, wg=None):
193193
else:
194194
# Oh ... probably we are on windows. select.select() can only handle sockets, we have files
195195
# The only reliable way to do this now is to use threads and wait for both to finish
196+
def _handle_lines(fd, handler, wg):
197+
for line in fd:
198+
line = line.decode(defenc)
199+
if line and handler:
200+
handler(line)
201+
if wg:
202+
wg.done()
203+
196204
# Since the finalizer is expected to wait, we don't have to introduce our own wait primitive
197205
# NO: It's not enough unfortunately, and we will have to sync the threads
198206
wg = WaitGroup()
199-
for fno, (handler, buf_list) in fdmap.items():
207+
for fd, handler in zip((process.stdout, process.stderr),
208+
(stdout_handler, stderr_handler)):
200209
wg.add(1)
201-
t = threading.Thread(target=lambda: _deplete_buffer(fno, handler, buf_list, wg))
210+
t = threading.Thread(target=_handle_lines, args=(fd, handler, wg))
211+
t.setDaemon(True)
202212
t.start()
203-
# end
213+
204214
# NOTE: Just joining threads can possibly fail as there is a gap between .start() and when it's
205215
# actually started, which could make the wait() call to just return because the thread is not yet
206216
# active

‎git/test/test_git.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,9 @@ def counter_stderr(line):
238238
stdin=None,
239239
stdout=subprocess.PIPE,
240240
stderr=subprocess.PIPE,
241-
shell=False)
241+
shell=False,
242+
creationflags=Git.CREATE_NO_WINDOW if sys.platform == 'win32' else 0,
243+
)
242244

243245
handle_process_output(proc, counter_stdout, counter_stderr, lambda proc: proc.wait())
244246

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /