From: "Kilian Kilger via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Tao Klerks <tao@klerks.biz>, Kilian Kilger <kkilger@gmail.com>
Subject: [PATCH v3 0/2] git-p4: Fix bug with encoding of P4 client name
Date: Thu, 21 Jul 2022 09:07:18 +0000 [thread overview]
Message-ID: <pull.1285.v3.git.git.1658394440.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.1285.v2.git.git.1658134679233.gitgitgadget@gmail.com>
Kilian Kilger (2):
git-p4: fix bug with encoding of p4 client name
git-p4: refactoring of p4CmdList()
git-p4.py | 51 ++++++++++++++++++++++++++++++++++++++++++---------
1 file changed, 42 insertions(+), 9 deletions(-)
base-commit: e4a4b31577c7419497ac30cebe30d755b97752c5
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1285%2Fcohomology%2Fmaint-v3
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1285/cohomology/maint-v3
Pull-Request: https://github.com/git/git/pull/1285
Range-diff vs v2:
-: ----------- > 1: 87e7809b75a git-p4: fix bug with encoding of p4 client name
1: 3280a9579bc ! 2: 4a81423f0e8 git-p4: fix bug with encoding of p4 client name
@@ Metadata
Author: Kilian Kilger <kkilger@gmail.com>
## Commit message ##
- git-p4: fix bug with encoding of p4 client name
+ git-p4: refactoring of p4CmdList()
- The Perforce client name can contain arbitrary characters
- which do not decode to UTF-8. Use the fallback strategy
- implemented in metadata_stream_to_writable_bytes() also
- for the client name.
+ The function p4CmdList executes a Perforce command and
+ decodes the marshalled python dictionary. Special care has to be
+ taken for certain dictionary values which contain non-unicode characters.
+ The old handling contained separate hacks for each of the corresponding
+ dictionary keys. This commit tries to refactor the coding to handle the
+ special cases uniformely.
Signed-off-by: Kilian Kilger <kkilger@gmail.com>
@@ git-p4.py: def p4CmdList(cmd, stdin=None, stdin_mode='w+b', cb=None, skip_info=F
if bytes is not str:
- # Decode unmarshalled dict to use str keys and values, except for:
- # - `data` which may contain arbitrary binary data
-- # - `desc` or `FullName` which may contain non-UTF8 encoded text handled below, eagerly converted to bytes
+- # - `desc` or `client` or `FullName` which may contain non-UTF8 encoded text handled below, eagerly converted to bytes
- # - `depotFile[0-9]*`, `path`, or `clientFile` which may contain non-UTF8 encoded text, handled by decode_path()
+ # Decode unmarshalled dict to use str keys and values. Special cases are handled below.
decoded_entry = {}
for key, value in entry.items():
key = key.decode()
-- if isinstance(value, bytes) and not (key in ('data', 'desc', 'FullName', 'path', 'clientFile') or key.startswith('depotFile')):
+- if isinstance(value, bytes) and not (key in ('data', 'desc', 'FullName', 'path', 'clientFile', 'client') or key.startswith('depotFile')):
+ if isinstance(value, bytes) and p4KeyWhichCanBeDirectlyDecoded(key):
value = value.decode()
decoded_entry[key] = value
@@ git-p4.py: def p4CmdList(cmd, stdin=None, stdin_mode='w+b', cb=None, skip_info=F
continue
- if 'desc' in entry:
- entry['desc'] = metadata_stream_to_writable_bytes(entry['desc'])
+- if 'client' in entry:
+- entry['client'] = metadata_stream_to_writable_bytes(entry['client'])
- if 'FullName' in entry:
- entry['FullName'] = metadata_stream_to_writable_bytes(entry['FullName'])
+ for key in p4KeysContainingNonUtf8Chars():
--
gitgitgadget
next prev parent reply other threads:[~2022-07-21 9:07 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-08 8:01 [PATCH] git-p4: fix bug with encoding of p4 client name Kilian Kilger via GitGitGadget
2022-07-08 11:28 ` Tao Klerks
2022-07-08 15:05 ` Junio C Hamano
2022-07-18 8:57 ` [PATCH v2] " Kilian Kilger via GitGitGadget
2022-07-18 16:36 ` Junio C Hamano
2022-07-21 9:07 ` Kilian Kilger via GitGitGadget [this message]
2022-07-21 9:07 ` [PATCH v3 1/2] " Kilian Kilger via GitGitGadget
2022-07-21 9:07 ` [PATCH v3 2/2] git-p4: refactoring of p4CmdList() Kilian Kilger via GitGitGadget
2022-07-21 16:46 ` [PATCH v3 0/2] git-p4: Fix bug with encoding of P4 client name Junio C Hamano
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=pull.1285.v3.git.git.1658394440.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=kkilger@gmail.com \
--cc=tao@klerks.biz \
/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).