From: Joel Holdsworth <jholdsworth@nvidia.com>
To: git@vger.kernel.org
Cc: Joel Holdsworth <jholdsworth@nvidia.com>
Subject: [PATCH 2/6] git-p4: Don't print shell commands as python lists
Date: Thu, 9 Dec 2021 20:10:25 +0000 [thread overview]
Message-ID: <20211209201029.136886-3-jholdsworth@nvidia.com> (raw)
In-Reply-To: <20211209201029.136886-1-jholdsworth@nvidia.com>
Signed-off-by: Joel Holdsworth <jholdsworth@nvidia.com>
---
git-p4.py | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/git-p4.py b/git-p4.py
index 1a4b7331d2..32f30e5f9a 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -272,14 +272,14 @@ def run_hook_command(cmd, param):
def write_pipe(c, stdin, *k, **kw):
if verbose:
- sys.stderr.write('Writing pipe: %s\n' % str(c))
+ sys.stderr.write('Writing pipe: {}\n'.format(' '.join(c)))
p = subprocess.Popen(c, stdin=subprocess.PIPE, *k, **kw)
pipe = p.stdin
val = pipe.write(stdin)
pipe.close()
if p.wait():
- die('Command failed: %s' % str(c))
+ die('Command failed: {}'.format(' '.join(c)))
return val
@@ -295,7 +295,7 @@ def read_pipe_full(c, *k, **kw):
text.
"""
if verbose:
- sys.stderr.write('Reading pipe: %s\n' % str(c))
+ sys.stderr.write('Reading pipe: {}\n'.format(' '.join(c)))
p = subprocess.Popen(
c, stdout=subprocess.PIPE, stderr=subprocess.PIPE, *k, **kw)
@@ -314,7 +314,7 @@ def read_pipe(c, ignore_error=False, raw=False):
if ignore_error:
out = ""
else:
- die('Command failed: %s\nError: %s' % (str(c), err))
+ die('Command failed: {}\nError: {}'.format(' '.join(c), err))
if not raw:
out = decode_text_stream(out)
return out
@@ -335,13 +335,13 @@ def p4_read_pipe(c, ignore_error=False, raw=False):
def read_pipe_lines(c, *k, **kw):
if verbose:
- sys.stderr.write('Reading pipe: %s\n' % str(c))
+ sys.stderr.write('Reading pipe: {}\n'.format(' '.join(c)))
p = subprocess.Popen(c, stdout=subprocess.PIPE, *k, **kw)
pipe = p.stdout
val = [decode_text_stream(line) for line in pipe.readlines()]
if pipe.close() or p.wait():
- die('Command failed: %s' % str(c))
+ die('Command failed: {}'.format(' '.join(c)))
return val
def p4_read_pipe_lines(c):
@@ -380,7 +380,8 @@ def p4_has_move_command():
def system(cmd, ignore_error=False, *k, **kw):
if verbose:
- sys.stderr.write("executing %s\n" % str(cmd))
+ sys.stderr.write("executing {}\n".format(
+ ' '.join(cmd) if isinstance(cmd, list) else cmd))
retcode = subprocess.call(cmd, *k, **kw)
if retcode and not ignore_error:
raise CalledProcessError(retcode, cmd)
@@ -723,7 +724,7 @@ def p4CmdList(cmd, stdin=None, stdin_mode='w+b', cb=None, skip_info=False,
cmd = p4_build_cmd(["-G"] + cmd)
if verbose:
- sys.stderr.write("Opening pipe: %s\n" % str(cmd))
+ sys.stderr.write("Opening pipe: {}\n".format(' '.join(cmd)))
# Use a temporary file to avoid deadlocks without
# subprocess.communicate(), which would put another copy
--
2.33.0
next prev parent reply other threads:[~2021-12-09 20:10 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-09 20:10 [PATCH 0/6] Transition git-p4.py to support Python 3 only Joel Holdsworth
2021-12-09 20:10 ` [PATCH 1/6] git-p4: Always pass cmd arguments to subprocess as a python lists Joel Holdsworth
2021-12-09 22:42 ` Junio C Hamano
2021-12-09 20:10 ` Joel Holdsworth [this message]
2021-12-09 20:10 ` [PATCH 3/6] git-p4: Removed support for Python 2 Joel Holdsworth
2021-12-09 22:44 ` Junio C Hamano
2021-12-09 23:07 ` rsbecker
2021-12-10 3:25 ` David Aguilar
2021-12-10 10:44 ` Joel Holdsworth
2021-12-09 20:10 ` [PATCH 4/6] git-p4: Decode byte strings before printing Joel Holdsworth
2021-12-09 22:47 ` Junio C Hamano
2021-12-10 8:40 ` Fabian Stelzer
2021-12-10 10:48 ` Joel Holdsworth
2021-12-10 10:41 ` Joel Holdsworth
2021-12-09 20:10 ` [PATCH 5/6] git-p4: Eliminate decode_stream and encode_stream Joel Holdsworth
2021-12-09 20:10 ` [PATCH 6/6] git-p4: Resolve RCS keywords in binary Joel Holdsworth
2021-12-10 7:57 ` Luke Diamand
2021-12-10 10:51 ` Joel Holdsworth
2021-12-10 0:48 ` [PATCH 0/6] Transition git-p4.py to support Python 3 only Ævar Arnfjörð Bjarmason
2021-12-10 10:37 ` Joel Holdsworth
2021-12-10 11:30 ` Ævar Arnfjörð Bjarmason
2021-12-10 21:34 ` Junio C Hamano
2021-12-10 21:53 ` rsbecker
2021-12-11 21:00 ` Elijah Newren
2021-12-12 8:55 ` Luke Diamand
2021-12-10 7:53 ` Luke Diamand
2021-12-10 10:54 ` Joel Holdsworth
2021-12-11 9:58 ` Luke Diamand
2021-12-13 13:47 ` Joel Holdsworth
2021-12-13 19:29 ` Junio C Hamano
2021-12-13 19:58 ` Joel Holdsworth
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211209201029.136886-3-jholdsworth@nvidia.com \
--to=jholdsworth@nvidia.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).