From: Joel Holdsworth <jholdsworth@nvidia.com>
To: git@vger.kernel.org
Cc: Joel Holdsworth <jholdsworth@nvidia.com>
Subject: [PATCH 4/6] git-p4: Decode byte strings before printing
Date: Thu, 9 Dec 2021 20:10:27 +0000 [thread overview]
Message-ID: <20211209201029.136886-5-jholdsworth@nvidia.com> (raw)
In-Reply-To: <20211209201029.136886-1-jholdsworth@nvidia.com>
Signed-off-by: Joel Holdsworth <jholdsworth@nvidia.com>
---
git-p4.py | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/git-p4.py b/git-p4.py
index b5d4fc1176..b5945a0306 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -2917,7 +2917,8 @@ def streamOneP4File(self, file, contents):
size = int(self.stream_file['fileSize'])
else:
size = 0 # deleted files don't get a fileSize apparently
- sys.stdout.write('\r%s --> %s (%i MB)\n' % (file_path, relPath, size/1024/1024))
+ sys.stdout.write('\r{} --> {} ({} MB)\n'.format(
+ file_path.decode(), relPath, size/1024/1024))
sys.stdout.flush()
(type_base, type_mods) = split_p4_type(file["type"])
@@ -3061,7 +3062,8 @@ def streamP4FilesCb(self, marshalled):
size = int(self.stream_file["fileSize"])
if size > 0:
progress = 100*self.stream_file['streamContentSize']/size
- sys.stdout.write('\r%s %d%% (%i MB)' % (self.stream_file['depotFile'], progress, int(size/1024/1024)))
+ sys.stdout.write('\r{} {}% ({} MB)'.format(
+ self.stream_file['depotFile'].decode(), progress, int(size/1024/1024)))
sys.stdout.flush()
self.stream_have_file_info = True
@@ -3803,7 +3805,7 @@ def closeStreams(self):
return
self.gitStream.close()
if self.importProcess.wait() != 0:
- die("fast-import failed: %s" % self.gitError.read())
+ die("fast-import failed: {}".format(self.gitError.read().decode()))
self.gitOutput.close()
self.gitError.close()
self.gitStream = None
--
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 ` [PATCH 2/6] git-p4: Don't print shell commands as " Joel Holdsworth
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 ` Joel Holdsworth [this message]
2021-12-09 22:47 ` [PATCH 4/6] git-p4: Decode byte strings before printing 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-5-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).