aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnand Kumria <wildfire@progsoc.org>2008-08-10 19:26:30 +0100
committerJunio C Hamano <gitster@pobox.com>2008-08-11 18:57:04 -0700
commit155af83491b26d958b147c93620816846343b019 (patch)
tree6de97c3212a59eb0279af8a79ab1eca23bb7b053
parentee06427aa6d975c35b63c3cd103ace43fbde062b (diff)
downloadgit-155af83491b26d958b147c93620816846343b019.tar.gz
git-155af83491b26d958b147c93620816846343b019.tar.xz
Switch to using 'p4_build_cmd'
Signed-off-by: Anand Kumria <wildfire@progsoc.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xcontrib/fast-import/git-p410
1 files changed, 3 insertions, 7 deletions
diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index d36b0c6be..2b6ea74d1 100755
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -72,9 +72,7 @@ def read_pipe_lines(c):
def p4_read_pipe_lines(c):
"""Specifically invoke p4 on the command supplied. """
- real_cmd = "%s %s" % ("p4", c)
- if verbose:
- print real_cmd
+ real_cmd = p4_build_cmd(c)
return read_pipe_lines(real_cmd)
def system(cmd):
@@ -85,9 +83,7 @@ def system(cmd):
def p4_system(cmd):
"""Specifically invoke p4 as the system command. """
- real_cmd = "%s %s" % ("p4", cmd)
- if verbose:
- print real_cmd
+ real_cmd = p4_build_cmd(cmd)
return system(real_cmd)
def isP4Exec(kind):
@@ -172,7 +168,7 @@ def isModeExecChanged(src_mode, dst_mode):
return isModeExec(src_mode) != isModeExec(dst_mode)
def p4CmdList(cmd, stdin=None, stdin_mode='w+b'):
- cmd = "p4 -G %s" % cmd
+ cmd = p4_build_cmd("-G %s" % (cmd))
if verbose:
sys.stderr.write("Opening pipe: %s\n" % cmd)