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"),
174 self
.description
= "Submit changes from git to the perforce depot."
175 self
.usage
+= " [name of git branch to submit into perforce depot]"
176 self
.firstTime
= True
178 self
.interactive
= True
181 self
.firstTime
= True
184 self
.logSubstitutions
= {}
185 self
.logSubstitutions
["<enter description here>"] = "%log%"
186 self
.logSubstitutions
["\tDetails:"] = "\tDetails: %log%"
189 if len(p4CmdList("opened ...")) > 0:
190 die("You have files opened with perforce! Close them before starting the sync.")
193 if len(self
.config
) > 0 and not self
.reset
:
194 die("Cannot start sync. Previous sync config found at %s" % self
.configFile
)
197 for line
in os
.popen("git rev-list --no-merges %s..%s" % (self
.origin
, self
.master
)).readlines():
198 commits
.append(line
[:-1])
201 self
.config
["commits"] = commits
203 def prepareLogMessage(self
, template
, message
):
206 for line
in template
.split("\n"):
207 if line
.startswith("#"):
208 result
+= line
+ "\n"
212 for key
in self
.logSubstitutions
.keys():
213 if line
.find(key
) != -1:
214 value
= self
.logSubstitutions
[key
]
215 value
= value
.replace("%log%", message
)
216 if value
!= "@remove@":
217 result
+= line
.replace(key
, value
) + "\n"
222 result
+= line
+ "\n"
227 print "Applying %s" % (os
.popen("git log --max-count=1 --pretty=oneline %s" % id).read())
228 diff
= os
.popen("git diff-tree -r --name-status \"%s^\" \"%s\"" % (id, id)).readlines()
230 filesToDelete
= set()
233 path
= line
[1:].strip()
235 system("p4 edit %s" % path
)
236 elif modifier
== "A":
238 if path
in filesToDelete
:
239 filesToDelete
.remove(path
)
240 elif modifier
== "D":
241 filesToDelete
.add(path
)
242 if path
in filesToAdd
:
243 filesToAdd
.remove(path
)
245 die("unknown modifier %s for %s" % (modifier
, path
))
247 system("git diff-tree -p --diff-filter=ACMRTUXB \"%s^\" \"%s\" | patch -p1" % (id, id))
250 system("p4 add %s" % f
)
251 for f
in filesToDelete
:
252 system("p4 revert %s" % f
)
253 system("p4 delete %s" % f
)
255 logMessage
= extractLogMessageFromGitCommit(id)
256 logMessage
= logMessage
.replace("\n", "\n\t")
257 logMessage
= logMessage
[:-1]
259 template
= os
.popen("p4 change -o").read()
262 submitTemplate
= self
.prepareLogMessage(template
, logMessage
)
263 diff
= os
.popen("p4 diff -du ...").read()
265 for newFile
in filesToAdd
:
266 diff
+= "==== new file ====\n"
267 diff
+= "--- /dev/null\n"
268 diff
+= "+++ %s\n" % newFile
269 f
= open(newFile
, "r")
270 for line
in f
.readlines():
274 separatorLine
= "######## everything below this line is just the diff #######\n"
277 firstIteration
= True
278 while response
== "e":
279 if not firstIteration
:
280 response
= raw_input("Do you want to submit this change (y/e/n)? ")
281 firstIteration
= False
283 [handle
, fileName
] = tempfile
.mkstemp()
284 tmpFile
= os
.fdopen(handle
, "w+")
285 tmpFile
.write(submitTemplate
+ separatorLine
+ diff
)
287 editor
= os
.environ
.get("EDITOR", "vi")
288 system(editor
+ " " + fileName
)
289 tmpFile
= open(fileName
, "r")
290 message
= tmpFile
.read()
293 submitTemplate
= message
[:message
.index(separatorLine
)]
295 if response
== "y" or response
== "yes":
298 raw_input("Press return to continue...")
300 pipe
= os
.popen("p4 submit -i", "w")
301 pipe
.write(submitTemplate
)
304 print "Not submitting!"
305 self
.interactive
= False
307 fileName
= "submit.txt"
308 file = open(fileName
, "w+")
309 file.write(self
.prepareLogMessage(template
, logMessage
))
311 print "Perforce submit template written as %s. Please review/edit and then use p4 submit -i < %s to submit directly!" % (fileName
, fileName
)
315 # make gitdir absolute so we can cd out into the perforce checkout
316 gitdir
= os
.path
.abspath(gitdir
)
317 os
.environ
["GIT_DIR"] = gitdir
320 self
.master
= currentGitBranch()
321 if len(self
.master
) == 0 or not os
.path
.exists("%s/refs/heads/%s" % (gitdir
, self
.master
)):
322 die("Detecting current git branch failed!")
324 self
.master
= args
[0]
329 if gitBranchExists("p4"):
330 [depotPath
, dummy
] = extractDepotPathAndChangeFromGitLog(extractLogMessageFromGitCommit("p4"))
331 if len(depotPath
) == 0 and gitBranchExists("origin"):
332 [depotPath
, dummy
] = extractDepotPathAndChangeFromGitLog(extractLogMessageFromGitCommit("origin"))
334 if len(depotPath
) == 0:
335 print "Internal error: cannot locate perforce depot path from existing branches"
338 clientPath
= p4Where(depotPath
)
340 if len(clientPath
) == 0:
341 print "Error: Cannot locate perforce checkout of %s in client view" % depotPath
344 print "Perforce checkout for depot path %s located at %s" % (depotPath
, clientPath
)
345 oldWorkingDirectory
= os
.getcwd()
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]
366 self
.configFile
= gitdir
+ "/p4-git-sync.cfg"
367 self
.config
= shelve
.open(self
.configFile
, writeback
=True)
372 commits
= self
.config
.get("commits", [])
374 while len(commits
) > 0:
375 self
.firstTime
= False
377 commits
= commits
[1:]
378 self
.config
["commits"] = commits
380 if not self
.interactive
:
385 if len(commits
) == 0:
387 print "No changes found to apply between %s and current HEAD" % self
.origin
389 print "All changes applied!"
390 response
= raw_input("Do you want to sync from Perforce now using git-p4 rebase (y/n)? ")
391 if response
== "y" or response
== "yes":
392 os
.chdir(oldWorkingDirectory
)
395 os
.remove(self
.configFile
)
399 class P4Sync(Command
):
401 Command
.__init
__(self
)
403 optparse
.make_option("--branch", dest
="branch"),
404 optparse
.make_option("--detect-branches", dest
="detectBranches", action
="store_true"),
405 optparse
.make_option("--changesfile", dest
="changesFile"),
406 optparse
.make_option("--silent", dest
="silent", action
="store_true"),
407 optparse
.make_option("--known-branches", dest
="knownBranches"),
408 optparse
.make_option("--data-cache", dest
="dataCache", action
="store_true"),
409 optparse
.make_option("--command-cache", dest
="commandCache", action
="store_true"),
410 optparse
.make_option("--detect-labels", dest
="detectLabels", action
="store_true")
412 self
.description
= """Imports from Perforce into a git repository.\n
414 //depot/my/project/ -- to import the current head
415 //depot/my/project/@all -- to import everything
416 //depot/my/project/@1,6 -- to import only from revision 1 to 6
418 (a ... is not needed in the path p4 specification, it's added implicitly)"""
420 self
.usage
+= " //depot/path[@revRange]"
422 self
.dataCache
= False
423 self
.commandCache
= False
425 self
.knownBranches
= Set()
426 self
.createdBranches
= Set()
427 self
.committedChanges
= Set()
429 self
.detectBranches
= False
430 self
.detectLabels
= False
431 self
.changesFile
= ""
432 self
.tagLastChange
= True
434 def p4File(self
, depotPath
):
435 return os
.popen("p4 print -q \"%s\"" % depotPath
, "rb").read()
437 def extractFilesFromCommit(self
, commit
):
440 while commit
.has_key("depotFile%s" % fnum
):
441 path
= commit
["depotFile%s" % fnum
]
442 if not path
.startswith(self
.globalPrefix
):
443 # if not self.silent:
444 # print "\nchanged files: ignoring path %s outside of %s in change %s" % (path, self.globalPrefix, change)
450 file["rev"] = commit
["rev%s" % fnum
]
451 file["action"] = commit
["action%s" % fnum
]
452 file["type"] = commit
["type%s" % fnum
]
457 def isSubPathOf(self
, first
, second
):
458 if not first
.startswith(second
):
462 return first
[len(second
)] == "/"
464 def branchesForCommit(self
, files
):
468 relativePath
= file["path"][len(self
.globalPrefix
):]
469 # strip off the filename
470 relativePath
= relativePath
[0:relativePath
.rfind("/")]
472 # if len(branches) == 0:
473 # branches.add(relativePath)
474 # knownBranches.add(relativePath)
477 ###### this needs more testing :)
479 for branch
in branches
:
480 if relativePath
== branch
:
483 # if relativePath.startswith(branch):
484 if self
.isSubPathOf(relativePath
, branch
):
487 # if branch.startswith(relativePath):
488 if self
.isSubPathOf(branch
, relativePath
):
489 branches
.remove(branch
)
495 for branch
in self
.knownBranches
:
496 #if relativePath.startswith(branch):
497 if self
.isSubPathOf(relativePath
, branch
):
498 if len(branches
) == 0:
499 relativePath
= branch
507 branches
.add(relativePath
)
508 self
.knownBranches
.add(relativePath
)
512 def findBranchParent(self
, branchPrefix
, files
):
515 if not path
.startswith(branchPrefix
):
517 action
= file["action"]
518 if action
!= "integrate" and action
!= "branch":
521 depotPath
= path
+ "#" + rev
523 log
= p4CmdList("filelog \"%s\"" % depotPath
)
525 print "eek! I got confused by the filelog of %s" % depotPath
529 if log
["action0"] != action
:
530 print "eek! wrong action in filelog for %s : found %s, expected %s" % (depotPath
, log
["action0"], action
)
533 branchAction
= log
["how0,0"]
534 # if branchAction == "branch into" or branchAction == "ignored":
535 # continue # ignore for branching
537 if not branchAction
.endswith(" from"):
538 continue # ignore for branching
539 # print "eek! file %s was not branched from but instead: %s" % (depotPath, branchAction)
542 source
= log
["file0,0"]
543 if source
.startswith(branchPrefix
):
546 lastSourceRev
= log
["erev0,0"]
548 sourceLog
= p4CmdList("filelog -m 1 \"%s%s\"" % (source
, lastSourceRev
))
549 if len(sourceLog
) != 1:
550 print "eek! I got confused by the source filelog of %s%s" % (source
, lastSourceRev
)
552 sourceLog
= sourceLog
[0]
554 relPath
= source
[len(self
.globalPrefix
):]
555 # strip off the filename
556 relPath
= relPath
[0:relPath
.rfind("/")]
558 for branch
in self
.knownBranches
:
559 if self
.isSubPathOf(relPath
, branch
):
560 # print "determined parent branch branch %s due to change in file %s" % (branch, source)
563 # print "%s is not a subpath of branch %s" % (relPath, branch)
567 def commit(self
, details
, files
, branch
, branchPrefix
, parent
= "", merged
= ""):
568 epoch
= details
["time"]
569 author
= details
["user"]
571 self
.gitStream
.write("commit %s\n" % branch
)
572 # gitStream.write("mark :%s\n" % details["change"])
573 self
.committedChanges
.add(int(details
["change"]))
575 if author
in self
.users
:
576 committer
= "%s %s %s" % (self
.users
[author
], epoch
, self
.tz
)
578 committer
= "%s <a@b> %s %s" % (author
, epoch
, self
.tz
)
580 self
.gitStream
.write("committer %s\n" % committer
)
582 self
.gitStream
.write("data <<EOT\n")
583 self
.gitStream
.write(details
["desc"])
584 self
.gitStream
.write("\n[git-p4: depot-path = \"%s\": change = %s]\n" % (branchPrefix
, details
["change"]))
585 self
.gitStream
.write("EOT\n\n")
588 self
.gitStream
.write("from %s\n" % parent
)
591 self
.gitStream
.write("merge %s\n" % merged
)
595 if not path
.startswith(branchPrefix
):
597 # print "\nchanged files: ignoring path %s outside of branch prefix %s in change %s" % (path, branchPrefix, details["change"])
600 depotPath
= path
+ "#" + rev
601 relPath
= path
[len(branchPrefix
):]
602 action
= file["action"]
604 if file["type"] == "apple":
605 print "\nfile %s is a strange apple file that forks. Ignoring!" % path
608 if action
== "delete":
609 self
.gitStream
.write("D %s\n" % relPath
)
612 if file["type"].startswith("x"):
615 data
= self
.p4File(depotPath
)
617 self
.gitStream
.write("M %s inline %s\n" % (mode
, relPath
))
618 self
.gitStream
.write("data %s\n" % len(data
))
619 self
.gitStream
.write(data
)
620 self
.gitStream
.write("\n")
622 self
.gitStream
.write("\n")
624 change
= int(details
["change"])
626 self
.lastChange
= change
628 if change
in self
.labels
:
629 label
= self
.labels
[change
]
630 labelDetails
= label
[0]
631 labelRevisions
= label
[1]
633 files
= p4CmdList("files %s...@%s" % (branchPrefix
, change
))
635 if len(files
) == len(labelRevisions
):
639 if info
["action"] == "delete":
641 cleanedFiles
[info
["depotFile"]] = info
["rev"]
643 if cleanedFiles
== labelRevisions
:
644 self
.gitStream
.write("tag tag_%s\n" % labelDetails
["label"])
645 self
.gitStream
.write("from %s\n" % branch
)
647 owner
= labelDetails
["Owner"]
649 if author
in self
.users
:
650 tagger
= "%s %s %s" % (self
.users
[owner
], epoch
, self
.tz
)
652 tagger
= "%s <a@b> %s %s" % (owner
, epoch
, self
.tz
)
653 self
.gitStream
.write("tagger %s\n" % tagger
)
654 self
.gitStream
.write("data <<EOT\n")
655 self
.gitStream
.write(labelDetails
["Description"])
656 self
.gitStream
.write("EOT\n\n")
660 print "Tag %s does not match with change %s: files do not match." % (labelDetails
["label"], change
)
664 print "Tag %s does not match with change %s: file count is different." % (labelDetails
["label"], change
)
666 def extractFilesInCommitToBranch(self
, files
, branchPrefix
):
671 if path
.startswith(branchPrefix
):
672 newFiles
.append(file)
676 def findBranchSourceHeuristic(self
, files
, branch
, branchPrefix
):
678 action
= file["action"]
679 if action
!= "integrate" and action
!= "branch":
683 depotPath
= path
+ "#" + rev
685 log
= p4CmdList("filelog \"%s\"" % depotPath
)
687 print "eek! I got confused by the filelog of %s" % depotPath
691 if log
["action0"] != action
:
692 print "eek! wrong action in filelog for %s : found %s, expected %s" % (depotPath
, log
["action0"], action
)
695 branchAction
= log
["how0,0"]
697 if not branchAction
.endswith(" from"):
698 continue # ignore for branching
699 # print "eek! file %s was not branched from but instead: %s" % (depotPath, branchAction)
702 source
= log
["file0,0"]
703 if source
.startswith(branchPrefix
):
706 lastSourceRev
= log
["erev0,0"]
708 sourceLog
= p4CmdList("filelog -m 1 \"%s%s\"" % (source
, lastSourceRev
))
709 if len(sourceLog
) != 1:
710 print "eek! I got confused by the source filelog of %s%s" % (source
, lastSourceRev
)
712 sourceLog
= sourceLog
[0]
714 relPath
= source
[len(self
.globalPrefix
):]
715 # strip off the filename
716 relPath
= relPath
[0:relPath
.rfind("/")]
718 for candidate
in self
.knownBranches
:
719 if self
.isSubPathOf(relPath
, candidate
) and candidate
!= branch
:
724 def changeIsBranchMerge(self
, sourceBranch
, destinationBranch
, change
):
726 for file in p4CmdList("files %s...@%s" % (self
.globalPrefix
+ sourceBranch
+ "/", change
)):
727 if file["action"] == "delete":
729 sourceFiles
[file["depotFile"]] = file
731 destinationFiles
= {}
732 for file in p4CmdList("files %s...@%s" % (self
.globalPrefix
+ destinationBranch
+ "/", change
)):
733 destinationFiles
[file["depotFile"]] = file
735 for fileName
in sourceFiles
.keys():
739 for integration
in p4CmdList("integrated \"%s\"" % fileName
):
740 toFile
= integration
["fromFile"] # yes, it's true, it's fromFile
741 if not toFile
in destinationFiles
:
743 destFile
= destinationFiles
[toFile
]
744 if destFile
["action"] == "delete":
745 # print "file %s has been deleted in %s" % (fileName, toFile)
748 integrationCount
+= 1
749 if integration
["how"] == "branch from":
752 if int(integration
["change"]) == change
:
753 integrations
.append(integration
)
755 if int(integration
["change"]) > change
:
758 destRev
= int(destFile
["rev"])
760 startRev
= integration
["startFromRev"][1:]
761 if startRev
== "none":
764 startRev
= int(startRev
)
766 endRev
= integration
["endFromRev"][1:]
772 initialBranch
= (destRev
== 1 and integration
["how"] != "branch into")
773 inRange
= (destRev
>= startRev
and destRev
<= endRev
)
774 newer
= (destRev
> startRev
and destRev
> endRev
)
776 if initialBranch
or inRange
or newer
:
777 integrations
.append(integration
)
782 if len(integrations
) == 0 and integrationCount
> 1:
783 print "file %s was not integrated from %s into %s" % (fileName
, sourceBranch
, destinationBranch
)
788 def getUserMap(self
):
791 for output
in p4CmdList("users"):
792 if not output
.has_key("User"):
794 self
.users
[output
["User"]] = output
["FullName"] + " <" + output
["Email"] + ">"
799 l
= p4CmdList("labels %s..." % self
.globalPrefix
)
800 if len(l
) > 0 and not self
.silent
:
801 print "Finding files belonging to labels in %s" % self
.globalPrefix
804 label
= output
["label"]
807 for file in p4CmdList("files //...@%s" % label
):
808 revisions
[file["depotFile"]] = file["rev"]
809 change
= int(file["change"])
810 if change
> newestChange
:
811 newestChange
= change
813 self
.labels
[newestChange
] = [output
, revisions
]
816 self
.globalPrefix
= ""
817 self
.changeRange
= ""
818 self
.initialParent
= ""
820 if len(self
.branch
) == 0:
824 if not gitBranchExists(self
.branch
) and gitBranchExists("origin"):
826 print "Creating %s branch in git repository based on origin" % self
.branch
827 system("git branch %s origin" % self
.branch
)
829 [self
.previousDepotPath
, p4Change
] = extractDepotPathAndChangeFromGitLog(extractLogMessageFromGitCommit(self
.branch
))
830 if len(self
.previousDepotPath
) > 0 and len(p4Change
) > 0:
831 p4Change
= int(p4Change
) + 1
832 self
.globalPrefix
= self
.previousDepotPath
833 self
.changeRange
= "@%s,#head" % p4Change
834 self
.initialParent
= self
.branch
835 self
.tagLastChange
= False
837 print "Performing incremental import into %s git branch" % self
.branch
839 self
.branch
= "refs/heads/" + self
.branch
841 if len(self
.globalPrefix
) == 0:
842 self
.globalPrefix
= self
.previousDepotPath
= os
.popen("git repo-config --get p4.depotpath").read()
844 if len(self
.globalPrefix
) != 0:
845 self
.globalPrefix
= self
.globalPrefix
[:-1]
847 if len(args
) == 0 and len(self
.globalPrefix
) != 0:
849 print "Depot path: %s" % self
.globalPrefix
853 if len(self
.globalPrefix
) != 0 and self
.globalPrefix
!= args
[0]:
854 print "previous import used depot path %s and now %s was specified. this doesn't work!" % (self
.globalPrefix
, args
[0])
856 self
.globalPrefix
= args
[0]
863 if self
.globalPrefix
.find("@") != -1:
864 atIdx
= self
.globalPrefix
.index("@")
865 self
.changeRange
= self
.globalPrefix
[atIdx
:]
866 if self
.changeRange
== "@all":
867 self
.changeRange
= ""
868 elif self
.changeRange
.find(",") == -1:
869 self
.revision
= self
.changeRange
870 self
.changeRange
= ""
871 self
.globalPrefix
= self
.globalPrefix
[0:atIdx
]
872 elif self
.globalPrefix
.find("#") != -1:
873 hashIdx
= self
.globalPrefix
.index("#")
874 self
.revision
= self
.globalPrefix
[hashIdx
:]
875 self
.globalPrefix
= self
.globalPrefix
[0:hashIdx
]
876 elif len(self
.previousDepotPath
) == 0:
877 self
.revision
= "#head"
879 if self
.globalPrefix
.endswith("..."):
880 self
.globalPrefix
= self
.globalPrefix
[:-3]
882 if not self
.globalPrefix
.endswith("/"):
883 self
.globalPrefix
+= "/"
887 if self
.detectLabels
:
890 if len(self
.changeRange
) == 0:
892 sout
, sin
, serr
= popen2
.popen3("git name-rev --tags `git rev-parse %s`" % self
.branch
)
894 if output
.endswith("\n"):
896 tagIdx
= output
.index(" tags/p4/")
897 caretIdx
= output
.find("^")
901 self
.rev
= int(output
[tagIdx
+ 9 : endPos
]) + 1
902 self
.changeRange
= "@%s,#head" % self
.rev
903 self
.initialParent
= os
.popen("git rev-parse %s" % self
.branch
).read()[:-1]
904 self
.initialTag
= "p4/%s" % (int(self
.rev
) - 1)
908 self
.tz
= "%+03d%02d" % (- time
.timezone
/ 3600, ((- time
.timezone
% 3600) / 60))
910 self
.gitOutput
, self
.gitStream
, self
.gitError
= popen2
.popen3("git fast-import")
912 if len(self
.revision
) > 0:
913 print "Doing initial import of %s from revision %s" % (self
.globalPrefix
, self
.revision
)
915 details
= { "user" : "git perforce import user", "time" : int(time
.time()) }
916 details
["desc"] = "Initial import of %s from the state at revision %s" % (self
.globalPrefix
, self
.revision
)
917 details
["change"] = self
.revision
921 for info
in p4CmdList("files %s...%s" % (self
.globalPrefix
, self
.revision
)):
922 change
= int(info
["change"])
923 if change
> newestRevision
:
924 newestRevision
= change
926 if info
["action"] == "delete":
927 # don't increase the file cnt, otherwise details["depotFile123"] will have gaps!
928 #fileCnt = fileCnt + 1
931 for prop
in [ "depotFile", "rev", "action", "type" ]:
932 details
["%s%s" % (prop
, fileCnt
)] = info
[prop
]
934 fileCnt
= fileCnt
+ 1
936 details
["change"] = newestRevision
939 self
.commit(details
, self
.extractFilesFromCommit(details
), self
.branch
, self
.globalPrefix
)
941 print "IO error with git fast-import. Is your git version recent enough?"
942 print self
.gitError
.read()
947 if len(self
.changesFile
) > 0:
948 output
= open(self
.changesFile
).readlines()
951 changeSet
.add(int(line
))
953 for change
in changeSet
:
954 changes
.append(change
)
958 output
= os
.popen("p4 changes %s...%s" % (self
.globalPrefix
, self
.changeRange
)).readlines()
961 changeNum
= line
.split(" ")[1]
962 changes
.append(changeNum
)
966 if len(changes
) == 0:
968 print "no changes to import!"
972 for change
in changes
:
973 description
= p4Cmd("describe %s" % change
)
976 sys
.stdout
.write("\rimporting revision %s (%s%%)" % (change
, cnt
* 100 / len(changes
)))
981 files
= self
.extractFilesFromCommit(description
)
982 if self
.detectBranches
:
983 for branch
in self
.branchesForCommit(files
):
984 self
.knownBranches
.add(branch
)
985 branchPrefix
= self
.globalPrefix
+ branch
+ "/"
987 filesForCommit
= self
.extractFilesInCommitToBranch(files
, branchPrefix
)
991 ########### remove cnt!!!
992 if branch
not in self
.createdBranches
and cnt
> 2:
993 self
.createdBranches
.add(branch
)
994 parent
= self
.findBranchParent(branchPrefix
, files
)
997 # elif len(parent) > 0:
998 # print "%s branched off of %s" % (branch, parent)
1000 if len(parent
) == 0:
1001 merged
= self
.findBranchSourceHeuristic(filesForCommit
, branch
, branchPrefix
)
1003 print "change %s could be a merge from %s into %s" % (description
["change"], merged
, branch
)
1004 if not self
.changeIsBranchMerge(merged
, branch
, int(description
["change"])):
1007 branch
= "refs/heads/" + branch
1009 parent
= "refs/heads/" + parent
1011 merged
= "refs/heads/" + merged
1012 self
.commit(description
, files
, branch
, branchPrefix
, parent
, merged
)
1014 self
.commit(description
, files
, self
.branch
, self
.globalPrefix
, self
.initialParent
)
1015 self
.initialParent
= ""
1017 print self
.gitError
.read()
1023 if self
.tagLastChange
:
1024 self
.gitStream
.write("reset refs/tags/p4/%s\n" % self
.lastChange
)
1025 self
.gitStream
.write("from %s\n\n" % self
.branch
);
1028 self
.gitStream
.close()
1029 self
.gitOutput
.close()
1030 self
.gitError
.close()
1032 os
.popen("git repo-config p4.depotpath %s" % self
.globalPrefix
).read()
1033 if len(self
.initialTag
) > 0:
1034 os
.popen("git tag -d %s" % self
.initialTag
).read()
1038 class P4Rebase(Command
):
1040 Command
.__init
__(self
)
1042 self
.description
= "Fetches the latest revision from perforce and rebases the current work (branch) against it"
1044 def run(self
, args
):
1047 print "Rebasing the current branch"
1048 oldHead
= os
.popen("git rev-parse HEAD").read()[:-1]
1049 system("git rebase p4")
1050 system("git diff-tree --stat --summary -M %s HEAD" % oldHead
)
1053 class P4Clone(P4Sync
):
1055 P4Sync
.__init
__(self
)
1056 self
.description
= "Creates a new git repository and imports from Perforce into it"
1057 self
.usage
= "usage: %prog [options] //depot/path[@revRange] [directory]"
1058 self
.needsGit
= False
1059 self
.tagLastChange
= False
1061 def run(self
, args
):
1071 if not depotPath
.startswith("//"):
1076 atPos
= dir.rfind("@")
1079 hashPos
= dir.rfind("#")
1081 dir = dir[0:hashPos
]
1083 if dir.endswith("..."):
1086 if dir.endswith("/"):
1089 slashPos
= dir.rfind("/")
1091 dir = dir[slashPos
+ 1:]
1093 print "Importing from %s into %s" % (depotPath
, dir)
1097 if not P4Sync
.run(self
, [depotPath
]):
1100 if self
.branch
!= "master":
1101 system("git branch master p4")
1102 system("git checkout -f")
1105 class HelpFormatter(optparse
.IndentedHelpFormatter
):
1107 optparse
.IndentedHelpFormatter
.__init
__(self
)
1109 def format_description(self
, description
):
1111 return description
+ "\n"
1115 def printUsage(commands
):
1116 print "usage: %s <command> [options]" % sys
.argv
[0]
1118 print "valid commands: %s" % ", ".join(commands
)
1120 print "Try %s <command> --help for command specific help." % sys
.argv
[0]
1124 "debug" : P4Debug(),
1125 "clean-tags" : P4CleanTags(),
1126 "submit" : P4Submit(),
1128 "rebase" : P4Rebase(),
1132 if len(sys
.argv
[1:]) == 0:
1133 printUsage(commands
.keys())
1137 cmdName
= sys
.argv
[1]
1139 cmd
= commands
[cmdName
]
1141 print "unknown command %s" % cmdName
1143 printUsage(commands
.keys())
1146 options
= cmd
.options
1151 if len(options
) > 0:
1152 options
.append(optparse
.make_option("--git-dir", dest
="gitdir"))
1154 parser
= optparse
.OptionParser(cmd
.usage
.replace("%prog", "%prog " + cmdName
),
1156 description
= cmd
.description
,
1157 formatter
= HelpFormatter())
1159 (cmd
, args
) = parser
.parse_args(sys
.argv
[2:], cmd
);
1163 if len(gitdir
) == 0:
1165 if not isValidGitDir(gitdir
):
1166 cdup
= os
.popen("git rev-parse --show-cdup").read()[:-1]
1167 if isValidGitDir(cdup
+ "/" + gitdir
):
1170 if not isValidGitDir(gitdir
):
1171 if isValidGitDir(gitdir
+ "/.git"):
1174 die("fatal: cannot locate git repository at %s" % gitdir
)
1176 os
.environ
["GIT_DIR"] = gitdir
1178 if not cmd
.run(args
):