summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorLibravatar Anand Kumria <wildfire@progsoc.org>2008-08-10 19:26:31 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-08-11 18:57:04 -0700
commitabcaf07360357cf2e9ce4b34e44adc09bb5587f0 (patch)
tree04316bfc92e1320665c696fd557b939b8a38bd1b /contrib
parentSwitch to using 'p4_build_cmd' (diff)
downloadtgif-abcaf07360357cf2e9ce4b34e44adc09bb5587f0.tar.xz
If the user has configured various parameters, use them.
Some repositories require authentication and access to certain hosts. Allow git-p4 to pull this information from the configuration Signed-off-by: Anand Kumria <wildfire@progsoc.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/fast-import/git-p424
1 files changed, 23 insertions, 1 deletions
diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index 2b6ea74d1c..a927e50b25 100755
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -24,7 +24,29 @@ def p4_build_cmd(cmd):
location. It means that hooking into the environment, or other configuration
can be done more easily.
"""
- real_cmd = "%s %s" % ("p4", cmd)
+ real_cmd = "%s " % "p4"
+
+ user = gitConfig("git-p4.user")
+ if len(user) > 0:
+ real_cmd += "-u %s " % user
+
+ password = gitConfig("git-p4.password")
+ if len(password) > 0:
+ real_cmd += "-P %s " % password
+
+ port = gitConfig("git-p4.port")
+ if len(port) > 0:
+ real_cmd += "-p %s " % port
+
+ host = gitConfig("git-p4.host")
+ if len(host) > 0:
+ real_cmd += "-h %s " % host
+
+ client = gitConfig("git-p4.client")
+ if len(client) > 0:
+ real_cmd += "-c %s " % client
+
+ real_cmd += "%s" % (cmd)
if verbose:
print real_cmd
return real_cmd