Merge branch 'mt/p4-depotFile-at-version'

gitster · gitster · commit 8f436d1374c7 · 2015-06-11T09:29:55.000-07:00
* mt/p4-depotFile-at-version:
  p4: retrieve the right revision of the file in UTF-16 codepath
diff --git a/git-p4.py b/git-p4.py
@@ -2145,7 +2145,7 @@ def streamOneP4File(self, file, contents):
             # 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 ]

Original file line number	Diff line number	Diff line change
`@@ -2145,7 +2145,7 @@ def streamOneP4File(self, file, contents):`
`2145`	`2145`	`# them back too. This is not needed to the cygwin windows version,`
`2146`	`2146`	`# just the native "NT" type.`
`2147`	`2147`	`#`
`2148`		`- text = p4_read_pipe(['print', '-q', '-o', '-', file['depotFile']])`
	`2148`	`+ text = p4_read_pipe(['print', '-q', '-o', '-', "%s@%s" % (file['depotFile'], file['change']) ])`
`2149`	`2149`	`if p4_version_string().find("/NT") >= 0:`
`2150`	`2150`	`text = text.replace("\r\n", "\n")`
`2151`	`2151`	`contents = [ text ]`