Skip to content

Commit

Permalink
Utilise our new p4_read_pipe and p4_write_pipe wrappers
Browse files Browse the repository at this point in the history
Signed-off-by: Anand Kumria <wildfire@progsoc.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Anand Kumria authored and gitster committed Aug 15, 2008
1 parent d942919 commit a7d3ef9
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions contrib/fast-import/git-p4
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ def setP4ExecBit(file, mode):
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)
Expand Down Expand Up @@ -681,7 +681,7 @@ class P4Submit(Command):
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:
Expand Down Expand Up @@ -719,7 +719,7 @@ class P4Submit(Command):
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+")
Expand Down

0 comments on commit a7d3ef9

Please sign in to comment.