mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-01 19:26:10 +02:00
Code

git-p4: encode/decode communication with git for python3 

Under python3, calls to write() on the stream to `git fast-import` must
be encoded.  This patch wraps the IO object such that this encoding is
done transparently.

Conversely, any text data read from subprocesses must also be decoded
before running through the rest of the pipeline.

Signed-off-by: Yang Zhao <yang.zhao@skyboxlabs.com>
Reviewed-by: Ben Keene <seraphire@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Yang Zhao 2019-12-13 15:52:39 -08:00 committed by Junio C Hamano
parent 6cec21a82f
commit 86dca24b7b
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
git-p4.py
View File

@ -183,10 +183,12 @@ def read_pipe_full(c):
(out, err) = p.communicate() (out, err) = p.communicate()
return (p.returncode, out, decode_text_stream(err)) return (p.returncode, out, decode_text_stream(err))
def read_pipe(c, ignore_error=False): def read_pipe(c, ignore_error=False, raw=False):
""" Read output from command. Returns the output text on """ Read output from command. Returns the output text on
success. On failure, terminates execution, unless success. On failure, terminates execution, unless
ignore_error is True, when it returns an empty string. ignore_error is True, when it returns an empty string.
If raw is True, do not attempt to decode output text.
""" """
(retcode, out, err) = read_pipe_full(c) (retcode, out, err) = read_pipe_full(c)
if retcode != 0: if retcode != 0:
@ -194,6 +196,8 @@ def read_pipe(c, ignore_error=False):
out = "" out = ""
else: else:
die('Command failed: %s\nError: %s' % (str(c), err)) die('Command failed: %s\nError: %s' % (str(c), err))
if not raw:
out = decode_text_stream(out)
return out return out
def read_pipe_text(c): def read_pipe_text(c):
@ -220,7 +224,6 @@ def read_pipe_lines(c):
val = [decode_text_stream(line) for line in pipe.readlines()] val = [decode_text_stream(line) for line in pipe.readlines()]
if pipe.close() or p.wait(): if pipe.close() or p.wait():
die('Command failed: %s' % str(c)) die('Command failed: %s' % str(c))
return val return val
def p4_read_pipe_lines(c): def p4_read_pipe_lines(c):
@ -616,7 +619,8 @@ def p4CmdList(cmd, stdin=None, stdin_mode='w+b', cb=None, skip_info=False,
stdin_file.write(stdin) stdin_file.write(stdin)
else: else:
for i in stdin: for i in stdin:
stdin_file.write(i + '\n') stdin_file.write(encode_text_stream(i))
stdin_file.write(b'\n')
stdin_file.flush() stdin_file.flush()
stdin_file.seek(0) stdin_file.seek(0)
@ -1245,7 +1249,7 @@ def generatePointer(self, contentFile):
['git', 'lfs', 'pointer', '--file=' + contentFile], ['git', 'lfs', 'pointer', '--file=' + contentFile],
stdout=subprocess.PIPE stdout=subprocess.PIPE
) )
pointerFile = pointerProcess.stdout.read() pointerFile = decode_text_stream(pointerProcess.stdout.read())
if pointerProcess.wait(): if pointerProcess.wait():
os.remove(contentFile) os.remove(contentFile)
die('git-lfs pointer command failed. Did you install the extension?') die('git-lfs pointer command failed. Did you install the extension?')
@ -3538,6 +3542,15 @@ def openStreams(self):
self.gitStream = self.importProcess.stdin self.gitStream = self.importProcess.stdin
self.gitError = self.importProcess.stderr self.gitError = self.importProcess.stderr
if bytes is not str:
# Wrap gitStream.write() so that it can be called using `str` arguments
def make_encoded_write(write):
def encoded_write(s):
return write(s.encode() if isinstance(s, str) else s)
return encoded_write
self.gitStream.write = make_encoded_write(self.gitStream.write)
def closeStreams(self): def closeStreams(self):
self.gitStream.close() self.gitStream.close()
if self.importProcess.wait() != 0: if self.importProcess.wait() != 0: