Utilise the new 'p4_read_pipe_lines' command
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>
This commit is contained in:
parent
2318121bab
commit
b340fa4301
@ -371,7 +371,7 @@ def originP4BranchesExist():
|
|||||||
|
|
||||||
def p4ChangesForPaths(depotPaths, changeRange):
|
def p4ChangesForPaths(depotPaths, changeRange):
|
||||||
assert depotPaths
|
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]))
|
for p in depotPaths]))
|
||||||
|
|
||||||
changes = []
|
changes = []
|
||||||
@ -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
|
# remove lines in the Files section that show changes to files outside the depot path we're committing into
|
||||||
template = ""
|
template = ""
|
||||||
inFilesSection = False
|
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"):
|
if line.endswith("\r\n"):
|
||||||
line = line[:-2] + "\n"
|
line = line[:-2] + "\n"
|
||||||
if inFilesSection:
|
if inFilesSection:
|
||||||
|
Loading…
Reference in New Issue
Block a user