Switch to using 'p4_build_cmd'
Signed-off-by: Anand Kumria <wildfire@progsoc.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Anand Kumria committed
Aug 10, 2008 at 19:26 UTC
155af83491b26d958b147c93620816846343b019
1 file changed
+3
-7
contrib/fast-import/git-p4
+3
-7
@@ -72,9 +72,7 @@ def read_pipe_lines(c):
72
73
def p4_read_pipe_lines(c):
74
"""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)
76
return read_pipe_lines(real_cmd)
77
78
def system(cmd):
@@ -85,9 +83,7 @@ def system(cmd):
83
84
def p4_system(cmd):
85
"""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)
87
return system(real_cmd)
88
89
def isP4Exec(kind):
@@ -172,7 +168,7 @@ def isModeExecChanged(src_mode, dst_mode):
168
return isModeExec(src_mode) != isModeExec(dst_mode)
169
170
def p4CmdList(cmd, stdin=None, stdin_mode='w+b'):
175
- cmd = "p4 -G %s" % cmd
171
+ cmd = p4_build_cmd("-G %s" % (cmd))
172
if verbose:
173
sys.stderr.write("Opening pipe: %s\n" % cmd)
174