Re: [PATCH] git-p4: don't convert utf16 files.

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Sun, Aug 21, 2011 at 8:21 AM, Pete Wyckoff <pw@xxxxxxxx> wrote:

>> Using the "p4 print -o tmpfile depotfile" can avoid this
>> convertion (and possible failure) all together.
>
> This isn't contrib/fast-import/git-p4.  Searching around, I
> discovered a 2009 fork of git-p4 that is fairly active.  CC-ing
> some of the names I found on github.

Oops. I forget I am trying some other git-p4 and this patch is
not for git-core. The git-p4 in git-core repository has the same
problem. I was original using the git-core one, hit the bug. Then
I try some other branch and found the same problem, I just forget
which git repository I am at. Silly me.

Let me redo a patch for git.

>
> Here's one such repo:
>
>    http://github.com/ermshiperete/git-p4
>
> Git's git-p4 doesn't try to do anything special with utf-16.  It
> does \r\n mangling, but not $Keyword$ removal, then just streams
> it to disk however p4 sends it.  That's close to what you're
> trying to do here.

No, it is not the same. Here is what I find out. If you ask use
"p4 print" to fetch a perforce utf16 file, perforce convert that file into
utf8 before it send out to stdout. I guess the perforce guys assume
p4 print is used for terminal console. If the git-p4 just stream to disk,
then you  those file are effective checkout as utf8, which is about
half the size of the original utf16 file.

I never like those utf16 files, I think those file should be check in
as binary. But some one did check in the utf16 in the repository I
use at work, Now I have to deal with it. I guess the reason perforce
want to know about utf16 is to do the \r\n conversion properly on
those utf16 files. The file in question is the windows .mc file.
It contain different language translation of the error message.

So git-p4 in git-core effectively converted the perforce utf16 file to
utf8 during import.

However, if I do "p4 print -o filename". Perforce will write the file in
the original utf16 format. I don't need to do the utf8 to utf16 conversion,
which can failed and it does in my case.

The git-p4 in git-core need the same treatment. I will work out a patch
and resubmit that later.

Thanks

Chris
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]