Skip to content

(#140) bugfix: Pipes are only done from stdout to stdin #158

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sergiomb2 wants to merge 1 commit into
base: 0.4.x
Choose a base branch
from
Open

(#140) bugfix: Pipes are only done from stdout to stdin #158

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
77 changes: 35 additions & 42 deletions patchview/patchview-wrapper
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
#!/usr/bin/python3
# SPDX-License-Identifier: GPL-2.0-or-later
# -*- coding: utf-8 -*-
#
# SPDX-License-Identifier: GPL-2.0-or-later
#
# Copyright (C) 2015-2025 Sérgio Basto <sergio@serjux.com>
#
# This program is free software; you can redistribute it and/or modify it
Expand Down Expand Up @@ -54,60 +55,52 @@ parser = argparse.ArgumentParser()
parser.add_argument('-v', '--debug',
help='writes the commands that will be executed',
action='store_true')
parser.add_argument('git_args', nargs='*', default=[])
parser.add_argument('tool_args', nargs='*', default=[])
parser.add_argument('patchview_args', nargs=argparse.REMAINDER)
args, unknown = parser.parse_known_args()
largs = vars(args).get("git_args")
rargs = vars(args).get("patchview_args")
tool_args = args.tool_args
patchview_args = args.patchview_args + unknown

pipetoview = tool_cmd.endswith("view")
if pipetoview:
tool_cmd = tool_cmd[:-4]
patchview_cmd = ["filterdiff"] + patchview_args
else:
patchview_cmd = ["patchview"] + patchview_args

patchview_cmd = ["patchview"] + rargs + unknown
pipetoview = False
if tool_cmd.endswith("view"):
# pipeline: first_pipe | second_pipe | editor
tool_cmd = tool_cmd[:-4] # remove "view"
patchview_cmd = ["filterdiff"] + rargs + unknown
pipetoview = True
git_cmd = [tool, tool_cmd] + largs
vcs_cmd = [tool, tool_cmd] + tool_args
dest_cmd = [editor, "-R", "-"]

p1 = Popen(git_cmd, stdout=PIPE, env=enviro, cwd=workdir)
p2 = Popen(patchview_cmd, stdin=p1.stdout, stdout=PIPE, env=enviro, cwd=workdir)
if args.debug:
debug_str = "%s | %s" % (" ".join(vcs_cmd), " ".join(patchview_cmd))
if pipetoview:
debug_str += " | %s" % " ".join(dest_cmd)
sys.stderr.buffer.write((debug_str + "\n").encode())
sys.stderr.flush()

p1 = Popen(vcs_cmd, stdout=PIPE, env=enviro, cwd=workdir)
if pipetoview:
p2 = Popen(patchview_cmd, stdin=p1.stdout, stdout=PIPE, env=enviro, cwd=workdir)
else:
p2 = Popen(patchview_cmd, stdin=p1.stdout, env=enviro, cwd=workdir)

p1.wait()
stdout1, stderr1 = p1.communicate()
if p1.returncode != 0:
ret1 = p1.returncode
if ret1 != 0:
stdout1, _ = p1.communicate()
if stdout1:
sys.stdout.buffer.write(stdout1)
if stderr1:
sys.stderr.buffer.write(stderr1)
sys.exit(p1.returncode)
sys.exit(ret1)

p2.wait()
stdout2, stderr2 = p2.communicate()
if p2.returncode != 0:
ret2 = p2.returncode
if ret2 != 0:
stdout2, _ = p2.communicate()
if stdout2:
sys.stdout.buffer.write(stdout2)
if stderr2:
sys.stderr.buffer.write(stderr2)
sys.exit(p2.returncode)
sys.exit(ret2)

if pipetoview:
dest_cmd = [editor, "-R", "-"]
p3 = Popen(dest_cmd, stdin=PIPE)
if args.debug:
debug_str = "%s | %s | %s\n" % (" ".join(git_cmd),
" ".join(patchview_cmd),
" ".join(dest_cmd))
p3.stdin.write(debug_str.encode())
p3.stdin.flush()

p3.stdin.write(stdout2)
p3.stdin.close()
p3 = Popen(dest_cmd, stdin=p2.stdout, env=enviro, cwd=workdir)
p3.wait()
else:
# debug print
if args.debug:
print("%s | %s" % (" ".join(git_cmd), " ".join(patchview_cmd)))
sys.stdout.flush()

sys.stdout.buffer.write(stdout2)