git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Miguel Torroja <miguel.torroja@gmail.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com, luke@diamand.org,
	Miguel Torroja <miguel.torroja@gmail.com>
Subject: [PATCH] p4: Retrieve the right revision of the UTF-16 file
Date: Thu, 28 May 2015 01:14:39 +0200	[thread overview]
Message-ID: <1432768479-7894-1-git-send-email-miguel.torroja@gmail.com> (raw)
In-Reply-To: <CAPc5daW=BEPiGn6BGbN+JHczV-cPTW7WbZmr8vRRdpb1JL_aLQ@mail.gmail.com>

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(-)

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

      reply	other threads:[~2015-05-27 23:14 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-27 22:31 [PATCH] p4: Retrieve the right revision of the UTF-16 file Miguel Torroja
2015-05-27 22:04 ` Luke Diamand
2015-05-27 22:10   ` Junio C Hamano
2015-05-27 23:14     ` Miguel Torroja [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1432768479-7894-1-git-send-email-miguel.torroja@gmail.com \
    --to=miguel.torroja@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=luke@diamand.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).