# Author: Simon Hausmann <hausmann@kde.org>
# License: MIT <http://www.opensource.org/licenses/mit-license.php>
#
-# TODO: - fix date parsing (how hard can it be?)
+# TODO:
# - support integrations (at least p4i)
-# - support incremental imports
-# - create tags
-# - instead of reading all files into a variable try to pipe from
-# - p4 print directly to stdout. need to figure out file size somehow
-# though.
# - support p4 submit (hah!)
-# - don't hardcode the import to master
#
-import os, string, sys
-
-if len(sys.argv) != 2:
- sys.stderr.write("usage: %s //depot/path[@revRange]\n" % sys.argv[0]);
- sys.stderr.write("\n example:\n");
- sys.stderr.write(" %s //depot/my/project -- to import everything\n");
- sys.stderr.write(" %s //depot/my/project@1,6 -- to import only from revision 1 to 6\n");
- sys.stderr.write("\n");
+import os, string, sys, time
+import marshal, popen2, getopt
+
+branch = "refs/heads/p4"
+prefix = previousDepotPath = os.popen("git-repo-config --get p4.depotpath").read()
+if len(prefix) != 0:
+ prefix = prefix[:-1]
+
+try:
+ opts, args = getopt.getopt(sys.argv[1:], "", [ "branch=" ])
+except getopt.GetoptError:
+ print "fixme, syntax error"
+ sys.exit(1)
+
+for o, a in opts:
+ if o == "--branch":
+ branch = "refs/heads/" + a
+
+if len(args) == 0 and len(prefix) != 0:
+ print "[using previously specified depot path %s]" % prefix
+elif len(args) != 1:
+ print "usage: %s //depot/path[@revRange]" % sys.argv[0]
+ print "\n example:"
+ print " %s //depot/my/project/ -- to import the current head"
+ print " %s //depot/my/project/@all -- to import everything"
+ print " %s //depot/my/project/@1,6 -- to import only from revision 1 to 6"
+ print ""
+ print " (a ... is not needed in the path p4 specification, it's added implicitly)"
+ print ""
sys.exit(1)
+else:
+ if len(prefix) != 0 and prefix != args[0]:
+ print "previous import used depot path %s and now %s was specified. this doesn't work!" % (prefix, args[0])
+ sys.exit(1)
+ prefix = args[0]
-prefix = sys.argv[1]
changeRange = ""
-try:
+revision = ""
+users = {}
+initialParent = ""
+
+if prefix.find("@") != -1:
atIdx = prefix.index("@")
changeRange = prefix[atIdx:]
+ if changeRange == "@all":
+ changeRange = ""
+ elif changeRange.find(",") == -1:
+ revision = changeRange
+ changeRange = ""
prefix = prefix[0:atIdx]
-except ValueError:
- changeRange = ""
+elif prefix.find("#") != -1:
+ hashIdx = prefix.index("#")
+ revision = prefix[hashIdx:]
+ prefix = prefix[0:hashIdx]
+elif len(previousDepotPath) == 0:
+ revision = "#head"
+
+if prefix.endswith("..."):
+ prefix = prefix[:-3]
+
+if not prefix.endswith("/"):
+ prefix += "/"
+
+def p4CmdList(cmd):
+ pipe = os.popen("p4 -G %s" % cmd, "rb")
+ result = []
+ try:
+ while True:
+ entry = marshal.load(pipe)
+ result.append(entry)
+ except EOFError:
+ pass
+ pipe.close()
+ return result
+
+def p4Cmd(cmd):
+ list = p4CmdList(cmd)
+ result = {}
+ for entry in list:
+ result.update(entry)
+ return result;
+
+def commit(details):
+ global initialParent
+ global users
+
+ epoch = details["time"]
+ author = details["user"]
+
+ gitStream.write("commit %s\n" % branch)
+ committer = ""
+ if author in users:
+ committer = "%s %s %s" % (users[author], epoch, tz)
+ else:
+ committer = "%s <a@b> %s %s" % (author, epoch, tz)
-def describe(change):
- output = os.popen("p4 describe %s" % change).readlines()
+ gitStream.write("committer %s\n" % committer)
- firstLine = output[0]
+ gitStream.write("data <<EOT\n")
+ gitStream.write(details["desc"])
+ gitStream.write("\n[ imported from %s; change %s ]\n" % (prefix, details["change"]))
+ gitStream.write("EOT\n\n")
- author = firstLine.split(" ")[3]
- author = author[:author.find("@")]
+ if len(initialParent) > 0:
+ gitStream.write("from %s\n" % initialParent)
+ initialParent = ""
- filesSection = 0
- try:
- filesSection = output.index("Affected files ...\n")
- except ValueError:
- sys.stderr.write("Change %s doesn't seem to affect any files. Weird.\n" % change)
- return [], [], [], []
+ fnum = 0
+ while details.has_key("depotFile%s" % fnum):
+ path = details["depotFile%s" % fnum]
+ if not path.startswith(prefix):
+ print "\nchanged files: ignoring path %s outside of %s in change %s" % (path, prefix, change)
+ fnum = fnum + 1
+ continue
- differencesSection = 0
- try:
- differencesSection = output.index("Differences ...\n")
- except ValueError:
- sys.stderr.write("Change %s doesn't seem to have a differences section. Weird.\n" % change)
- return [], [], [], []
+ rev = details["rev%s" % fnum]
+ depotPath = path + "#" + rev
+ relPath = path[len(prefix):]
+ action = details["action%s" % fnum]
+
+ if action == "delete":
+ gitStream.write("D %s\n" % relPath)
+ else:
+ mode = 644
+ if details["type%s" % fnum].startswith("x"):
+ mode = 755
+
+ data = os.popen("p4 print -q \"%s\"" % depotPath, "rb").read()
- log = output[2:filesSection - 1]
+ gitStream.write("M %s inline %s\n" % (mode, relPath))
+ gitStream.write("data %s\n" % len(data))
+ gitStream.write(data)
+ gitStream.write("\n")
- lines = output[filesSection + 2:differencesSection - 1]
+ fnum = fnum + 1
- changed = []
- removed = []
+ gitStream.write("\n")
- for line in lines:
- # chop off "... " and trailing newline
- line = line[4:len(line) - 1]
+ gitStream.write("tag p4/%s\n" % details["change"])
+ gitStream.write("from %s\n" % branch);
+ gitStream.write("tagger %s\n" % committer);
+ gitStream.write("data 0\n\n")
- lastSpace = line.rfind(" ")
- if lastSpace == -1:
- sys.stderr.write("trouble parsing line %s, skipping!\n" % line)
+
+def getUserMap():
+ users = {}
+
+ for output in p4CmdList("users"):
+ if not output.has_key("User"):
continue
+ users[output["User"]] = output["FullName"] + " <" + output["Email"] + ">"
+ return users
- operation = line[lastSpace + 1:]
- path = line[:lastSpace]
+users = getUserMap()
- if operation == "delete":
- removed.append(path)
- else:
- changed.append(path)
+if len(changeRange) == 0:
+ try:
+ sout, sin, serr = popen2.popen3("git-name-rev --tags `git-rev-parse %s`" % branch)
+ output = sout.read()
+ tagIdx = output.index(" tags/p4/")
+ caretIdx = output.index("^")
+ rev = int(output[tagIdx + 9 : caretIdx]) + 1
+ changeRange = "@%s,#head" % rev
+ initialParent = os.popen("git-rev-parse %s" % branch).read()[:-1]
+ except:
+ pass
- return author, log, changed, removed
+sys.stderr.write("\n")
-def p4cat(path):
- return os.popen("p4 print -q \"%s\"" % path).read()
+tz = - time.timezone / 36
+tzsign = ("%s" % tz)[0]
+if tzsign != '+' and tzsign != '-':
+ tz = "+" + ("%s" % tz)
-def stripRevision(path):
- hashPos = path.rindex("#")
- return path[:hashPos]
+if len(revision) > 0:
+ print "Doing initial import of %s from revision %s" % (prefix, revision)
-def getUserMap():
- users = {}
- output = os.popen("p4 users")
- for line in output:
- firstSpace = line.index(" ")
- secondSpace = line.index(" ", firstSpace + 1)
- key = line[:firstSpace]
- email = line[firstSpace + 1:secondSpace]
- openParenPos = line.index("(", secondSpace)
- closedParenPos = line.index(")", openParenPos)
- name = line[openParenPos + 1:closedParenPos]
+ details = { "user" : "git perforce import user", "time" : int(time.time()) }
+ details["desc"] = "Initial import of %s from the state at revision %s" % (prefix, revision)
+ details["change"] = revision
+ newestRevision = 0
- users[key] = name + " " + email
+ fileCnt = 0
+ for info in p4CmdList("files %s...%s" % (prefix, revision)):
+ change = int(info["change"])
+ if change > newestRevision:
+ newestRevision = change
- return users
+ if info["action"] == "delete":
+ continue
+ for prop in [ "depotFile", "rev", "action", "type" ]:
+ details["%s%s" % (prop, fileCnt)] = info[prop]
-users = getUserMap()
+ fileCnt = fileCnt + 1
-output = os.popen("p4 changes %s...%s" % (prefix, changeRange)).readlines()
+ details["change"] = newestRevision
-changes = []
-for line in output:
- changeNum = line.split(" ")[1]
- changes.append(changeNum)
+ gitOutput, gitStream, gitError = popen2.popen3("git-fast-import")
+ try:
+ commit(details)
+ except:
+ print gitError.read()
-changes.reverse()
+ gitStream.close()
+ gitOutput.close()
+ gitError.close()
+else:
+ output = os.popen("p4 changes %s...%s" % (prefix, changeRange)).readlines()
-sys.stderr.write("\n")
+ changes = []
+ for line in output:
+ changeNum = line.split(" ")[1]
+ changes.append(changeNum)
-cnt = 0
-for change in changes:
- [ author, log, changedFiles, removedFiles ] = describe(change)
- sys.stderr.write("\rimporting revision %s (%s%%)" % (change, cnt * 100 / len(changes)))
- cnt = cnt + 1
-# sys.stderr.write("%s\n" % log)
-# sys.stderr.write("%s\n" % changedFiles)
-# sys.stderr.write("%s\n" % removedFiles)
+ changes.reverse()
- print "commit refs/heads/master"
- if author in users:
- print "committer %s 1 2" % users[author]
- else:
- print "committer %s <a@b> 1 2" % author
- print "data <<EOT"
- for l in log:
- print l[:len(l) - 1]
- print "EOT"
+ if len(changes) == 0:
+ print "no changes to import!"
+ sys.exit(1)
- print ""
+ gitOutput, gitStream, gitError = popen2.popen3("git-fast-import")
- for f in changedFiles:
- if not f.startswith(prefix):
- sys.stderr.write("\nchanged files: ignoring path %s outside of %s in change %s\n" % (f, prefix, change))
- continue
- relpath = f[len(prefix):]
- print "M 644 inline %s" % stripRevision(relpath)
- data = p4cat(f)
- print "data %s" % len(data)
- sys.stdout.write(data)
- print ""
-
- for f in removedFiles:
- if not f.startswith(prefix):
- sys.stderr.write("\ndeleted files: ignoring path %s outside of %s in change %s\n" % (f, prefix, change))
- continue
- relpath = f[len(prefix):]
- print "D %s" % stripRevision(relpath)
+ cnt = 1
+ for change in changes:
+ description = p4Cmd("describe %s" % change)
- print ""
+ sys.stdout.write("\rimporting revision %s (%s%%)" % (change, cnt * 100 / len(changes)))
+ sys.stdout.flush()
+ cnt = cnt + 1
+
+ try:
+ commit(description)
+ except:
+ print gitError.read()
+ sys.exit(1)
+
+ gitStream.close()
+ gitOutput.close()
+ gitError.close()
+
+print ""
+
+os.popen("git-repo-config p4.depotpath %s" % prefix).read()
+sys.exit(0)