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>
Anand Kumria committed
Aug 14, 2008 at 23:40 UTC
a7d3ef9d099ab00a19595bc3ca8abdc1fc6ff35d
1 file changed
+3
-3
contrib/fast-import/git-p4
+3
-3
@@ -141,7 +141,7 @@ def setP4ExecBit(file, mode):
141
def getP4OpenedType(file):
142
# Returns the perforce file type for the given file.
143
144
- result = read_pipe("p4 opened %s" % file)
144
+ result = p4_read_pipe("opened %s" % file)
145
match = re.match(".*\((.+)\)\r?$", result)
146
if match:
147
return match.group(1)
@@ -681,7 +681,7 @@ class P4Submit(Command):
681
submitTemplate = self.prepareLogMessage(template, logMessage)
682
if os.environ.has_key("P4DIFF"):
683
del(os.environ["P4DIFF"])
684
- diff = read_pipe("p4 diff -du ...")
684
+ diff = p4_read_pipe("diff -du ...")
685
686
newdiff = ""
687
for newFile in filesToAdd:
@@ -719,7 +719,7 @@ class P4Submit(Command):
719
if self.isWindows:
720
submitTemplate = submitTemplate.replace("\r\n", "\n")
721
722
- write_pipe("p4 submit -i", submitTemplate)
722
+ p4_write_pipe("submit -i", submitTemplate)
723
else:
724
fileName = "submit.txt"
725
file = open(fileName, "w+")