undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More fixes in heuristic p4 branch detection based on common path components.

Browse Source 
Signed-off-by: Simon Hausmann <simon@lst.de>
This commit is contained in:
Simon Hausmann 2007-02-12 21:41:45 +01:00
parent 766887e110
commit dcacf8b447
1 changed files with 74 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
contrib/fast-import/p4-fast-export.py
View File

@ -12,11 +12,12 @@
import os, string, sys, time import os, string, sys, time
import marshal, popen2, getopt import marshal, popen2, getopt
knownBranches = set()
branch = "refs/heads/master" branch = "refs/heads/master"
prefix = previousDepotPath = os.popen("git-repo-config --get p4.depotpath").read() globalPrefix = previousDepotPath = os.popen("git-repo-config --get p4.depotpath").read()
detectBranches = False detectBranches = False
if len(prefix) != 0: if len(globalPrefix) != 0:
prefix = prefix[:-1] globalPrefix = globalPrefix[:-1]
try: try:
opts, args = getopt.getopt(sys.argv[1:], "", [ "branch=", "detect-branches" ]) opts, args = getopt.getopt(sys.argv[1:], "", [ "branch=", "detect-branches" ])
@ -30,8 +31,8 @@ for o, a in opts:
elif o == "--detect-branches": elif o == "--detect-branches":
detectBranches = True detectBranches = True
if len(args) == 0 and len(prefix) != 0: if len(args) == 0 and len(globalPrefix) != 0:
print "[using previously specified depot path %s]" % prefix print "[using previously specified depot path %s]" % globalPrefix
elif len(args) != 1: elif len(args) != 1:
print "usage: %s //depot/path[@revRange]" % sys.argv[0] print "usage: %s //depot/path[@revRange]" % sys.argv[0]
print "\n example:" print "\n example:"
@ -43,10 +44,10 @@ elif len(args) != 1:
print "" print ""
sys.exit(1) sys.exit(1)
else: else:
if len(prefix) != 0 and prefix != args[0]: if len(globalPrefix) != 0 and globalPrefix != args[0]:
print "previous import used depot path %s and now %s was specified. this doesn't work!" % (prefix, args[0]) print "previous import used depot path %s and now %s was specified. this doesn't work!" % (globalPrefix, args[0])
sys.exit(1) sys.exit(1)
prefix = args[0] globalPrefix = args[0]
changeRange = "" changeRange = ""
revision = "" revision = ""
@ -55,27 +56,27 @@ initialParent = ""
lastChange = "" lastChange = ""
initialTag = "" initialTag = ""
if prefix.find("@") != -1: if globalPrefix.find("@") != -1:
atIdx = prefix.index("@") atIdx = globalPrefix.index("@")
changeRange = prefix[atIdx:] changeRange = globalPrefix[atIdx:]
if changeRange == "@all": if changeRange == "@all":
changeRange = "" changeRange = ""
elif changeRange.find(",") == -1: elif changeRange.find(",") == -1:
revision = changeRange revision = changeRange
changeRange = "" changeRange = ""
prefix = prefix[0:atIdx] globalPrefix = globalPrefix[0:atIdx]
elif prefix.find("#") != -1: elif globalPrefix.find("#") != -1:
hashIdx = prefix.index("#") hashIdx = globalPrefix.index("#")
revision = prefix[hashIdx:] revision = globalPrefix[hashIdx:]
prefix = prefix[0:hashIdx] globalPrefix = globalPrefix[0:hashIdx]
elif len(previousDepotPath) == 0: elif len(previousDepotPath) == 0:
revision = "#head" revision = "#head"
if prefix.endswith("..."): if globalPrefix.endswith("..."):
prefix = prefix[:-3] globalPrefix = globalPrefix[:-3]
if not prefix.endswith("/"): if not globalPrefix.endswith("/"):
prefix += "/" globalPrefix += "/"
def p4CmdList(cmd): def p4CmdList(cmd):
pipe = os.popen("p4 -G %s" % cmd, "rb") pipe = os.popen("p4 -G %s" % cmd, "rb")
@ -101,8 +102,8 @@ def extractFilesFromCommit(commit):
fnum = 0 fnum = 0
while commit.has_key("depotFile%s" % fnum): while commit.has_key("depotFile%s" % fnum):
path = commit["depotFile%s" % fnum] path = commit["depotFile%s" % fnum]
if not path.startswith(prefix): if not path.startswith(globalPrefix):
print "\nchanged files: ignoring path %s outside of %s in change %s" % (path, prefix, change) print "\nchanged files: ignoring path %s outside of %s in change %s" % (path, globalPrefix, change)
continue continue
file = {} file = {}
@ -118,7 +119,7 @@ def branchesForCommit(files):
branches = set() branches = set()
for file in files: for file in files:
relativePath = file["path"][len(prefix):] relativePath = file["path"][len(globalPrefix):]
# strip off the filename # strip off the filename
relativePath = relativePath[0:relativePath.rfind("/")] relativePath = relativePath[0:relativePath.rfind("/")]
@ -144,7 +145,7 @@ def branchesForCommit(files):
return branches return branches
def commit(details, files, branch, prefix): def commit(details, files, branch, branchPrefix):
global initialParent global initialParent
global users global users
global lastChange global lastChange
@ -163,7 +164,7 @@ def commit(details, files, branch, prefix):
gitStream.write("data <<EOT\n") gitStream.write("data <<EOT\n")
gitStream.write(details["desc"]) gitStream.write(details["desc"])
gitStream.write("\n[ imported from %s; change %s ]\n" % (prefix, details["change"])) gitStream.write("\n[ imported from %s; change %s ]\n" % (branchPrefix, details["change"]))
gitStream.write("EOT\n\n") gitStream.write("EOT\n\n")
if len(initialParent) > 0: if len(initialParent) > 0:
@ -172,9 +173,47 @@ def commit(details, files, branch, prefix):
for file in files: for file in files:
path = file["path"] path = file["path"]
if not path.startswith(branchPrefix):
continue
action = file["action"]
if action != "integrate" and action != "branch":
continue
rev = file["rev"] rev = file["rev"]
depotPath = path + "#" + rev depotPath = path + "#" + rev
relPath = path[len(prefix):]
log = p4CmdList("filelog \"%s\"" % depotPath)
if len(log) != 1:
print "eek! I got confused by the filelog of %s" % depotPath
sys.exit(1);
log = log[0]
if log["action0"] != action:
print "eek! wrong action in filelog for %s : found %s, expected %s" % (depotPath, log["action0"], action)
sys.exit(1);
if not log["how0,0"].endswith(" from"):
print "eek! file %s was not branched but instead: %s" % (depotPath, log["how0,0"])
sys.exit(1);
source = log["file0,0"]
if source.startswith(branchPrefix):
continue
relPath = source[len(globalPrefix):]
for branch in knownBranches:
if relPath.startswith(branch):
gitStream.write("merge refs/heads/%s\n" % branch)
break
for file in files:
path = file["path"]
if not path.startswith(branchPrefix):
print "\nchanged files: ignoring path %s outside of branch prefix %s in change %s" % (path, branchPrefix, change)
continue
rev = file["rev"]
depotPath = path + "#" + rev
relPath = path[len(branchPrefix):]
action = file["action"] action = file["action"]
if action == "delete": if action == "delete":
@ -234,15 +273,15 @@ if tzsign != '+' and tzsign != '-':
gitOutput, gitStream, gitError = popen2.popen3("git-fast-import") gitOutput, gitStream, gitError = popen2.popen3("git-fast-import")
if len(revision) > 0: if len(revision) > 0:
print "Doing initial import of %s from revision %s" % (prefix, revision) print "Doing initial import of %s from revision %s" % (globalPrefix, revision)
details = { "user" : "git perforce import user", "time" : int(time.time()) } 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["desc"] = "Initial import of %s from the state at revision %s" % (globalPrefix, revision)
details["change"] = revision details["change"] = revision
newestRevision = 0 newestRevision = 0
fileCnt = 0 fileCnt = 0
for info in p4CmdList("files %s...%s" % (prefix, revision)): for info in p4CmdList("files %s...%s" % (globalPrefix, revision)):
change = int(info["change"]) change = int(info["change"])
if change > newestRevision: if change > newestRevision:
newestRevision = change newestRevision = change
@ -258,12 +297,12 @@ if len(revision) > 0:
details["change"] = newestRevision details["change"] = newestRevision
try: try:
commit(details, extractFilesFromCommit(details), branch, prefix) commit(details, extractFilesFromCommit(details), branch, globalPrefix)
except: except:
print gitError.read() print gitError.read()
else: else:
output = os.popen("p4 changes %s...%s" % (prefix, changeRange)).readlines() output = os.popen("p4 changes %s...%s" % (globalPrefix, changeRange)).readlines()
changes = [] changes = []
for line in output: for line in output:
@ -288,11 +327,12 @@ else:
files = extractFilesFromCommit(description) files = extractFilesFromCommit(description)
if detectBranches: if detectBranches:
for branch in branchesForCommit(files): for branch in branchesForCommit(files):
branchPrefix = prefix + branch + "/" knownBranches.add(branch)
branchPrefix = globalPrefix + branch + "/"
branch = "refs/heads/" + branch branch = "refs/heads/" + branch
commit(description, files, branch, branchPrefix) commit(description, files, branch, branchPrefix)
else: else:
commit(description, files, branch, prefix) commit(description, files, branch, globalPrefix)
except: except:
print gitError.read() print gitError.read()
sys.exit(1) sys.exit(1)
@ -307,7 +347,7 @@ gitStream.close()
gitOutput.close() gitOutput.close()
gitError.close() gitError.close()
os.popen("git-repo-config p4.depotpath %s" % prefix).read() os.popen("git-repo-config p4.depotpath %s" % globalPrefix).read()
if len(initialTag) > 0: if len(initialTag) > 0:
os.popen("git tag -d %s" % initialTag).read() os.popen("git tag -d %s" % initialTag).read()