From: "dorgon chang via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Simon Hausmann <simon@lst.de>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
"dorgon.chang" <dorgon.chang@gmail.com>,
dorgon chang <dorgonman@hotmail.com>,
"dorgon.chang" <dorgonman@hotmail.com>
Subject: [PATCH v2] git-p4: fix failed submit by skip non-text data files
Date: Mon, 21 Jun 2021 05:16:13 +0000 [thread overview]
Message-ID: <pull.977.v2.git.git.1624252574779.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.977.git.git.1615535270135.gitgitgadget@gmail.com>
From: "dorgon.chang" <dorgonman@hotmail.com>
If the submit contain binary files, it will throw exception and stop submit when try to append diff line description.
This commit will skip non-text data files when exception UnicodeDecodeError thrown.
The skip will not affect actual submit files in the resulting cl,
the diff line description will only appear in submit template,
so you can review what changed before actully submit to p4.
I don't know if add any message here will be helpful for users,
so I choose to just skip binary content, since it already append filename previously.
Signed-off-by: dorgon.chang <dorgonman@hotmail.com>
---
git-p4: fix failed submit by skip non-text data files
git-p4: fix failed submit by skip non-text data files
If the submit contain binary files, it will throw exception and stop
submit when try to append diff line description.
This commit will skip non-text data files when exception
UnicodeDecodeError thrown.
I am using git-p4 with UnrealEngine game projects and this fix works for
me.
Signed-off-by: dorgon.chang dorgonman@hotmail.com
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-977%2Fdorgonman%2Fdorgon%2Ffix_gitp4_get_diff_description-v2
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-977/dorgonman/dorgon/fix_gitp4_get_diff_description-v2
Pull-Request: https://github.com/git/git/pull/977
Range-diff vs v1:
1: 19b59f40b183 ! 1: 606729bda112 git-p4: fix failed submit by skip non-text data files
@@ Commit message
This commit will skip non-text data files when exception UnicodeDecodeError thrown.
+ The skip will not affect actual submit files in the resulting cl,
+ the diff line description will only appear in submit template,
+ so you can review what changed before actully submit to p4.
+
+ I don't know if add any message here will be helpful for users,
+ so I choose to just skip binary content, since it already append filename previously.
+
Signed-off-by: dorgon.chang <dorgonman@hotmail.com>
## git-p4.py ##
@@ git-p4.py: def get_diff_description(self, editedFiles, filesToAdd, symlinks):
+ for line in f.readlines():
+ newdiff += "+" + line
+ except UnicodeDecodeError:
-+ pass # Fond non-text data
++ pass # Found non-text data and skip, since diff description should only include text
f.close()
return (diff + newdiff).replace('\r\n', '\n')
git-p4.py | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/git-p4.py b/git-p4.py
index 4433ca53de7e..dc1f46351845 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -1977,8 +1977,11 @@ def get_diff_description(self, editedFiles, filesToAdd, symlinks):
newdiff += "+%s\n" % os.readlink(newFile)
else:
f = open(newFile, "r")
- for line in f.readlines():
- newdiff += "+" + line
+ try:
+ for line in f.readlines():
+ newdiff += "+" + line
+ except UnicodeDecodeError:
+ pass # Found non-text data and skip, since diff description should only include text
f.close()
return (diff + newdiff).replace('\r\n', '\n')
base-commit: d4a392452e292ff924e79ec8458611c0f679d6d4
--
gitgitgadget
prev parent reply other threads:[~2021-06-21 5:16 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-12 7:47 [PATCH] git-p4: fix failed submit by skip non-text data files dorgon chang via GitGitGadget
2021-06-17 11:18 ` Simon Hausmann
2021-06-18 13:24 ` Johannes Schindelin
2021-06-29 0:52 ` Junio C Hamano
2021-06-18 14:54 ` Simon Hausmann
2021-06-19 6:47 ` Junio C Hamano
2021-06-20 7:56 ` dorgon.chang
2021-06-21 3:43 ` Junio C Hamano
2021-06-21 5:16 ` dorgon chang via GitGitGadget [this message]
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=pull.977.v2.git.git.1624252574779.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=dorgon.chang@gmail.com \
--cc=dorgonman@hotmail.com \
--cc=git@vger.kernel.org \
--cc=simon@lst.de \
/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.
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).