Skip to content

Commit 155af83

Browse files
Anand Kumriagitster
authored andcommitted
Switch to using 'p4_build_cmd'
Signed-off-by: Anand Kumria <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent ee06427 commit 155af83

File tree

1 file changed

+3
-7
lines changed

1 file changed

+3
-7
lines changed

contrib/fast-import/git-p4

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,7 @@ def read_pipe_lines(c):
7272

7373
def p4_read_pipe_lines(c):
7474
"""Specifically invoke p4 on the command supplied. """
75-
real_cmd = "%s %s" % ("p4", c)
76-
if verbose:
77-
print real_cmd
75+
real_cmd = p4_build_cmd(c)
7876
return read_pipe_lines(real_cmd)
7977

8078
def system(cmd):
@@ -85,9 +83,7 @@ def system(cmd):
8583

8684
def p4_system(cmd):
8785
"""Specifically invoke p4 as the system command. """
88-
real_cmd = "%s %s" % ("p4", cmd)
89-
if verbose:
90-
print real_cmd
86+
real_cmd = p4_build_cmd(cmd)
9187
return system(real_cmd)
9288

9389
def isP4Exec(kind):
@@ -172,7 +168,7 @@ def isModeExecChanged(src_mode, dst_mode):
172168
return isModeExec(src_mode) != isModeExec(dst_mode)
173169

174170
def p4CmdList(cmd, stdin=None, stdin_mode='w+b'):
175-
cmd = "p4 -G %s" % cmd
171+
cmd = p4_build_cmd("-G %s" % (cmd))
176172
if verbose:
177173
sys.stderr.write("Opening pipe: %s\n" % cmd)
178174

0 commit comments

Comments
 (0)