Re: [PATCH] p4: Retrieve the right revision of the UTF-16 file

From: Junio C Hamano <gitster@pobox.com>
Date: May 27, 2015, 22:10 UTC
Message-ID: <CAPc5daW=BEPiGn6BGbN+JHczV-cPTW7WbZmr8vRRdpb1JL_aLQ@mail.gmail.com>
In-Reply-To: <55663F72.6010800@diamand.org>

On Wed, May 27, 2015 at 3:04 PM, Luke Diamand <luke@diamand.org> wrote:

Show 11 quoted lines

> On 27/05/15 23:31, Miguel Torroja wrote:
>>
>> Fixing bug with UTF-16 files when they are retreived by git-p4.
>> It was always getting the tip version of the file and the history of the
>> file was lost.
>
> This looks sensible to me, and seems to work in some simple testing, thanks!
>
> Ack.
>
> Luke

Thanks; Miguel, please sign-off your patch; otherwise we cannot use it.

Thanks.

Show 22 quoted lines

>> ---
>>   git-p4.py |    2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/git-p4.py b/git-p4.py
>> index cdfa2df..be2c7da 100755
>> --- a/git-p4.py
>> +++ b/git-p4.py
>> @@ -2098,7 +2098,7 @@ class P4Sync(Command, P4UserMap):
>>               # them back too.  This is not needed to the cygwin windows
>> version,
>>               # just the native "NT" type.
>>               #
>> -            text = p4_read_pipe(['print', '-q', '-o', '-',
>> file['depotFile']])
>> +            text = p4_read_pipe(['print', '-q', '-o', '-', "%s@%s" %
>> (file['depotFile'], file['change']) ])
>>               if p4_version_string().find("/NT") >= 0:
>>                   text = text.replace("\r\n", "\n")
>>               contents = [ text ]
>>
>