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 P4Submit(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("--log-substitutions", dest
="substFile"),
171 optparse
.make_option("--noninteractive", action
="store_false"),
172 optparse
.make_option("--dry-run", action
="store_true"),
173 optparse
.make_option("--apply-as-patch", action
="store_true", dest
="applyAsPatch")
175 self
.description
= "Submit changes from git to the perforce depot."
176 self
.usage
+= " [name of git branch to submit into perforce depot]"
177 self
.firstTime
= True
179 self
.interactive
= True
182 self
.firstTime
= True
184 self
.applyAsPatch
= True
186 self
.logSubstitutions
= {}
187 self
.logSubstitutions
["<enter description here>"] = "%log%"
188 self
.logSubstitutions
["\tDetails:"] = "\tDetails: %log%"
191 if len(p4CmdList("opened ...")) > 0:
192 die("You have files opened with perforce! Close them before starting the sync.")
195 if len(self
.config
) > 0 and not self
.reset
:
196 die("Cannot start sync. Previous sync config found at %s" % self
.configFile
)
199 for line
in os
.popen("git rev-list --no-merges %s..%s" % (self
.origin
, self
.master
)).readlines():
200 commits
.append(line
[:-1])
203 self
.config
["commits"] = commits
205 if not self
.applyAsPatch
:
206 print "Creating temporary p4-sync branch from %s ..." % self
.origin
207 system("git checkout -f -b p4-sync %s" % self
.origin
)
209 def prepareLogMessage(self
, template
, message
):
212 for line
in template
.split("\n"):
213 if line
.startswith("#"):
214 result
+= line
+ "\n"
218 for key
in self
.logSubstitutions
.keys():
219 if line
.find(key
) != -1:
220 value
= self
.logSubstitutions
[key
]
221 value
= value
.replace("%log%", message
)
222 if value
!= "@remove@":
223 result
+= line
.replace(key
, value
) + "\n"
228 result
+= line
+ "\n"
233 print "Applying %s" % (os
.popen("git log --max-count=1 --pretty=oneline %s" % id).read())
234 diff
= os
.popen("git diff-tree -r --name-status \"%s^\" \"%s\"" % (id, id)).readlines()
236 filesToDelete
= set()
239 path
= line
[1:].strip()
241 system("p4 edit %s" % path
)
242 elif modifier
== "A":
244 if path
in filesToDelete
:
245 filesToDelete
.remove(path
)
246 elif modifier
== "D":
247 filesToDelete
.add(path
)
248 if path
in filesToAdd
:
249 filesToAdd
.remove(path
)
251 die("unknown modifier %s for %s" % (modifier
, path
))
253 if self
.applyAsPatch
:
254 system("git diff-tree -p --diff-filter=ACMRTUXB \"%s^\" \"%s\" | patch -p1" % (id, id))
256 system("git diff-files --name-only -z | git update-index --remove -z --stdin")
257 system("git cherry-pick --no-commit \"%s\"" % id)
260 system("p4 add %s" % f
)
261 for f
in filesToDelete
:
262 system("p4 revert %s" % f
)
263 system("p4 delete %s" % f
)
265 logMessage
= extractLogMessageFromGitCommit(id)
266 logMessage
= logMessage
.replace("\n", "\n\t")
267 logMessage
= logMessage
[:-1]
269 template
= os
.popen("p4 change -o").read()
272 submitTemplate
= self
.prepareLogMessage(template
, logMessage
)
273 diff
= os
.popen("p4 diff -du ...").read()
275 for newFile
in filesToAdd
:
276 diff
+= "==== new file ====\n"
277 diff
+= "--- /dev/null\n"
278 diff
+= "+++ %s\n" % newFile
279 f
= open(newFile
, "r")
280 for line
in f
.readlines():
284 separatorLine
= "######## everything below this line is just the diff #######\n"
287 firstIteration
= True
288 while response
== "e":
289 if not firstIteration
:
290 response
= raw_input("Do you want to submit this change (y/e/n)? ")
291 firstIteration
= False
293 [handle
, fileName
] = tempfile
.mkstemp()
294 tmpFile
= os
.fdopen(handle
, "w+")
295 tmpFile
.write(submitTemplate
+ separatorLine
+ diff
)
297 editor
= os
.environ
.get("EDITOR", "vi")
298 system(editor
+ " " + fileName
)
299 tmpFile
= open(fileName
, "r")
300 message
= tmpFile
.read()
303 submitTemplate
= message
[:message
.index(separatorLine
)]
305 if response
== "y" or response
== "yes":
308 raw_input("Press return to continue...")
310 pipe
= os
.popen("p4 submit -i", "w")
311 pipe
.write(submitTemplate
)
314 print "Not submitting!"
315 self
.interactive
= False
317 fileName
= "submit.txt"
318 file = open(fileName
, "w+")
319 file.write(self
.prepareLogMessage(template
, logMessage
))
321 print "Perforce submit template written as %s. Please review/edit and then use p4 submit -i < %s to submit directly!" % (fileName
, fileName
)
325 # make gitdir absolute so we can cd out into the perforce checkout
326 gitdir
= os
.path
.abspath(gitdir
)
327 os
.environ
["GIT_DIR"] = gitdir
330 self
.master
= currentGitBranch()
331 if len(self
.master
) == 0 or not os
.path
.exists("%s/refs/heads/%s" % (gitdir
, self
.master
)):
332 die("Detecting current git branch failed!")
334 self
.master
= args
[0]
339 if gitBranchExists("p4"):
340 [depotPath
, dummy
] = extractDepotPathAndChangeFromGitLog(extractLogMessageFromGitCommit("p4"))
341 if len(depotPath
) == 0 and gitBranchExists("origin"):
342 [depotPath
, dummy
] = extractDepotPathAndChangeFromGitLog(extractLogMessageFromGitCommit("origin"))
344 if len(depotPath
) == 0:
345 print "Internal error: cannot locate perforce depot path from existing branches"
348 clientPath
= p4Where(depotPath
)
350 if len(clientPath
) == 0:
351 print "Error: Cannot locate perforce checkout of %s in client view" % depotPath
354 print "Perforce checkout for depot path %s located at %s" % (depotPath
, clientPath
)
356 response
= raw_input("Do you want to sync %s with p4 sync? (y/n) " % clientPath
)
357 if response
== "y" or response
== "yes":
358 system("p4 sync ...")
360 if len(self
.origin
) == 0:
361 if gitBranchExists("p4"):
364 self
.origin
= "origin"
367 self
.firstTime
= True
369 if len(self
.substFile
) > 0:
370 for line
in open(self
.substFile
, "r").readlines():
371 tokens
= line
[:-1].split("=")
372 self
.logSubstitutions
[tokens
[0]] = tokens
[1]
375 self
.configFile
= gitdir
+ "/p4-git-sync.cfg"
376 self
.config
= shelve
.open(self
.configFile
, writeback
=True)
381 commits
= self
.config
.get("commits", [])
383 while len(commits
) > 0:
384 self
.firstTime
= False
386 commits
= commits
[1:]
387 self
.config
["commits"] = commits
389 if not self
.interactive
:
394 if len(commits
) == 0:
396 print "No changes found to apply between %s and current HEAD" % self
.origin
398 print "All changes applied!"
399 if not self
.applyAsPatch
:
400 print "Deleting temporary p4-sync branch and going back to %s" % self
.master
401 system("git checkout %s" % self
.master
)
402 system("git branch -D p4-sync")
403 print "Cleaning out your perforce checkout by doing p4 edit ... ; p4 revert ..."
404 system("p4 edit ... >/dev/null")
405 system("p4 revert ... >/dev/null")
406 os
.remove(self
.configFile
)
410 class P4Sync(Command
):
412 Command
.__init
__(self
)
414 optparse
.make_option("--branch", dest
="branch"),
415 optparse
.make_option("--detect-branches", dest
="detectBranches", action
="store_true"),
416 optparse
.make_option("--changesfile", dest
="changesFile"),
417 optparse
.make_option("--silent", dest
="silent", action
="store_true"),
418 optparse
.make_option("--known-branches", dest
="knownBranches"),
419 optparse
.make_option("--data-cache", dest
="dataCache", action
="store_true"),
420 optparse
.make_option("--command-cache", dest
="commandCache", action
="store_true"),
421 optparse
.make_option("--detect-labels", dest
="detectLabels", action
="store_true")
423 self
.description
= """Imports from Perforce into a git repository.\n
425 //depot/my/project/ -- to import the current head
426 //depot/my/project/@all -- to import everything
427 //depot/my/project/@1,6 -- to import only from revision 1 to 6
429 (a ... is not needed in the path p4 specification, it's added implicitly)"""
431 self
.usage
+= " //depot/path[@revRange]"
433 self
.dataCache
= False
434 self
.commandCache
= False
436 self
.knownBranches
= Set()
437 self
.createdBranches
= Set()
438 self
.committedChanges
= Set()
440 self
.detectBranches
= False
441 self
.detectLabels
= False
442 self
.changesFile
= ""
443 self
.tagLastChange
= True
445 def p4File(self
, depotPath
):
446 return os
.popen("p4 print -q \"%s\"" % depotPath
, "rb").read()
448 def extractFilesFromCommit(self
, commit
):
451 while commit
.has_key("depotFile%s" % fnum
):
452 path
= commit
["depotFile%s" % fnum
]
453 if not path
.startswith(self
.globalPrefix
):
454 # if not self.silent:
455 # print "\nchanged files: ignoring path %s outside of %s in change %s" % (path, self.globalPrefix, change)
461 file["rev"] = commit
["rev%s" % fnum
]
462 file["action"] = commit
["action%s" % fnum
]
463 file["type"] = commit
["type%s" % fnum
]
468 def isSubPathOf(self
, first
, second
):
469 if not first
.startswith(second
):
473 return first
[len(second
)] == "/"
475 def branchesForCommit(self
, files
):
479 relativePath
= file["path"][len(self
.globalPrefix
):]
480 # strip off the filename
481 relativePath
= relativePath
[0:relativePath
.rfind("/")]
483 # if len(branches) == 0:
484 # branches.add(relativePath)
485 # knownBranches.add(relativePath)
488 ###### this needs more testing :)
490 for branch
in branches
:
491 if relativePath
== branch
:
494 # if relativePath.startswith(branch):
495 if self
.isSubPathOf(relativePath
, branch
):
498 # if branch.startswith(relativePath):
499 if self
.isSubPathOf(branch
, relativePath
):
500 branches
.remove(branch
)
506 for branch
in self
.knownBranches
:
507 #if relativePath.startswith(branch):
508 if self
.isSubPathOf(relativePath
, branch
):
509 if len(branches
) == 0:
510 relativePath
= branch
518 branches
.add(relativePath
)
519 self
.knownBranches
.add(relativePath
)
523 def findBranchParent(self
, branchPrefix
, files
):
526 if not path
.startswith(branchPrefix
):
528 action
= file["action"]
529 if action
!= "integrate" and action
!= "branch":
532 depotPath
= path
+ "#" + rev
534 log
= p4CmdList("filelog \"%s\"" % depotPath
)
536 print "eek! I got confused by the filelog of %s" % depotPath
540 if log
["action0"] != action
:
541 print "eek! wrong action in filelog for %s : found %s, expected %s" % (depotPath
, log
["action0"], action
)
544 branchAction
= log
["how0,0"]
545 # if branchAction == "branch into" or branchAction == "ignored":
546 # continue # ignore for branching
548 if not branchAction
.endswith(" from"):
549 continue # ignore for branching
550 # print "eek! file %s was not branched from but instead: %s" % (depotPath, branchAction)
553 source
= log
["file0,0"]
554 if source
.startswith(branchPrefix
):
557 lastSourceRev
= log
["erev0,0"]
559 sourceLog
= p4CmdList("filelog -m 1 \"%s%s\"" % (source
, lastSourceRev
))
560 if len(sourceLog
) != 1:
561 print "eek! I got confused by the source filelog of %s%s" % (source
, lastSourceRev
)
563 sourceLog
= sourceLog
[0]
565 relPath
= source
[len(self
.globalPrefix
):]
566 # strip off the filename
567 relPath
= relPath
[0:relPath
.rfind("/")]
569 for branch
in self
.knownBranches
:
570 if self
.isSubPathOf(relPath
, branch
):
571 # print "determined parent branch branch %s due to change in file %s" % (branch, source)
574 # print "%s is not a subpath of branch %s" % (relPath, branch)
578 def commit(self
, details
, files
, branch
, branchPrefix
, parent
= "", merged
= ""):
579 epoch
= details
["time"]
580 author
= details
["user"]
582 self
.gitStream
.write("commit %s\n" % branch
)
583 # gitStream.write("mark :%s\n" % details["change"])
584 self
.committedChanges
.add(int(details
["change"]))
586 if author
in self
.users
:
587 committer
= "%s %s %s" % (self
.users
[author
], epoch
, self
.tz
)
589 committer
= "%s <a@b> %s %s" % (author
, epoch
, self
.tz
)
591 self
.gitStream
.write("committer %s\n" % committer
)
593 self
.gitStream
.write("data <<EOT\n")
594 self
.gitStream
.write(details
["desc"])
595 self
.gitStream
.write("\n[git-p4: depot-path = \"%s\": change = %s]\n" % (branchPrefix
, details
["change"]))
596 self
.gitStream
.write("EOT\n\n")
599 self
.gitStream
.write("from %s\n" % parent
)
602 self
.gitStream
.write("merge %s\n" % merged
)
606 if not path
.startswith(branchPrefix
):
608 # print "\nchanged files: ignoring path %s outside of branch prefix %s in change %s" % (path, branchPrefix, details["change"])
611 depotPath
= path
+ "#" + rev
612 relPath
= path
[len(branchPrefix
):]
613 action
= file["action"]
615 if file["type"] == "apple":
616 print "\nfile %s is a strange apple file that forks. Ignoring!" % path
619 if action
== "delete":
620 self
.gitStream
.write("D %s\n" % relPath
)
623 if file["type"].startswith("x"):
626 data
= self
.p4File(depotPath
)
628 self
.gitStream
.write("M %s inline %s\n" % (mode
, relPath
))
629 self
.gitStream
.write("data %s\n" % len(data
))
630 self
.gitStream
.write(data
)
631 self
.gitStream
.write("\n")
633 self
.gitStream
.write("\n")
635 change
= int(details
["change"])
637 self
.lastChange
= change
639 if change
in self
.labels
:
640 label
= self
.labels
[change
]
641 labelDetails
= label
[0]
642 labelRevisions
= label
[1]
644 files
= p4CmdList("files %s...@%s" % (branchPrefix
, change
))
646 if len(files
) == len(labelRevisions
):
650 if info
["action"] == "delete":
652 cleanedFiles
[info
["depotFile"]] = info
["rev"]
654 if cleanedFiles
== labelRevisions
:
655 self
.gitStream
.write("tag tag_%s\n" % labelDetails
["label"])
656 self
.gitStream
.write("from %s\n" % branch
)
658 owner
= labelDetails
["Owner"]
660 if author
in self
.users
:
661 tagger
= "%s %s %s" % (self
.users
[owner
], epoch
, self
.tz
)
663 tagger
= "%s <a@b> %s %s" % (owner
, epoch
, self
.tz
)
664 self
.gitStream
.write("tagger %s\n" % tagger
)
665 self
.gitStream
.write("data <<EOT\n")
666 self
.gitStream
.write(labelDetails
["Description"])
667 self
.gitStream
.write("EOT\n\n")
671 print "Tag %s does not match with change %s: files do not match." % (labelDetails
["label"], change
)
675 print "Tag %s does not match with change %s: file count is different." % (labelDetails
["label"], change
)
677 def extractFilesInCommitToBranch(self
, files
, branchPrefix
):
682 if path
.startswith(branchPrefix
):
683 newFiles
.append(file)
687 def findBranchSourceHeuristic(self
, files
, branch
, branchPrefix
):
689 action
= file["action"]
690 if action
!= "integrate" and action
!= "branch":
694 depotPath
= path
+ "#" + rev
696 log
= p4CmdList("filelog \"%s\"" % depotPath
)
698 print "eek! I got confused by the filelog of %s" % depotPath
702 if log
["action0"] != action
:
703 print "eek! wrong action in filelog for %s : found %s, expected %s" % (depotPath
, log
["action0"], action
)
706 branchAction
= log
["how0,0"]
708 if not branchAction
.endswith(" from"):
709 continue # ignore for branching
710 # print "eek! file %s was not branched from but instead: %s" % (depotPath, branchAction)
713 source
= log
["file0,0"]
714 if source
.startswith(branchPrefix
):
717 lastSourceRev
= log
["erev0,0"]
719 sourceLog
= p4CmdList("filelog -m 1 \"%s%s\"" % (source
, lastSourceRev
))
720 if len(sourceLog
) != 1:
721 print "eek! I got confused by the source filelog of %s%s" % (source
, lastSourceRev
)
723 sourceLog
= sourceLog
[0]
725 relPath
= source
[len(self
.globalPrefix
):]
726 # strip off the filename
727 relPath
= relPath
[0:relPath
.rfind("/")]
729 for candidate
in self
.knownBranches
:
730 if self
.isSubPathOf(relPath
, candidate
) and candidate
!= branch
:
735 def changeIsBranchMerge(self
, sourceBranch
, destinationBranch
, change
):
737 for file in p4CmdList("files %s...@%s" % (self
.globalPrefix
+ sourceBranch
+ "/", change
)):
738 if file["action"] == "delete":
740 sourceFiles
[file["depotFile"]] = file
742 destinationFiles
= {}
743 for file in p4CmdList("files %s...@%s" % (self
.globalPrefix
+ destinationBranch
+ "/", change
)):
744 destinationFiles
[file["depotFile"]] = file
746 for fileName
in sourceFiles
.keys():
750 for integration
in p4CmdList("integrated \"%s\"" % fileName
):
751 toFile
= integration
["fromFile"] # yes, it's true, it's fromFile
752 if not toFile
in destinationFiles
:
754 destFile
= destinationFiles
[toFile
]
755 if destFile
["action"] == "delete":
756 # print "file %s has been deleted in %s" % (fileName, toFile)
759 integrationCount
+= 1
760 if integration
["how"] == "branch from":
763 if int(integration
["change"]) == change
:
764 integrations
.append(integration
)
766 if int(integration
["change"]) > change
:
769 destRev
= int(destFile
["rev"])
771 startRev
= integration
["startFromRev"][1:]
772 if startRev
== "none":
775 startRev
= int(startRev
)
777 endRev
= integration
["endFromRev"][1:]
783 initialBranch
= (destRev
== 1 and integration
["how"] != "branch into")
784 inRange
= (destRev
>= startRev
and destRev
<= endRev
)
785 newer
= (destRev
> startRev
and destRev
> endRev
)
787 if initialBranch
or inRange
or newer
:
788 integrations
.append(integration
)
793 if len(integrations
) == 0 and integrationCount
> 1:
794 print "file %s was not integrated from %s into %s" % (fileName
, sourceBranch
, destinationBranch
)
799 def getUserMap(self
):
802 for output
in p4CmdList("users"):
803 if not output
.has_key("User"):
805 self
.users
[output
["User"]] = output
["FullName"] + " <" + output
["Email"] + ">"
810 l
= p4CmdList("labels %s..." % self
.globalPrefix
)
811 if len(l
) > 0 and not silent
:
812 print "Finding files belonging to labels in %s" % self
.globalPrefix
815 label
= output
["label"]
818 for file in p4CmdList("files //...@%s" % label
):
819 revisions
[file["depotFile"]] = file["rev"]
820 change
= int(file["change"])
821 if change
> newestChange
:
822 newestChange
= change
824 self
.labels
[newestChange
] = [output
, revisions
]
827 self
.globalPrefix
= ""
828 self
.changeRange
= ""
829 self
.initialParent
= ""
831 if len(self
.branch
) == 0:
835 if not gitBranchExists(self
.branch
) and gitBranchExists("origin"):
837 print "Creating %s branch in git repository based on origin" % self
.branch
838 system("git branch %s origin" % self
.branch
)
840 [self
.previousDepotPath
, p4Change
] = extractDepotPathAndChangeFromGitLog(extractLogMessageFromGitCommit(self
.branch
))
841 if len(self
.previousDepotPath
) > 0 and len(p4Change
) > 0:
842 p4Change
= int(p4Change
) + 1
843 self
.globalPrefix
= self
.previousDepotPath
844 self
.changeRange
= "@%s,#head" % p4Change
845 self
.initialParent
= self
.branch
846 self
.tagLastChange
= False
848 print "Performing incremental import into %s git branch" % self
.branch
850 self
.branch
= "refs/heads/" + self
.branch
852 if len(self
.globalPrefix
) == 0:
853 self
.globalPrefix
= self
.previousDepotPath
= os
.popen("git repo-config --get p4.depotpath").read()
855 if len(self
.globalPrefix
) != 0:
856 self
.globalPrefix
= self
.globalPrefix
[:-1]
858 if len(args
) == 0 and len(self
.globalPrefix
) != 0:
860 print "Depot path: %s" % self
.globalPrefix
864 if len(self
.globalPrefix
) != 0 and self
.globalPrefix
!= args
[0]:
865 print "previous import used depot path %s and now %s was specified. this doesn't work!" % (self
.globalPrefix
, args
[0])
867 self
.globalPrefix
= args
[0]
874 if self
.globalPrefix
.find("@") != -1:
875 atIdx
= self
.globalPrefix
.index("@")
876 self
.changeRange
= self
.globalPrefix
[atIdx
:]
877 if self
.changeRange
== "@all":
878 self
.changeRange
= ""
879 elif self
.changeRange
.find(",") == -1:
880 self
.revision
= self
.changeRange
881 self
.changeRange
= ""
882 self
.globalPrefix
= self
.globalPrefix
[0:atIdx
]
883 elif self
.globalPrefix
.find("#") != -1:
884 hashIdx
= self
.globalPrefix
.index("#")
885 self
.revision
= self
.globalPrefix
[hashIdx
:]
886 self
.globalPrefix
= self
.globalPrefix
[0:hashIdx
]
887 elif len(self
.previousDepotPath
) == 0:
888 self
.revision
= "#head"
890 if self
.globalPrefix
.endswith("..."):
891 self
.globalPrefix
= self
.globalPrefix
[:-3]
893 if not self
.globalPrefix
.endswith("/"):
894 self
.globalPrefix
+= "/"
898 if self
.detectLabels
:
901 if len(self
.changeRange
) == 0:
903 sout
, sin
, serr
= popen2
.popen3("git name-rev --tags `git rev-parse %s`" % self
.branch
)
905 if output
.endswith("\n"):
907 tagIdx
= output
.index(" tags/p4/")
908 caretIdx
= output
.find("^")
912 self
.rev
= int(output
[tagIdx
+ 9 : endPos
]) + 1
913 self
.changeRange
= "@%s,#head" % self
.rev
914 self
.initialParent
= os
.popen("git rev-parse %s" % self
.branch
).read()[:-1]
915 self
.initialTag
= "p4/%s" % (int(self
.rev
) - 1)
919 self
.tz
= - time
.timezone
/ 36
920 tzsign
= ("%s" % self
.tz
)[0]
921 if tzsign
!= '+' and tzsign
!= '-':
922 self
.tz
= "+" + ("%s" % self
.tz
)
924 self
.gitOutput
, self
.gitStream
, self
.gitError
= popen2
.popen3("git fast-import")
926 if len(self
.revision
) > 0:
927 print "Doing initial import of %s from revision %s" % (self
.globalPrefix
, self
.revision
)
929 details
= { "user" : "git perforce import user", "time" : int(time
.time()) }
930 details
["desc"] = "Initial import of %s from the state at revision %s" % (self
.globalPrefix
, self
.revision
)
931 details
["change"] = self
.revision
935 for info
in p4CmdList("files %s...%s" % (self
.globalPrefix
, self
.revision
)):
936 change
= int(info
["change"])
937 if change
> newestRevision
:
938 newestRevision
= change
940 if info
["action"] == "delete":
941 fileCnt
= fileCnt
+ 1
944 for prop
in [ "depotFile", "rev", "action", "type" ]:
945 details
["%s%s" % (prop
, fileCnt
)] = info
[prop
]
947 fileCnt
= fileCnt
+ 1
949 details
["change"] = newestRevision
952 self
.commit(details
, self
.extractFilesFromCommit(details
), self
.branch
, self
.globalPrefix
)
954 print self
.gitError
.read()
959 if len(self
.changesFile
) > 0:
960 output
= open(self
.changesFile
).readlines()
963 changeSet
.add(int(line
))
965 for change
in changeSet
:
966 changes
.append(change
)
970 output
= os
.popen("p4 changes %s...%s" % (self
.globalPrefix
, self
.changeRange
)).readlines()
973 changeNum
= line
.split(" ")[1]
974 changes
.append(changeNum
)
978 if len(changes
) == 0:
980 print "no changes to import!"
984 for change
in changes
:
985 description
= p4Cmd("describe %s" % change
)
988 sys
.stdout
.write("\rimporting revision %s (%s%%)" % (change
, cnt
* 100 / len(changes
)))
993 files
= self
.extractFilesFromCommit(description
)
994 if self
.detectBranches
:
995 for branch
in self
.branchesForCommit(files
):
996 self
.knownBranches
.add(branch
)
997 branchPrefix
= self
.globalPrefix
+ branch
+ "/"
999 filesForCommit
= self
.extractFilesInCommitToBranch(files
, branchPrefix
)
1003 ########### remove cnt!!!
1004 if branch
not in self
.createdBranches
and cnt
> 2:
1005 self
.createdBranches
.add(branch
)
1006 parent
= self
.findBranchParent(branchPrefix
, files
)
1007 if parent
== branch
:
1009 # elif len(parent) > 0:
1010 # print "%s branched off of %s" % (branch, parent)
1012 if len(parent
) == 0:
1013 merged
= self
.findBranchSourceHeuristic(filesForCommit
, branch
, branchPrefix
)
1015 print "change %s could be a merge from %s into %s" % (description
["change"], merged
, branch
)
1016 if not self
.changeIsBranchMerge(merged
, branch
, int(description
["change"])):
1019 branch
= "refs/heads/" + branch
1021 parent
= "refs/heads/" + parent
1023 merged
= "refs/heads/" + merged
1024 self
.commit(description
, files
, branch
, branchPrefix
, parent
, merged
)
1026 self
.commit(description
, files
, self
.branch
, self
.globalPrefix
, self
.initialParent
)
1027 self
.initialParent
= ""
1029 print self
.gitError
.read()
1035 if self
.tagLastChange
:
1036 self
.gitStream
.write("reset refs/tags/p4/%s\n" % self
.lastChange
)
1037 self
.gitStream
.write("from %s\n\n" % self
.branch
);
1040 self
.gitStream
.close()
1041 self
.gitOutput
.close()
1042 self
.gitError
.close()
1044 os
.popen("git repo-config p4.depotpath %s" % self
.globalPrefix
).read()
1045 if len(self
.initialTag
) > 0:
1046 os
.popen("git tag -d %s" % self
.initialTag
).read()
1050 class P4Rebase(Command
):
1052 Command
.__init
__(self
)
1054 self
.description
= "Fetches the latest revision from perforce and rebases the current work (branch) against it"
1056 def run(self
, args
):
1059 print "Rebasing the current branch"
1060 oldHead
= os
.popen("git rev-parse HEAD").read()[:-1]
1061 system("git rebase p4")
1062 system("git diff-tree --stat --summary -M %s HEAD" % oldHead
)
1065 class P4Clone(P4Sync
):
1067 P4Sync
.__init
__(self
)
1068 self
.description
= "Creates a new git repository and imports from Perforce into it"
1069 self
.usage
= "usage: %prog [options] //depot/path[@revRange] [directory]"
1070 self
.needsGit
= False
1071 self
.tagLastChange
= False
1073 def run(self
, args
):
1083 if not depotPath
.startswith("//"):
1088 atPos
= dir.rfind("@")
1091 hashPos
= dir.rfind("#")
1093 dir = dir[0:hashPos
]
1095 if dir.endswith("..."):
1098 if dir.endswith("/"):
1101 slashPos
= dir.rfind("/")
1103 dir = dir[slashPos
+ 1:]
1105 print "Importing from %s into %s" % (depotPath
, dir)
1109 if not P4Sync
.run(self
, [depotPath
]):
1112 if self
.branch
!= "master":
1113 system("git branch master p4")
1114 system("git checkout -f")
1117 class HelpFormatter(optparse
.IndentedHelpFormatter
):
1119 optparse
.IndentedHelpFormatter
.__init
__(self
)
1121 def format_description(self
, description
):
1123 return description
+ "\n"
1127 def printUsage(commands
):
1128 print "usage: %s <command> [options]" % sys
.argv
[0]
1130 print "valid commands: %s" % ", ".join(commands
)
1132 print "Try %s <command> --help for command specific help." % sys
.argv
[0]
1136 "debug" : P4Debug(),
1137 "clean-tags" : P4CleanTags(),
1138 "submit" : P4Submit(),
1140 "rebase" : P4Rebase(),
1144 if len(sys
.argv
[1:]) == 0:
1145 printUsage(commands
.keys())
1149 cmdName
= sys
.argv
[1]
1151 cmd
= commands
[cmdName
]
1153 print "unknown command %s" % cmdName
1155 printUsage(commands
.keys())
1158 options
= cmd
.options
1163 if len(options
) > 0:
1164 options
.append(optparse
.make_option("--git-dir", dest
="gitdir"))
1166 parser
= optparse
.OptionParser(cmd
.usage
.replace("%prog", "%prog " + cmdName
),
1168 description
= cmd
.description
,
1169 formatter
= HelpFormatter())
1171 (cmd
, args
) = parser
.parse_args(sys
.argv
[2:], cmd
);
1175 if len(gitdir
) == 0:
1177 if not isValidGitDir(gitdir
):
1178 cdup
= os
.popen("git rev-parse --show-cdup").read()[:-1]
1179 if isValidGitDir(cdup
+ "/" + gitdir
):
1182 if not isValidGitDir(gitdir
):
1183 if isValidGitDir(gitdir
+ "/.git"):
1186 die("fatal: cannot locate git repository at %s" % gitdir
)
1188 os
.environ
["GIT_DIR"] = gitdir
1190 if not cmd
.run(args
):