threads / patch / 39441

patchp4: Retrieve the right revision of the UTF-16 file

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

## tl;dr

4 messages between May 27, 2015 and May 27, 2015. Diffs are folded; open one to read it.

replies: 3people: 3as markdown or json

Miguel Torroja· May 27, 2015, 22:31 UTC · lore

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.
---
 git-p4.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Show changes to git-p4.py +1 −1

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 ]

-- 
1.7.10.4

Luke Diamand· May 27, 2015, 22:04 UTC · re: Miguel Torroja · lore

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

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

Show 18 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 ]
>

Junio C Hamano· May 27, 2015, 22:10 UTC · re: Luke Diamand · lore

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

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 ]
>>
>

Miguel Torroja· May 27, 2015, 23:14 UTC · re: Junio C Hamano · lore

Fixing bug with UTF-16 files when they are retrieved by git-p4. It was always getting the tip version of the file and the history of the file was lost.

Signed-off-by: Miguel Torroja <miguel.torroja@gmail.com>
---
 git-p4.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Show changes to git-p4.py +1 −1

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 ]

-- 
1.7.10.4