3 # git-p4.py -- A tool for bidirectional operation between a Perforce depot and git.
5 # Author: Simon Hausmann <hausmann@kde.org>
6 # Copyright: 2007 Simon Hausmann <hausmann@kde.org>
8 # License: MIT <http://www.opensource.org/licenses/mit-license.php>
11 import optparse
, sys
, os
, marshal
, popen2
, shelve
12 import tempfile
, getopt
, sha
, os
.path
, time
15 gitdir
= os
.environ
.get("GIT_DIR", "")
18 cmd
= "p4 -G %s" % cmd
19 pipe
= os
.popen(cmd
, "rb")
24 entry
= marshal
.load(pipe
)
39 def p4Where(depotPath
):
40 if not depotPath
.endswith("/"):
42 output
= p4Cmd("where %s..." % depotPath
)
45 clientPath
= output
.get("path")
46 elif "data" in output
:
47 data
= output
.get("data")
48 lastSpace
= data
.rfind(" ")
49 clientPath
= data
[lastSpace
+ 1:]
51 if clientPath
.endswith("..."):
52 clientPath
= clientPath
[:-3]
56 sys
.stderr
.write(msg
+ "\n")
59 def currentGitBranch():
60 return os
.popen("git name-rev HEAD").read().split(" ")[1][:-1]
62 def isValidGitDir(path
):
63 if os
.path
.exists(path
+ "/HEAD") and os
.path
.exists(path
+ "/refs") and os
.path
.exists(path
+ "/objects"):
68 if os
.system(cmd
) != 0:
69 die("command failed: %s" % cmd
)
71 def extractLogMessageFromGitCommit(commit
):
74 for log
in os
.popen("git cat-file commit %s" % commit
).readlines():
83 def extractDepotPathAndChangeFromGitLog(log
):
85 for line
in log
.split("\n"):
87 if line
.startswith("[git-p4:") and line
.endswith("]"):
88 line
= line
[8:-1].strip()
89 for assignment
in line
.split(":"):
90 variable
= assignment
.strip()
92 equalPos
= assignment
.find("=")
94 variable
= assignment
[:equalPos
].strip()
95 value
= assignment
[equalPos
+ 1:].strip()
96 if value
.startswith("\"") and value
.endswith("\""):
98 values
[variable
] = value
100 return values
.get("depot-path"), values
.get("change")
102 def gitBranchExists(branch
):
103 if os
.system("git rev-parse %s 2>/dev/null >/dev/null" % branch
) == 0:
109 self
.usage
= "usage: %prog [options]"
112 class P4Debug(Command
):
114 Command
.__init
__(self
)
117 self
.description
= "A tool to debug the output of p4 -G."
118 self
.needsGit
= False
121 for output
in p4CmdList(" ".join(args
)):
125 class P4CleanTags(Command
):
127 Command
.__init
__(self
)
129 # optparse.make_option("--branch", dest="branch", default="refs/heads/master")
131 self
.description
= "A tool to remove stale unused tags from incremental perforce imports."
133 branch
= currentGitBranch()
134 print "Cleaning out stale p4 import tags..."
135 sout
, sin
, serr
= popen2
.popen3("git name-rev --tags `git rev-parse %s`" % branch
)
138 tagIdx
= output
.index(" tags/p4/")
140 print "Cannot find any p4/* tag. Nothing to do."
144 caretIdx
= output
.index("^")
146 caretIdx
= len(output
) - 1
147 rev
= int(output
[tagIdx
+ 9 : caretIdx
])
149 allTags
= os
.popen("git tag -l p4/").readlines()
150 for i
in range(len(allTags
)):
151 allTags
[i
] = int(allTags
[i
][3:-1])
158 print os
.popen("git tag -d p4/%s" % rev
).read()
160 print "%s tags removed." % len(allTags
)
163 class P4Sync(Command
):
165 Command
.__init
__(self
)
167 optparse
.make_option("--continue", action
="store_false", dest
="firstTime"),
168 optparse
.make_option("--origin", dest
="origin"),
169 optparse
.make_option("--reset", action
="store_true", dest
="reset"),
170 optparse
.make_option("--master", dest
="master"),
171 optparse
.make_option("--log-substitutions", dest
="substFile"),
172 optparse
.make_option("--noninteractive", action
="store_false"),
173 optparse
.make_option("--dry-run", action
="store_true"),
174 optparse
.make_option("--apply-as-patch", action
="store_true", dest
="applyAsPatch")
176 self
.description
= "Submit changes from git to the perforce depot."
177 self
.firstTime
= True
179 self
.interactive
= True
182 self
.firstTime
= True
185 self
.applyAsPatch
= True
187 self
.logSubstitutions
= {}
188 self
.logSubstitutions
["<enter description here>"] = "%log%"
189 self
.logSubstitutions
["\tDetails:"] = "\tDetails: %log%"
192 if len(p4CmdList("opened ...")) > 0:
193 die("You have files opened with perforce! Close them before starting the sync.")
196 if len(self
.config
) > 0 and not self
.reset
:
197 die("Cannot start sync. Previous sync config found at %s" % self
.configFile
)
200 for line
in os
.popen("git rev-list --no-merges %s..%s" % (self
.origin
, self
.master
)).readlines():
201 commits
.append(line
[:-1])
204 self
.config
["commits"] = commits
206 if not self
.applyAsPatch
:
207 print "Creating temporary p4-sync branch from %s ..." % self
.origin
208 system("git checkout -f -b p4-sync %s" % self
.origin
)
210 def prepareLogMessage(self
, template
, message
):
213 for line
in template
.split("\n"):
214 if line
.startswith("#"):
215 result
+= line
+ "\n"
219 for key
in self
.logSubstitutions
.keys():
220 if line
.find(key
) != -1:
221 value
= self
.logSubstitutions
[key
]
222 value
= value
.replace("%log%", message
)
223 if value
!= "@remove@":
224 result
+= line
.replace(key
, value
) + "\n"
229 result
+= line
+ "\n"
234 print "Applying %s" % (os
.popen("git log --max-count=1 --pretty=oneline %s" % id).read())
235 diff
= os
.popen("git diff-tree -r --name-status \"%s^\" \"%s\"" % (id, id)).readlines()
237 filesToDelete
= set()
240 path
= line
[1:].strip()
242 system("p4 edit %s" % path
)
243 elif modifier
== "A":
245 if path
in filesToDelete
:
246 filesToDelete
.remove(path
)
247 elif modifier
== "D":
248 filesToDelete
.add(path
)
249 if path
in filesToAdd
:
250 filesToAdd
.remove(path
)
252 die("unknown modifier %s for %s" % (modifier
, path
))
254 if self
.applyAsPatch
:
255 system("git diff-tree -p --diff-filter=ACMRTUXB \"%s^\" \"%s\" | patch -p1" % (id, id))
257 system("git diff-files --name-only -z | git update-index --remove -z --stdin")
258 system("git cherry-pick --no-commit \"%s\"" % id)
261 system("p4 add %s" % f
)
262 for f
in filesToDelete
:
263 system("p4 revert %s" % f
)
264 system("p4 delete %s" % f
)
266 logMessage
= extractLogMessageFromGitCommit(id)
267 logMessage
= logMessage
.replace("\n", "\n\t")
268 logMessage
= logMessage
[:-1]
270 template
= os
.popen("p4 change -o").read()
273 submitTemplate
= self
.prepareLogMessage(template
, logMessage
)
274 diff
= os
.popen("p4 diff -du ...").read()
276 for newFile
in filesToAdd
:
277 diff
+= "==== new file ====\n"
278 diff
+= "--- /dev/null\n"
279 diff
+= "+++ %s\n" % newFile
280 f
= open(newFile
, "r")
281 for line
in f
.readlines():
285 separatorLine
= "######## everything below this line is just the diff #######\n"
288 firstIteration
= True
289 while response
== "e":
290 if not firstIteration
:
291 response
= raw_input("Do you want to submit this change (y/e/n)? ")
292 firstIteration
= False
294 [handle
, fileName
] = tempfile
.mkstemp()
295 tmpFile
= os
.fdopen(handle
, "w+")
296 tmpFile
.write(submitTemplate
+ separatorLine
+ diff
)
298 editor
= os
.environ
.get("EDITOR", "vi")
299 system(editor
+ " " + fileName
)
300 tmpFile
= open(fileName
, "r")
301 message
= tmpFile
.read()
304 submitTemplate
= message
[:message
.index(separatorLine
)]
306 if response
== "y" or response
== "yes":
309 raw_input("Press return to continue...")
311 pipe
= os
.popen("p4 submit -i", "w")
312 pipe
.write(submitTemplate
)
315 print "Not submitting!"
316 self
.interactive
= False
318 fileName
= "submit.txt"
319 file = open(fileName
, "w+")
320 file.write(self
.prepareLogMessage(template
, logMessage
))
322 print "Perforce submit template written as %s. Please review/edit and then use p4 submit -i < %s to submit directly!" % (fileName
, fileName
)
326 # make gitdir absolute so we can cd out into the perforce checkout
327 gitdir
= os
.path
.abspath(gitdir
)
328 os
.environ
["GIT_DIR"] = gitdir
330 if gitBranchExists("p4"):
331 [depotPath
, dummy
] = extractDepotPathAndChangeFromGitLog(extractLogMessageFromGitCommit("p4"))
332 if len(depotPath
) == 0 and gitBranchExists("origin"):
333 [depotPath
, dummy
] = extractDepotPathAndChangeFromGitLog(extractLogMessageFromGitCommit("origin"))
335 if len(depotPath
) == 0:
336 print "Internal error: cannot locate perforce depot path from existing branches"
339 clientPath
= p4Where(depotPath
)
341 if len(clientPath
) == 0:
342 print "Error: Cannot locate perforce checkout of %s in client view" % depotPath
345 print "Perforce checkout for depot path %s located at %s" % (depotPath
, clientPath
)
347 response
= raw_input("Do you want to sync %s with p4 sync? (y/n) " % clientPath
)
348 if response
== "y" or response
== "yes":
349 system("p4 sync ...")
351 if len(self
.origin
) == 0:
352 if gitBranchExists("p4"):
355 self
.origin
= "origin"
358 self
.firstTime
= True
360 if len(self
.substFile
) > 0:
361 for line
in open(self
.substFile
, "r").readlines():
362 tokens
= line
[:-1].split("=")
363 self
.logSubstitutions
[tokens
[0]] = tokens
[1]
365 if len(self
.master
) == 0:
366 self
.master
= currentGitBranch()
367 if len(self
.master
) == 0 or not os
.path
.exists("%s/refs/heads/%s" % (gitdir
, self
.master
)):
368 die("Detecting current git branch failed!")
371 self
.configFile
= gitdir
+ "/p4-git-sync.cfg"
372 self
.config
= shelve
.open(self
.configFile
, writeback
=True)
377 commits
= self
.config
.get("commits", [])
379 while len(commits
) > 0:
380 self
.firstTime
= False
382 commits
= commits
[1:]
383 self
.config
["commits"] = commits
385 if not self
.interactive
:
390 if len(commits
) == 0:
392 print "No changes found to apply between %s and current HEAD" % self
.origin
394 print "All changes applied!"
395 if not self
.applyAsPatch
:
396 print "Deleting temporary p4-sync branch and going back to %s" % self
.master
397 system("git checkout %s" % self
.master
)
398 system("git branch -D p4-sync")
399 print "Cleaning out your perforce checkout by doing p4 edit ... ; p4 revert ..."
400 system("p4 edit ... >/dev/null")
401 system("p4 revert ... >/dev/null")
402 os
.remove(self
.configFile
)
406 class GitSync(Command
):
408 Command
.__init
__(self
)
410 optparse
.make_option("--branch", dest
="branch"),
411 optparse
.make_option("--detect-branches", dest
="detectBranches", action
="store_true"),
412 optparse
.make_option("--changesfile", dest
="changesFile"),
413 optparse
.make_option("--silent", dest
="silent", action
="store_true"),
414 optparse
.make_option("--known-branches", dest
="knownBranches"),
415 optparse
.make_option("--cache", dest
="doCache", action
="store_true"),
416 optparse
.make_option("--command-cache", dest
="commandCache", action
="store_true")
418 self
.description
= """Imports from Perforce into a git repository.\n
420 //depot/my/project/ -- to import the current head
421 //depot/my/project/@all -- to import everything
422 //depot/my/project/@1,6 -- to import only from revision 1 to 6
424 (a ... is not needed in the path p4 specification, it's added implicitly)"""
426 self
.usage
+= " //depot/path[@revRange]"
428 self
.dataCache
= False
429 self
.commandCache
= False
431 self
.knownBranches
= Set()
432 self
.createdBranches
= Set()
433 self
.committedChanges
= Set()
435 self
.detectBranches
= False
436 self
.changesFile
= ""
438 def p4File(self
, depotPath
):
439 return os
.popen("p4 print -q \"%s\"" % depotPath
, "rb").read()
441 def extractFilesFromCommit(self
, commit
):
444 while commit
.has_key("depotFile%s" % fnum
):
445 path
= commit
["depotFile%s" % fnum
]
446 if not path
.startswith(self
.globalPrefix
):
447 # if not self.silent:
448 # print "\nchanged files: ignoring path %s outside of %s in change %s" % (path, self.globalPrefix, change)
454 file["rev"] = commit
["rev%s" % fnum
]
455 file["action"] = commit
["action%s" % fnum
]
456 file["type"] = commit
["type%s" % fnum
]
461 def isSubPathOf(self
, first
, second
):
462 if not first
.startswith(second
):
466 return first
[len(second
)] == "/"
468 def branchesForCommit(self
, files
):
472 relativePath
= file["path"][len(self
.globalPrefix
):]
473 # strip off the filename
474 relativePath
= relativePath
[0:relativePath
.rfind("/")]
476 # if len(branches) == 0:
477 # branches.add(relativePath)
478 # knownBranches.add(relativePath)
481 ###### this needs more testing :)
483 for branch
in branches
:
484 if relativePath
== branch
:
487 # if relativePath.startswith(branch):
488 if self
.isSubPathOf(relativePath
, branch
):
491 # if branch.startswith(relativePath):
492 if self
.isSubPathOf(branch
, relativePath
):
493 branches
.remove(branch
)
499 for branch
in knownBranches
:
500 #if relativePath.startswith(branch):
501 if self
.isSubPathOf(relativePath
, branch
):
502 if len(branches
) == 0:
503 relativePath
= branch
511 branches
.add(relativePath
)
512 self
.knownBranches
.add(relativePath
)
516 def findBranchParent(self
, branchPrefix
, files
):
519 if not path
.startswith(branchPrefix
):
521 action
= file["action"]
522 if action
!= "integrate" and action
!= "branch":
525 depotPath
= path
+ "#" + rev
527 log
= p4CmdList("filelog \"%s\"" % depotPath
)
529 print "eek! I got confused by the filelog of %s" % depotPath
533 if log
["action0"] != action
:
534 print "eek! wrong action in filelog for %s : found %s, expected %s" % (depotPath
, log
["action0"], action
)
537 branchAction
= log
["how0,0"]
538 # if branchAction == "branch into" or branchAction == "ignored":
539 # continue # ignore for branching
541 if not branchAction
.endswith(" from"):
542 continue # ignore for branching
543 # print "eek! file %s was not branched from but instead: %s" % (depotPath, branchAction)
546 source
= log
["file0,0"]
547 if source
.startswith(branchPrefix
):
550 lastSourceRev
= log
["erev0,0"]
552 sourceLog
= p4CmdList("filelog -m 1 \"%s%s\"" % (source
, lastSourceRev
))
553 if len(sourceLog
) != 1:
554 print "eek! I got confused by the source filelog of %s%s" % (source
, lastSourceRev
)
556 sourceLog
= sourceLog
[0]
558 relPath
= source
[len(self
.globalPrefix
):]
559 # strip off the filename
560 relPath
= relPath
[0:relPath
.rfind("/")]
562 for branch
in self
.knownBranches
:
563 if self
.isSubPathOf(relPath
, branch
):
564 # print "determined parent branch branch %s due to change in file %s" % (branch, source)
567 # print "%s is not a subpath of branch %s" % (relPath, branch)
571 def commit(self
, details
, files
, branch
, branchPrefix
, parent
= "", merged
= ""):
572 epoch
= details
["time"]
573 author
= details
["user"]
575 self
.gitStream
.write("commit %s\n" % branch
)
576 # gitStream.write("mark :%s\n" % details["change"])
577 self
.committedChanges
.add(int(details
["change"]))
579 if author
in self
.users
:
580 committer
= "%s %s %s" % (self
.users
[author
], epoch
, self
.tz
)
582 committer
= "%s <a@b> %s %s" % (author
, epoch
, self
.tz
)
584 self
.gitStream
.write("committer %s\n" % committer
)
586 self
.gitStream
.write("data <<EOT\n")
587 self
.gitStream
.write(details
["desc"])
588 self
.gitStream
.write("\n[git-p4: depot-path = \"%s\": change = %s]\n" % (branchPrefix
, details
["change"]))
589 self
.gitStream
.write("EOT\n\n")
592 self
.gitStream
.write("from %s\n" % parent
)
595 self
.gitStream
.write("merge %s\n" % merged
)
599 if not path
.startswith(branchPrefix
):
601 # print "\nchanged files: ignoring path %s outside of branch prefix %s in change %s" % (path, branchPrefix, details["change"])
604 depotPath
= path
+ "#" + rev
605 relPath
= path
[len(branchPrefix
):]
606 action
= file["action"]
608 if file["type"] == "apple":
609 print "\nfile %s is a strange apple file that forks. Ignoring!" % path
612 if action
== "delete":
613 self
.gitStream
.write("D %s\n" % relPath
)
616 if file["type"].startswith("x"):
619 data
= self
.p4File(depotPath
)
621 self
.gitStream
.write("M %s inline %s\n" % (mode
, relPath
))
622 self
.gitStream
.write("data %s\n" % len(data
))
623 self
.gitStream
.write(data
)
624 self
.gitStream
.write("\n")
626 self
.gitStream
.write("\n")
628 self
.lastChange
= int(details
["change"])
630 def extractFilesInCommitToBranch(self
, files
, branchPrefix
):
635 if path
.startswith(branchPrefix
):
636 newFiles
.append(file)
640 def findBranchSourceHeuristic(self
, files
, branch
, branchPrefix
):
642 action
= file["action"]
643 if action
!= "integrate" and action
!= "branch":
647 depotPath
= path
+ "#" + rev
649 log
= p4CmdList("filelog \"%s\"" % depotPath
)
651 print "eek! I got confused by the filelog of %s" % depotPath
655 if log
["action0"] != action
:
656 print "eek! wrong action in filelog for %s : found %s, expected %s" % (depotPath
, log
["action0"], action
)
659 branchAction
= log
["how0,0"]
661 if not branchAction
.endswith(" from"):
662 continue # ignore for branching
663 # print "eek! file %s was not branched from but instead: %s" % (depotPath, branchAction)
666 source
= log
["file0,0"]
667 if source
.startswith(branchPrefix
):
670 lastSourceRev
= log
["erev0,0"]
672 sourceLog
= p4CmdList("filelog -m 1 \"%s%s\"" % (source
, lastSourceRev
))
673 if len(sourceLog
) != 1:
674 print "eek! I got confused by the source filelog of %s%s" % (source
, lastSourceRev
)
676 sourceLog
= sourceLog
[0]
678 relPath
= source
[len(self
.globalPrefix
):]
679 # strip off the filename
680 relPath
= relPath
[0:relPath
.rfind("/")]
682 for candidate
in self
.knownBranches
:
683 if self
.isSubPathOf(relPath
, candidate
) and candidate
!= branch
:
688 def changeIsBranchMerge(self
, sourceBranch
, destinationBranch
, change
):
690 for file in p4CmdList("files %s...@%s" % (self
.globalPrefix
+ sourceBranch
+ "/", change
)):
691 if file["action"] == "delete":
693 sourceFiles
[file["depotFile"]] = file
695 destinationFiles
= {}
696 for file in p4CmdList("files %s...@%s" % (self
.globalPrefix
+ destinationBranch
+ "/", change
)):
697 destinationFiles
[file["depotFile"]] = file
699 for fileName
in sourceFiles
.keys():
703 for integration
in p4CmdList("integrated \"%s\"" % fileName
):
704 toFile
= integration
["fromFile"] # yes, it's true, it's fromFile
705 if not toFile
in destinationFiles
:
707 destFile
= destinationFiles
[toFile
]
708 if destFile
["action"] == "delete":
709 # print "file %s has been deleted in %s" % (fileName, toFile)
712 integrationCount
+= 1
713 if integration
["how"] == "branch from":
716 if int(integration
["change"]) == change
:
717 integrations
.append(integration
)
719 if int(integration
["change"]) > change
:
722 destRev
= int(destFile
["rev"])
724 startRev
= integration
["startFromRev"][1:]
725 if startRev
== "none":
728 startRev
= int(startRev
)
730 endRev
= integration
["endFromRev"][1:]
736 initialBranch
= (destRev
== 1 and integration
["how"] != "branch into")
737 inRange
= (destRev
>= startRev
and destRev
<= endRev
)
738 newer
= (destRev
> startRev
and destRev
> endRev
)
740 if initialBranch
or inRange
or newer
:
741 integrations
.append(integration
)
746 if len(integrations
) == 0 and integrationCount
> 1:
747 print "file %s was not integrated from %s into %s" % (fileName
, sourceBranch
, destinationBranch
)
752 def getUserMap(self
):
755 for output
in p4CmdList("users"):
756 if not output
.has_key("User"):
758 self
.users
[output
["User"]] = output
["FullName"] + " <" + output
["Email"] + ">"
761 self
.globalPrefix
= ""
762 self
.changeRange
= ""
763 self
.initialParent
= ""
764 self
.tagLastChange
= True
766 if len(self
.branch
) == 0:
770 if not gitBranchExists(self
.branch
) and gitBranchExists("origin"):
772 print "Creating %s branch in git repository based on origin" % self
.branch
773 system("git branch %s origin" % self
.branch
)
775 [self
.previousDepotPath
, p4Change
] = extractDepotPathAndChangeFromGitLog(extractLogMessageFromGitCommit(self
.branch
))
776 if len(self
.previousDepotPath
) > 0 and len(p4Change
) > 0:
777 p4Change
= int(p4Change
) + 1
778 self
.globalPrefix
= self
.previousDepotPath
779 self
.changeRange
= "@%s,#head" % p4Change
780 self
.initialParent
= self
.branch
781 self
.tagLastChange
= False
783 print "Performing incremental import into %s git branch" % self
.branch
785 self
.branch
= "refs/heads/" + self
.branch
787 if len(self
.globalPrefix
) == 0:
788 self
.globalPrefix
= self
.previousDepotPath
= os
.popen("git repo-config --get p4.depotpath").read()
790 if len(self
.globalPrefix
) != 0:
791 self
.globalPrefix
= self
.globalPrefix
[:-1]
793 if len(args
) == 0 and len(self
.globalPrefix
) != 0:
795 print "Depot path: %s" % self
.globalPrefix
799 if len(self
.globalPrefix
) != 0 and self
.globalPrefix
!= args
[0]:
800 print "previous import used depot path %s and now %s was specified. this doesn't work!" % (self
.globalPrefix
, args
[0])
802 self
.globalPrefix
= args
[0]
809 if self
.globalPrefix
.find("@") != -1:
810 atIdx
= self
.globalPrefix
.index("@")
811 self
.changeRange
= self
.globalPrefix
[atIdx
:]
812 if self
.changeRange
== "@all":
813 self
.changeRange
= ""
814 elif self
.changeRange
.find(",") == -1:
815 self
.revision
= self
.changeRange
816 self
.changeRange
= ""
817 self
.globalPrefix
= self
.globalPrefix
[0:atIdx
]
818 elif self
.globalPrefix
.find("#") != -1:
819 hashIdx
= self
.globalPrefix
.index("#")
820 self
.revision
= self
.globalPrefix
[hashIdx
:]
821 self
.globalPrefix
= self
.globalPrefix
[0:hashIdx
]
822 elif len(self
.previousDepotPath
) == 0:
823 self
.revision
= "#head"
825 if self
.globalPrefix
.endswith("..."):
826 self
.globalPrefix
= self
.globalPrefix
[:-3]
828 if not self
.globalPrefix
.endswith("/"):
829 self
.globalPrefix
+= "/"
833 if len(self
.changeRange
) == 0:
835 sout
, sin
, serr
= popen2
.popen3("git name-rev --tags `git rev-parse %s`" % self
.branch
)
837 if output
.endswith("\n"):
839 tagIdx
= output
.index(" tags/p4/")
840 caretIdx
= output
.find("^")
844 self
.rev
= int(output
[tagIdx
+ 9 : endPos
]) + 1
845 self
.changeRange
= "@%s,#head" % self
.rev
846 self
.initialParent
= os
.popen("git rev-parse %s" % self
.branch
).read()[:-1]
847 self
.initialTag
= "p4/%s" % (int(self
.rev
) - 1)
851 self
.tz
= - time
.timezone
/ 36
852 tzsign
= ("%s" % self
.tz
)[0]
853 if tzsign
!= '+' and tzsign
!= '-':
854 self
.tz
= "+" + ("%s" % self
.tz
)
856 self
.gitOutput
, self
.gitStream
, self
.gitError
= popen2
.popen3("git fast-import")
858 if len(self
.revision
) > 0:
859 print "Doing initial import of %s from revision %s" % (self
.globalPrefix
, self
.revision
)
861 details
= { "user" : "git perforce import user", "time" : int(time
.time()) }
862 details
["desc"] = "Initial import of %s from the state at revision %s" % (self
.globalPrefix
, self
.revision
)
863 details
["change"] = self
.revision
867 for info
in p4CmdList("files %s...%s" % (self
.globalPrefix
, self
.revision
)):
868 change
= int(info
["change"])
869 if change
> newestRevision
:
870 newestRevision
= change
872 if info
["action"] == "delete":
873 fileCnt
= fileCnt
+ 1
876 for prop
in [ "depotFile", "rev", "action", "type" ]:
877 details
["%s%s" % (prop
, fileCnt
)] = info
[prop
]
879 fileCnt
= fileCnt
+ 1
881 details
["change"] = newestRevision
884 self
.commit(details
, self
.extractFilesFromCommit(details
), self
.branch
, self
.globalPrefix
)
886 print self
.gitError
.read()
891 if len(self
.changesFile
) > 0:
892 output
= open(self
.changesFile
).readlines()
895 changeSet
.add(int(line
))
897 for change
in changeSet
:
898 changes
.append(change
)
902 output
= os
.popen("p4 changes %s...%s" % (self
.globalPrefix
, self
.changeRange
)).readlines()
905 changeNum
= line
.split(" ")[1]
906 changes
.append(changeNum
)
910 if len(changes
) == 0:
912 print "no changes to import!"
916 for change
in changes
:
917 description
= p4Cmd("describe %s" % change
)
920 sys
.stdout
.write("\rimporting revision %s (%s%%)" % (change
, cnt
* 100 / len(changes
)))
925 files
= self
.extractFilesFromCommit(description
)
926 if self
.detectBranches
:
927 for branch
in self
.branchesForCommit(files
):
928 self
.knownBranches
.add(branch
)
929 branchPrefix
= self
.globalPrefix
+ branch
+ "/"
931 filesForCommit
= self
.extractFilesInCommitToBranch(files
, branchPrefix
)
935 ########### remove cnt!!!
936 if branch
not in self
.createdBranches
and cnt
> 2:
937 self
.createdBranches
.add(branch
)
938 parent
= self
.findBranchParent(branchPrefix
, files
)
941 # elif len(parent) > 0:
942 # print "%s branched off of %s" % (branch, parent)
945 merged
= self
.findBranchSourceHeuristic(filesForCommit
, branch
, branchPrefix
)
947 print "change %s could be a merge from %s into %s" % (description
["change"], merged
, branch
)
948 if not self
.changeIsBranchMerge(merged
, branch
, int(description
["change"])):
951 branch
= "refs/heads/" + branch
953 parent
= "refs/heads/" + parent
955 merged
= "refs/heads/" + merged
956 self
.commit(description
, files
, branch
, branchPrefix
, parent
, merged
)
958 self
.commit(description
, files
, self
.branch
, self
.globalPrefix
, self
.initialParent
)
959 self
.initialParent
= ""
961 print self
.gitError
.read()
967 if self
.tagLastChange
:
968 self
.gitStream
.write("reset refs/tags/p4/%s\n" % self
.lastChange
)
969 self
.gitStream
.write("from %s\n\n" % self
.branch
);
972 self
.gitStream
.close()
973 self
.gitOutput
.close()
974 self
.gitError
.close()
976 os
.popen("git repo-config p4.depotpath %s" % self
.globalPrefix
).read()
977 if len(self
.initialTag
) > 0:
978 os
.popen("git tag -d %s" % self
.initialTag
).read()
982 class HelpFormatter(optparse
.IndentedHelpFormatter
):
984 optparse
.IndentedHelpFormatter
.__init
__(self
)
986 def format_description(self
, description
):
988 return description
+ "\n"
992 def printUsage(commands
):
993 print "usage: %s <command> [options]" % sys
.argv
[0]
995 print "valid commands: %s" % ", ".join(commands
)
997 print "Try %s <command> --help for command specific help." % sys
.argv
[0]
1001 "debug" : P4Debug(),
1002 "clean-tags" : P4CleanTags(),
1003 "submit" : P4Sync(),
1007 if len(sys
.argv
[1:]) == 0:
1008 printUsage(commands
.keys())
1012 cmdName
= sys
.argv
[1]
1014 cmd
= commands
[cmdName
]
1016 print "unknown command %s" % cmdName
1018 printUsage(commands
.keys())
1021 options
= cmd
.options
1026 if len(options
) > 0:
1027 options
.append(optparse
.make_option("--git-dir", dest
="gitdir"))
1029 parser
= optparse
.OptionParser(cmd
.usage
.replace("%prog", "%prog " + cmdName
),
1031 description
= cmd
.description
,
1032 formatter
= HelpFormatter())
1034 (cmd
, args
) = parser
.parse_args(sys
.argv
[2:], cmd
);
1038 if len(gitdir
) == 0:
1040 if not isValidGitDir(gitdir
):
1041 cdup
= os
.popen("git rev-parse --show-cdup").read()[:-1]
1042 if isValidGitDir(cdup
+ "/" + gitdir
):
1045 if not isValidGitDir(gitdir
):
1046 if isValidGitDir(gitdir
+ "/.git"):
1049 die("fatal: cannot locate git repository at %s" % gitdir
)
1051 os
.environ
["GIT_DIR"] = gitdir
1053 if not cmd
.run(args
):