Re: [PATCH 2/2] git-p4: do not decode data from perforce by default
- From
Junio C Hamano <gitster@pobox.com>
- Date
- May 5, 2021, 01:11 UTC
- Message-ID
- <xmqqczu656iv.fsf@gitster.g>
- In-Reply-To
- <CAKu1iLXOFiUGmQUeoW-YkiiJ8P2+LznXWz4YabEiGktv=nUYjA@mail.gmail.com>
Tzadik Vanderhoof <tzadik.vanderhoof@gmail.com> writes:
Show 14 quoted lines
> On Tue, May 4, 2021 at 2:01 PM Andrew Oakley <andrew@adoakley.name> wrote: >> The key thing that I'm trying to point out here is that the encoding is >> not necessarily consistent between different commits. The changes that >> you have proposed force you to pick one encoding that will be used for >> every commit. If it's wrong then data will be corrupted, and there is >> no option provided to avoid that. The only way I can see to avoid this >> issue is to not attempt to re-encode the data - just pass it directly >> to git. > > No, my "fallbackEndocing" setting is just that... a fallback. My proposal > *always* tries to decode in UTF-8 first! Only if that throws an exception > will my "fallbackEncoding" come into play, and it only comes into play > for the single changeset description that was invalid UTF-8. After that, > subsequent descriptions will again be tried in UTF-8 first.
Hmph, I do not quite see the need for "No" at the beginning of what you said. The fallbackEncoding can specify only one non UTF-8 encoding, so even if majority of commits were in UTF-8 but when you need to import two commits with non UTF-8 encoding, there is no suitable value to give to the fallbackEncoding setting. One of these two commits will fail to decode first in UTF-8 and then fail to decode again with the fallback, and after that a corrupted message remains.
Show 7 quoted lines
>> I think another way to solve the issue you have is the encoding header >> on git commits. We can pass the bytes through git-p4 unmodified, but >> mark the commit message as being encoded using something that isn't >> UTF-8. That avoids any potentially lossy conversions when cloning the >> repository, but should allow the data to be displayed correctly in git. > > Yes, that could be a solution. I will try that out.
If we can determine in what encoding the thing that came out of Perforce is written in, we can put it on the encoding header of the resulting commit. But if that is possible to begin with, perhaps we do not even need to do so---if you can determine what the original encoding is, you can reencode with that encoding into UTF-8 inside git-p4 while creating the commit, no?
And if the raw data that came from Perforce cannot be reencoded to UTF-8 (i.e. iconv fails to process for some reason), then whether the translation is done at the import time (i.e. where you would have used the fallbackEncoding to reencode into UTF-8) or at the display time (i.e. "git show" would notice the encoding header and try to reencode the raw data from that encoding into UTF-8), it would fail in the same way, so I do not see much advantage in writing the encoding header into the resulting object (other than shifting the blame to downstream and keeping the original data intact, which is a good design principle).