Skip to content

Commit

Permalink
Utilise the new 'p4_read_pipe_lines' command
Browse files Browse the repository at this point in the history
Now that we have the new command, we can utilise it and then
 eventually, isolate any changes required to the one place.

Signed-off-by: Anand Kumria <wildfire@progsoc.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Anand Kumria authored and Junio C Hamano committed Aug 12, 2008
1 parent 2318121 commit b340fa4
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions contrib/fast-import/git-p4
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@ def originP4BranchesExist():

def p4ChangesForPaths(depotPaths, changeRange):
assert depotPaths
output = read_pipe_lines("p4 changes " + ' '.join (["%s...%s" % (p, changeRange)
output = p4_read_pipe_lines("changes " + ' '.join (["%s...%s" % (p, changeRange)
for p in depotPaths]))

changes = []
Expand Down Expand Up @@ -519,7 +519,7 @@ class P4Submit(Command):
# remove lines in the Files section that show changes to files outside the depot path we're committing into
template = ""
inFilesSection = False
for line in read_pipe_lines("p4 change -o"):
for line in p4_read_pipe_lines("change -o"):
if line.endswith("\r\n"):
line = line[:-2] + "\n"
if inFilesSection:
Expand Down

0 comments on commit b340fa4

Please sign in to comment.