Skip to contentSkip to conversation

Fix git-p4 decode() missing an assignment

PATCH In review W Sero via GitGitGadget 2 participants 2 messages Mar 4, 2024

lore
Share & tools
lore

W Sero via GitGitGadget

author
#0 lore raw

PATCH 1/1 Fix git-p4 decode() missing an assignment

From: SaNeOr <[email protected]>

bugfix: When using git-p4 in the python2 environment, some places decode() missing an assignment.

Signed-off-by W Sero <[email protected]>

---
Fix git-p4 decode_path() missing an assignment

When using git-p4 in the python2 environment, some places decode( ) missing an assignment.

Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1683%2FSaNeOr%2Fmaster-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1683/SaNeOr/master-v1
Pull-Request: https://github.com/git/git/pull/1683

 git-p4.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
git-p4.py +2 -2
index 28ab12c72b6..9fa4b9b104e 100755
@@ -307,7 +307,7 @@ def decode_path(path):
         return path.decode(encoding, errors='replace') if isinstance(path, bytes) else path
     else:
         try:
-            path.decode('ascii')
+            path = path.decode('ascii')
         except:
             path = path.decode(encoding, errors='replace')
             if verbose:

@@ -3114,7 +3114,7 @@ def writeToGitStream(self, gitMode, relPath, contents):
 
     def encodeWithUTF8(self, path):
         try:
-            path.decode('ascii')
+            path = path.decode('ascii')
         except:
             encoding = 'utf8'
             if gitConfig('git-p4.pathEncoding'):

base-commit: 0f9d4d28b7e6021b7e6db192b7bf47bd3a0d0d1d

Signature · 1 line
gitgitgadget
#1 lore raw
Quoted 24 lines · W Sero via GitGitGadget

From: SaNeOr <[email protected]>

bugfix: When using git-p4 in the python2 environment, some places decode() missing an assignment.

Signed-off-by W Sero <[email protected]>

---
Fix git-p4 decode_path() missing an assignment

When using git-p4 in the python2 environment, some places decode( ) missing an assignment.

Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1683%2FSaNeOr%2Fmaster-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1683/SaNeOr/master-v1
Pull-Request: https://github.com/git/git/pull/1683

 git-p4.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
git-p4.py +0 -0
index 28ab12c72b6..9fa4b9b104e 100755

git-p4.py def decode_path(path): · line 310

Quoted 5 lines
git-p4.py +1 -1
@@ -307,7 +307,7 @@ def decode_path(path):
         return path.decode(encoding, errors='replace') if isinstance(path, bytes) else path
     else:
         try:
-            path.decode('ascii')
+            path = path.decode('ascii')

Is this fixing an actual bug that you have encountered? I'm mostly asking because I think this actually works as inteded: we only try to decode the path using the specified encoding in case where it is not representable as ASCII. If it contained e.g. Unicode characters, then this statement here would throw and we end up decoding in the except branch. Otherwise, we know that the path only contains ASCII characters and thus we don't have to change it in the first place.

Whether that complexity is sensible might be a different question. But it at least shouldn't result in any user visible bug, no?

Patrick

Quoted 17 lines
git-p4.py +1 -1
         except:
             path = path.decode(encoding, errors='replace')
             if verbose:

@@ -3114,7 +3114,7 @@ def writeToGitStream(self, gitMode, relPath, contents):
 
     def encodeWithUTF8(self, path):
         try:
-            path.decode('ascii')
+            path = path.decode('ascii')
         except:
             encoding = 'utf8'
             if gitConfig('git-p4.pathEncoding'):

base-commit: 0f9d4d28b7e6021b7e6db192b7bf47bd3a0d0d1d

Signature · 1 line
gitgitgadget