From: Feiynag Xue <fxue@xxxxxxxx>
commit d38208a297e76bbfbfa8e485632c217aaafa9486 introduced function "decode_path()" to replace "encodeWithUTF8()". This old function "encodeWithUTF8()" no longer has reference by any code in this file.
Signed-off-by: Feiynag Xue <fxue@xxxxxxxx>
---
Remove deprecated function "encodeWithUTF8()"
The function encodeWithUTF8() no longer has reference after
d38208a297e76bbfbfa8e485632c217aaafa9486, which introduced decode_path()
to replace encodeWithUTF8() for path encoding handling. I cannot think
of a reason to keep encodeWithUTF8() in the codebase.
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-862%2Ffeiyeung%2Fremove-encodeWithUTF8-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-862/feiyeung/remove-encodeWithUTF8-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/862
git-p4.py | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/git-p4.py b/git-p4.py
index 09c9e93ac40..2c7e5498afa 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -2939,18 +2939,6 @@ def writeToGitStream(self, gitMode, relPath, contents):
self.gitStream.write(d)
self.gitStream.write('\n')
- def encodeWithUTF8(self, path):
- try:
- path.decode('ascii')
- except:
- encoding = 'utf8'
- if gitConfig('git-p4.pathEncoding'):
- encoding = gitConfig('git-p4.pathEncoding')
- path = path.decode(encoding, 'replace').encode('utf8', 'replace')
- if self.verbose:
- print('Path with non-ASCII characters detected. Used %s to encode: %s ' % (encoding, path))
- return path
-
# output one file from the P4 stream
# - helper for streamP4Files
base-commit: e6362826a0409539642a5738db61827e5978e2e4
--
gitgitgadget
