Skip to content

Commit a7d3ef9

Browse files
Anand Kumriagitster
Anand Kumria
authored andcommitted
Utilise our new p4_read_pipe and p4_write_pipe wrappers
Signed-off-by: Anand Kumria <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent d942919 commit a7d3ef9

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

contrib/fast-import/git-p4

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ def setP4ExecBit(file, mode):
141141
def getP4OpenedType(file):
142142
# Returns the perforce file type for the given file.
143143

144-
result = read_pipe("p4 opened %s" % file)
144+
result = p4_read_pipe("opened %s" % file)
145145
match = re.match(".*\((.+)\)\r?$", result)
146146
if match:
147147
return match.group(1)
@@ -681,7 +681,7 @@ class P4Submit(Command):
681681
submitTemplate = self.prepareLogMessage(template, logMessage)
682682
if os.environ.has_key("P4DIFF"):
683683
del(os.environ["P4DIFF"])
684-
diff = read_pipe("p4 diff -du ...")
684+
diff = p4_read_pipe("diff -du ...")
685685

686686
newdiff = ""
687687
for newFile in filesToAdd:
@@ -719,7 +719,7 @@ class P4Submit(Command):
719719
if self.isWindows:
720720
submitTemplate = submitTemplate.replace("\r\n", "\n")
721721

722-
write_pipe("p4 submit -i", submitTemplate)
722+
p4_write_pipe("submit -i", submitTemplate)
723723
else:
724724
fileName = "submit.txt"
725725
file = open(fileName, "w+")

0 commit comments

Comments
 (0)