# [PATCH] p4: Retrieve the right revision of the UTF-16 file 4 messages from 2015-05-27 to 2015-05-27. Participants: Miguel Torroja, Luke Diamand, Junio C Hamano. Thread: https://gitlist.dev/t/39441 ## Luke Diamand, 2015-05-27 22:04 Subject: Re: [PATCH] p4: Retrieve the right revision of the UTF-16 file Message-ID: <55663F72.6010800@diamand.org> URL: https://gitlist.dev/e/55663F72.6010800%40diamand.org In-Reply-To: <1432765918-7352-1-git-send-email-miguel.torroja@gmail.com> ``` 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 > --- > 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, 2015-05-27 22:10 Subject: Re: [PATCH] p4: Retrieve the right revision of the UTF-16 file Message-ID: URL: https://gitlist.dev/e/CAPc5daW%3DBEPiGn6BGbN%2BJHczV-cPTW7WbZmr8vRRdpb1JL_aLQ%40mail.gmail.com In-Reply-To: <55663F72.6010800@diamand.org> ``` On Wed, May 27, 2015 at 3:04 PM, Luke Diamand wrote: > 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. >> --- >> 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, 2015-05-27 22:31 Subject: [PATCH] p4: Retrieve the right revision of the UTF-16 file Message-ID: <1432765918-7352-1-git-send-email-miguel.torroja@gmail.com> URL: https://gitlist.dev/e/1432765918-7352-1-git-send-email-miguel.torroja%40gmail.com ``` 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(-) 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 ``` ## Miguel Torroja, 2015-05-27 23:14 Subject: [PATCH] p4: Retrieve the right revision of the UTF-16 file Message-ID: <1432768479-7894-1-git-send-email-miguel.torroja@gmail.com> URL: https://gitlist.dev/e/1432768479-7894-1-git-send-email-miguel.torroja%40gmail.com In-Reply-To: ``` 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 --- 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 ] -- 1.7.10.4 ```