Different versions of p4 have different output for the where command ;(

Signed-off-by: Simon Hausmann <simon@lst.de>

diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index 61978c3da6ac184821c1433bfe1d5fd515df3617..95037862072e98e82ca1a8219c02ca45db983b04 100755 (executable)
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -36,6 +36,22 @@ def p4Cmd(cmd):
         result.update(entry)
     return result;
 
         result.update(entry)
     return result;
 

+def p4Where(depotPath):
+    if not depotPath.endswith("/"):
+        depotPath += "/"
+    output = p4Cmd("where %s..." % depotPath)
+    clientPath = ""
+    if "path" in output:
+        clientPath = output.get("path")
+    elif "data" in output:
+        data = output.get("data")
+        lastSpace = data.rfind(" ")
+        clientPath = data[lastSpace + 1:]
+
+    if clientPath.endswith("..."):
+        clientPath = clientPath[:-3]
+    return clientPath
+

 def die(msg):
     sys.stderr.write(msg + "\n")
     sys.exit(1)
 def die(msg):
     sys.stderr.write(msg + "\n")
     sys.exit(1)


@@ -318,11 +334,7 @@ class P4Sync(Command):
             print "Internal error: cannot locate perforce depot path from existing branches"
             sys.exit(128)
 
             print "Internal error: cannot locate perforce depot path from existing branches"
             sys.exit(128)
 

-        if not depotPath.endswith("/"):
-            depotPath += "/"
-        clientPath = p4Cmd("where %s..." % depotPath).get("path")
-        if clientPath.endswith("..."):
-            clientPath = clientPath[:-3]
+        clientPath = p4Where(depotPath)

 
         if len(clientPath) == 0:
             print "Error: Cannot locate perforce checkout of %s in client view" % depotPath
 
         if len(clientPath) == 0:
             print "Error: Cannot locate perforce checkout of %s in client view" % depotPath