kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Create lightweight git tags (using the "reset" trick) for the incremental import instead of full-blown ones. Also fix parsing the output of git name-rev for figuring out the last imported p4 change number. 

Signed-off-by: Simon Hausmann <simon@lst.de>
maint
Simon Hausmann 2007-02-11 18:04:39 +01:00
parent f7d63b0c99
commit fc21f8a1da
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -170,9 +170,14 @@ if len(changeRange) == 0:
try: try:
sout, sin, serr = popen2.popen3("git-name-rev --tags `git-rev-parse %s`" % branch) sout, sin, serr = popen2.popen3("git-name-rev --tags `git-rev-parse %s`" % branch)
output = sout.read() output = sout.read()
if output.endswith("\n"):
output = output[:-1]
tagIdx = output.index(" tags/p4/") tagIdx = output.index(" tags/p4/")
caretIdx = output.index("^") caretIdx = output.find("^")
rev = int(output[tagIdx + 9 : caretIdx]) + 1 endPos = len(output)
if caretIdx != -1:
endPos = caretIdx
rev = int(output[tagIdx + 9 : endPos]) + 1
changeRange = "@%s,#head" % rev changeRange = "@%s,#head" % rev
initialParent = os.popen("git-rev-parse %s" % branch).read()[:-1] initialParent = os.popen("git-rev-parse %s" % branch).read()[:-1]
initialTag = "p4/%s" % (int(rev) - 1) initialTag = "p4/%s" % (int(rev) - 1)
@ -247,10 +252,9 @@ else:


print "" print ""


gitStream.write("tag p4/%s\n" % lastChange) gitStream.write("reset refs/tags/p4/%s\n" % lastChange)
gitStream.write("from %s\n" % branch); gitStream.write("from %s\n\n" % branch);
gitStream.write("tagger %s\n" % lastCommitter);
gitStream.write("data 0\n\n")


gitStream.close() gitStream.close()
gitOutput.close() gitOutput.close()