diff options
| author | Anand Kumria <wildfire@progsoc.org> | 2008-08-10 19:26:25 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-11 18:57:03 -0700 |
| commit | b340fa43017437988e233ed4fd8dc00042614071 (patch) | |
| tree | 7aa5497d338b73244d0964bfea32c9062dcde993 /contrib/fast-import/git-p4 | |
| parent | 2318121babea786390f51796bfce17088c3420ee (diff) | |
| download | git-b340fa43017437988e233ed4fd8dc00042614071.tar.gz git-b340fa43017437988e233ed4fd8dc00042614071.tar.xz | |
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>
Diffstat (limited to 'contrib/fast-import/git-p4')
| -rwxr-xr-x | contrib/fast-import/git-p4 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4 index fc2a60dfe..3deaa4255 100755 --- a/contrib/fast-import/git-p4 +++ b/contrib/fast-import/git-p4 @@ -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 = [] @@ -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: |