Utilise our new p4_read_pipe and p4_write_pipe wrappers

Signed-off-by: Anand Kumria <wildfire@progsoc.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index 3e9df70f29dcfa16ab263d5ace42d8d6acf9aecd..12fa9d3fd81ce83f53f36178bc3111edddfd2173 100755 (executable)
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -141,7 +141,7 @@ def setP4ExecBit(file, mode):
 def getP4OpenedType(file):
     # Returns the perforce file type for the given file.
 
 def getP4OpenedType(file):
     # Returns the perforce file type for the given file.
 

-    result = read_pipe("p4 opened %s" % file)
+    result = p4_read_pipe("opened %s" % file)

     match = re.match(".*\((.+)\)\r?$", result)
     if match:
         return match.group(1)
     match = re.match(".*\((.+)\)\r?$", result)
     if match:
         return match.group(1)


@@ -681,7 +681,7 @@ class P4Submit(Command):
             submitTemplate = self.prepareLogMessage(template, logMessage)
             if os.environ.has_key("P4DIFF"):
                 del(os.environ["P4DIFF"])
             submitTemplate = self.prepareLogMessage(template, logMessage)
             if os.environ.has_key("P4DIFF"):
                 del(os.environ["P4DIFF"])

-            diff = read_pipe("p4 diff -du ...")
+            diff = p4_read_pipe("diff -du ...")

 
             newdiff = ""
             for newFile in filesToAdd:
 
             newdiff = ""
             for newFile in filesToAdd:


@@ -719,7 +719,7 @@ class P4Submit(Command):
             if self.isWindows:
                 submitTemplate = submitTemplate.replace("\r\n", "\n")
 
             if self.isWindows:
                 submitTemplate = submitTemplate.replace("\r\n", "\n")
 

-            write_pipe("p4 submit -i", submitTemplate)
+            p4_write_pipe("submit -i", submitTemplate)

         else:
             fileName = "submit.txt"
             file = open(fileName, "w+")
         else:
             fileName = "submit.txt"
             file = open(fileName, "w+")