]>
git.ipfire.org Git - thirdparty/git.git/blob - contrib/fast-import/git-p4
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>
10 # TODO: Add an option to sync/rebase to fetch and rebase from origin first.
13 import optparse
, sys
, os
, marshal
, popen2
, subprocess
, shelve
14 import tempfile
, getopt
, sha
, os
. path
, time
, platform
17 gitdir
= os
. environ
. get ( "GIT_DIR" , "" )
20 return os
. popen ( command
, "rb" );
23 cmd
= "p4 -G %s " % cmd
24 pipe
= os
. popen ( cmd
, "rb" )
29 entry
= marshal
. load ( pipe
)
44 def p4Where ( depotPath
):
45 if not depotPath
. endswith ( "/" ):
47 output
= p4Cmd ( "where %s ..." % depotPath
)
50 clientPath
= output
. get ( "path" )
51 elif "data" in output
:
52 data
= output
. get ( "data" )
53 lastSpace
= data
. rfind ( " " )
54 clientPath
= data
[ lastSpace
+ 1 :]
56 if clientPath
. endswith ( "..." ):
57 clientPath
= clientPath
[:- 3 ]
61 sys
. stderr
. write ( msg
+ " \n " )
64 def currentGitBranch ():
65 return mypopen ( "git name-rev HEAD" ). read (). split ( " " )[ 1 ][:- 1 ]
67 def isValidGitDir ( path
):
68 if os
. path
. exists ( path
+ "/HEAD" ) and os
. path
. exists ( path
+ "/refs" ) and os
. path
. exists ( path
+ "/objects" ):
72 def parseRevision ( ref
):
73 return mypopen ( "git rev-parse %s " % ref
). read ()[:- 1 ]
76 if os
. system ( cmd
) != 0 :
77 die ( "command failed: %s " % cmd
)
79 def extractLogMessageFromGitCommit ( commit
):
82 for log
in mypopen ( "git cat-file commit %s " % commit
). readlines ():
91 def extractDepotPathAndChangeFromGitLog ( log
):
93 for line
in log
. split ( " \n " ):
95 if line
. startswith ( "[git-p4:" ) and line
. endswith ( "]" ):
96 line
= line
[ 8 :- 1 ]. strip ()
97 for assignment
in line
. split ( ":" ):
98 variable
= assignment
. strip ()
100 equalPos
= assignment
. find ( "=" )
102 variable
= assignment
[: equalPos
]. strip ()
103 value
= assignment
[ equalPos
+ 1 :]. strip ()
104 if value
. startswith ( " \" " ) and value
. endswith ( " \" " ):
106 values
[ variable
] = value
108 return values
. get ( "depot-path" ), values
. get ( "change" )
110 def gitBranchExists ( branch
):
111 proc
= subprocess
. Popen ([ "git" , "rev-parse" , branch
], stderr
= subprocess
. PIPE
, stdout
= subprocess
. PIPE
);
112 return proc
. wait () == 0 ;
116 self
. usage
= "usage: %prog [options]"
119 class P4Debug ( Command
):
121 Command
.__ init
__ ( self
)
124 self
. description
= "A tool to debug the output of p4 -G."
125 self
. needsGit
= False
128 for output
in p4CmdList ( " " . join ( args
)):
132 class P4Submit ( Command
):
134 Command
.__ init
__ ( self
)
136 optparse
. make_option ( "--continue" , action
= "store_false" , dest
= "firstTime" ),
137 optparse
. make_option ( "--origin" , dest
= "origin" ),
138 optparse
. make_option ( "--reset" , action
= "store_true" , dest
= "reset" ),
139 optparse
. make_option ( "--log-substitutions" , dest
= "substFile" ),
140 optparse
. make_option ( "--noninteractive" , action
= "store_false" ),
141 optparse
. make_option ( "--dry-run" , action
= "store_true" ),
143 self
. description
= "Submit changes from git to the perforce depot."
144 self
. usage
+= " [name of git branch to submit into perforce depot]"
145 self
. firstTime
= True
147 self
. interactive
= True
150 self
. firstTime
= True
153 self
. logSubstitutions
= {}
154 self
. logSubstitutions
[ "<enter description here>" ] = "%log%"
155 self
. logSubstitutions
[ " \t Details:" ] = " \t Details: %log%"
158 if len ( p4CmdList ( "opened ..." )) > 0 :
159 die ( "You have files opened with perforce! Close them before starting the sync." )
162 if len ( self
. config
) > 0 and not self
. reset
:
163 die ( "Cannot start sync. Previous sync config found at %s \n If you want to start submitting again from scratch maybe you want to call git-p4 submit --reset" % self
. configFile
)
166 for line
in mypopen ( "git rev-list --no-merges %s .. %s " % ( self
. origin
, self
. master
)). readlines ():
167 commits
. append ( line
[:- 1 ])
170 self
. config
[ "commits" ] = commits
172 def prepareLogMessage ( self
, template
, message
):
175 for line
in template
. split ( " \n " ):
176 if line
. startswith ( "#" ):
177 result
+= line
+ " \n "
181 for key
in self
. logSubstitutions
. keys ():
182 if line
. find ( key
) != - 1 :
183 value
= self
. logSubstitutions
[ key
]
184 value
= value
. replace ( "%log%" , message
)
185 if value
!= "@remove@" :
186 result
+= line
. replace ( key
, value
) + " \n "
191 result
+= line
+ " \n "
196 print "Applying %s " % ( mypopen ( "git log --max-count=1 --pretty=oneline %s " % id ). read ())
197 diff
= mypopen ( "git diff-tree -r --name-status \" %s ^ \" \" %s \" " % ( id , id )). readlines ()
199 filesToDelete
= set ()
203 path
= line
[ 1 :]. strip ()
205 system ( "p4 edit \" %s \" " % path
)
206 editedFiles
. add ( path
)
207 elif modifier
== "A" :
209 if path
in filesToDelete
:
210 filesToDelete
. remove ( path
)
211 elif modifier
== "D" :
212 filesToDelete
. add ( path
)
213 if path
in filesToAdd
:
214 filesToAdd
. remove ( path
)
216 die ( "unknown modifier %s for %s " % ( modifier
, path
))
218 diffcmd
= "git diff-tree -p --diff-filter=ACMRTUXB \" %s ^ \" \" %s \" " % ( id , id )
219 patchcmd
= diffcmd
+ " | patch -p1"
221 if os
. system ( patchcmd
+ " --dry-run --silent" ) != 0 :
222 print "Unfortunately applying the change failed!"
223 print "What do you want to do?"
225 while response
!= "s" and response
!= "a" and response
!= "w" :
226 response
= raw_input ( "[s]kip this patch / [a]pply the patch forcibly and with .rej files / [w]rite the patch to a file (patch.txt) " )
228 print "Skipping! Good luck with the next patches..."
230 elif response
== "a" :
232 if len ( filesToAdd
) > 0 :
233 print "You may also want to call p4 add on the following files:"
234 print " " . join ( filesToAdd
)
235 if len ( filesToDelete
):
236 print "The following files should be scheduled for deletion with p4 delete:"
237 print " " . join ( filesToDelete
)
238 die ( "Please resolve and submit the conflict manually and continue afterwards with git-p4 submit --continue" )
239 elif response
== "w" :
240 system ( diffcmd
+ " > patch.txt" )
241 print "Patch saved to patch.txt in %s !" % self
. clientPath
242 die ( "Please resolve and submit the conflict manually and continue afterwards with git-p4 submit --continue" )
247 system ( "p4 add %s " % f
)
248 for f
in filesToDelete
:
249 system ( "p4 revert %s " % f
)
250 system ( "p4 delete %s " % f
)
252 logMessage
= extractLogMessageFromGitCommit ( id )
253 logMessage
= logMessage
. replace ( " \n " , " \n\t " )
254 logMessage
= logMessage
[:- 1 ]
256 template
= mypopen ( "p4 change -o" ). read ()
259 submitTemplate
= self
. prepareLogMessage ( template
, logMessage
)
260 diff
= mypopen ( "p4 diff -du ..." ). read ()
262 for newFile
in filesToAdd
:
263 diff
+= "==== new file ==== \n "
264 diff
+= "--- /dev/null \n "
265 diff
+= "+++ %s \n " % newFile
266 f
= open ( newFile
, "r" )
267 for line
in f
. readlines ():
271 separatorLine
= "######## everything below this line is just the diff #######"
272 if platform
. system () == "Windows" :
273 separatorLine
+= " \r "
274 separatorLine
+= " \n "
277 firstIteration
= True
278 while response
== "e" :
279 if not firstIteration
:
280 response
= raw_input ( "Do you want to submit this change? [y]es/[e]dit/[n]o/[s]kip " )
281 firstIteration
= False
283 [ handle
, fileName
] = tempfile
. mkstemp ()
284 tmpFile
= os
. fdopen ( handle
, "w+" )
285 tmpFile
. write ( submitTemplate
+ separatorLine
+ diff
)
288 if platform
. system () == "Windows" :
289 defaultEditor
= "notepad"
290 editor
= os
. environ
. get ( "EDITOR" , defaultEditor
);
291 system ( editor
+ " " + fileName
)
292 tmpFile
= open ( fileName
, "rb" )
293 message
= tmpFile
. read ()
296 submitTemplate
= message
[: message
. index ( separatorLine
)]
298 if response
== "y" or response
== "yes" :
301 raw_input ( "Press return to continue..." )
303 pipe
= os
. popen ( "p4 submit -i" , "wb" )
304 pipe
. write ( submitTemplate
)
306 elif response
== "s" :
307 for f
in editedFiles
:
308 system ( "p4 revert \" %s \" " % f
);
310 system ( "p4 revert \" %s \" " % f
);
312 for f
in filesToDelete
:
313 system ( "p4 delete \" %s \" " % f
);
316 print "Not submitting!"
317 self
. interactive
= False
319 fileName
= "submit.txt"
320 file = open ( fileName
, "w+" )
321 file . write ( self
. prepareLogMessage ( template
, logMessage
))
323 print "Perforce submit template written as %s . Please review/edit and then use p4 submit -i < %s to submit directly!" % ( fileName
, fileName
)
327 # make gitdir absolute so we can cd out into the perforce checkout
328 gitdir
= os
. path
. abspath ( gitdir
)
329 os
. environ
[ "GIT_DIR" ] = gitdir
332 self
. master
= currentGitBranch ()
333 if len ( self
. master
) == 0 or not os
. path
. exists ( " %s /refs/heads/ %s " % ( gitdir
, self
. master
)):
334 die ( "Detecting current git branch failed!" )
336 self
. master
= args
[ 0 ]
341 if gitBranchExists ( "p4" ):
342 [ depotPath
, dummy
] = extractDepotPathAndChangeFromGitLog ( extractLogMessageFromGitCommit ( "p4" ))
343 if len ( depotPath
) == 0 and gitBranchExists ( "origin" ):
344 [ depotPath
, dummy
] = extractDepotPathAndChangeFromGitLog ( extractLogMessageFromGitCommit ( "origin" ))
346 if len ( depotPath
) == 0 :
347 print "Internal error: cannot locate perforce depot path from existing branches"
350 self
. clientPath
= p4Where ( depotPath
)
352 if len ( self
. clientPath
) == 0 :
353 print "Error: Cannot locate perforce checkout of %s in client view" % depotPath
356 print "Perforce checkout for depot path %s located at %s " % ( depotPath
, self
. clientPath
)
357 oldWorkingDirectory
= os
. getcwd ()
358 os
. chdir ( self
. clientPath
)
359 response
= raw_input ( "Do you want to sync %s with p4 sync? [y]es/[n]o " % self
. clientPath
)
360 if response
== "y" or response
== "yes" :
361 system ( "p4 sync ..." )
363 if len ( self
. origin
) == 0 :
364 if gitBranchExists ( "p4" ):
367 self
. origin
= "origin"
370 self
. firstTime
= True
372 if len ( self
. substFile
) > 0 :
373 for line
in open ( self
. substFile
, "r" ). readlines ():
374 tokens
= line
[:- 1 ]. split ( "=" )
375 self
. logSubstitutions
[ tokens
[ 0 ]] = tokens
[ 1 ]
378 self
. configFile
= gitdir
+ "/p4-git-sync.cfg"
379 self
. config
= shelve
. open ( self
. configFile
, writeback
= True )
384 commits
= self
. config
. get ( "commits" , [])
386 while len ( commits
) > 0 :
387 self
. firstTime
= False
389 commits
= commits
[ 1 :]
390 self
. config
[ "commits" ] = commits
392 if not self
. interactive
:
397 if len ( commits
) == 0 :
399 print "No changes found to apply between %s and current HEAD" % self
. origin
401 print "All changes applied!"
402 response
= raw_input ( "Do you want to sync from Perforce now using git-p4 rebase? [y]es/[n]o " )
403 if response
== "y" or response
== "yes" :
404 os
. chdir ( oldWorkingDirectory
)
407 os
. remove ( self
. configFile
)
411 class P4Sync ( Command
):
413 Command
.__ init
__ ( self
)
415 optparse
. make_option ( "--branch" , dest
= "branch" ),
416 optparse
. make_option ( "--detect-branches" , dest
= "detectBranches" , action
= "store_true" ),
417 optparse
. make_option ( "--changesfile" , dest
= "changesFile" ),
418 optparse
. make_option ( "--silent" , dest
= "silent" , action
= "store_true" ),
419 optparse
. make_option ( "--known-branches" , dest
= "knownBranches" ),
420 optparse
. make_option ( "--data-cache" , dest
= "dataCache" , action
= "store_true" ),
421 optparse
. make_option ( "--command-cache" , dest
= "commandCache" , action
= "store_true" ),
422 optparse
. make_option ( "--detect-labels" , dest
= "detectLabels" , action
= "store_true" )
424 self
. description
= """Imports from Perforce into a git repository. \n
426 //depot/my/project/ -- to import the current head
427 //depot/my/project/@all -- to import everything
428 //depot/my/project/@1,6 -- to import only from revision 1 to 6
430 (a ... is not needed in the path p4 specification, it's added implicitly)"""
432 self
. usage
+= " //depot/path[@revRange]"
434 self
. dataCache
= False
435 self
. commandCache
= False
437 self
. knownBranches
= Set ()
438 self
. createdBranches
= Set ()
439 self
. committedChanges
= Set ()
441 self
. detectBranches
= False
442 self
. detectLabels
= False
443 self
. changesFile
= ""
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
. depotPath
):
454 # if not self.silent:
455 # print "\nchanged files: ignoring path %s outside of %s in change %s" % (path, self.depotPath, 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
. depotPath
):]
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
. depotPath
):]
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 " \n file %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
. depotPath
):]
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
. depotPath
+ sourceBranch
+ "/" , change
)):
738 if file [ "action" ] == "delete" :
740 sourceFiles
[ file [ "depotFile" ]] = file
742 destinationFiles
= {}
743 for file in p4CmdList ( "files %s ...@ %s " % ( self
. depotPath
+ 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
. depotPath
)
811 if len ( l
) > 0 and not self
. silent
:
812 print "Finding files belonging to labels in %s " % self
. depotPath
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
]
828 self
. changeRange
= ""
829 self
. initialParent
= ""
830 self
. previousDepotPath
= ""
832 if len ( self
. branch
) == 0 :
836 if not gitBranchExists ( self
. branch
) and gitBranchExists ( "origin" ):
838 print "Creating %s branch in git repository based on origin" % self
. branch
839 system ( "git branch %s origin" % self
. branch
)
841 [ self
. previousDepotPath
, p4Change
] = extractDepotPathAndChangeFromGitLog ( extractLogMessageFromGitCommit ( self
. branch
))
842 if len ( self
. previousDepotPath
) > 0 and len ( p4Change
) > 0 :
843 p4Change
= int ( p4Change
) + 1
844 self
. depotPath
= self
. previousDepotPath
845 self
. changeRange
= "@ %s ,#head" % p4Change
846 self
. initialParent
= parseRevision ( self
. branch
)
848 print "Performing incremental import into %s git branch" % self
. branch
850 if not self
. branch
. startswith ( "refs/" ):
851 self
. branch
= "refs/heads/" + self
. branch
853 if len ( self
. depotPath
) != 0 :
854 self
. depotPath
= self
. depotPath
[:- 1 ]
856 if len ( args
) == 0 and len ( self
. depotPath
) != 0 :
858 print "Depot path: %s " % self
. depotPath
862 if len ( self
. depotPath
) != 0 and self
. depotPath
!= args
[ 0 ]:
863 print "previous import used depot path %s and now %s was specified. this doesn't work!" % ( self
. depotPath
, args
[ 0 ])
865 self
. depotPath
= args
[ 0 ]
871 if self
. depotPath
. find ( "@" ) != - 1 :
872 atIdx
= self
. depotPath
. index ( "@" )
873 self
. changeRange
= self
. depotPath
[ atIdx
:]
874 if self
. changeRange
== "@all" :
875 self
. changeRange
= ""
876 elif self
. changeRange
. find ( "," ) == - 1 :
877 self
. revision
= self
. changeRange
878 self
. changeRange
= ""
879 self
. depotPath
= self
. depotPath
[ 0 : atIdx
]
880 elif self
. depotPath
. find ( "#" ) != - 1 :
881 hashIdx
= self
. depotPath
. index ( "#" )
882 self
. revision
= self
. depotPath
[ hashIdx
:]
883 self
. depotPath
= self
. depotPath
[ 0 : hashIdx
]
884 elif len ( self
. previousDepotPath
) == 0 :
885 self
. revision
= "#head"
887 if self
. depotPath
. endswith ( "..." ):
888 self
. depotPath
= self
. depotPath
[:- 3 ]
890 if not self
. depotPath
. endswith ( "/" ):
891 self
. depotPath
+= "/"
895 if self
. detectLabels
:
898 self
. tz
= " %+0 3d %0 2d" % (- time
. timezone
/ 3600 , ((- time
. timezone
% 3600 ) / 60 ))
900 importProcess
= subprocess
. Popen ([ "git" , "fast-import" ], stdin
= subprocess
. PIPE
, stdout
= subprocess
. PIPE
, stderr
= subprocess
. PIPE
);
901 self
. gitOutput
= importProcess
. stdout
902 self
. gitStream
= importProcess
. stdin
903 self
. gitError
= importProcess
. stderr
905 if len ( self
. revision
) > 0 :
906 print "Doing initial import of %s from revision %s " % ( self
. depotPath
, self
. revision
)
908 details
= { "user" : "git perforce import user" , "time" : int ( time
. time ()) }
909 details
[ "desc" ] = "Initial import of %s from the state at revision %s " % ( self
. depotPath
, self
. revision
)
910 details
[ "change" ] = self
. revision
914 for info
in p4CmdList ( "files %s ... %s " % ( self
. depotPath
, self
. revision
)):
915 change
= int ( info
[ "change" ])
916 if change
> newestRevision
:
917 newestRevision
= change
919 if info
[ "action" ] == "delete" :
920 # don't increase the file cnt, otherwise details["depotFile123"] will have gaps!
921 #fileCnt = fileCnt + 1
924 for prop
in [ "depotFile" , "rev" , "action" , "type" ]:
925 details
[ " %s%s " % ( prop
, fileCnt
)] = info
[ prop
]
927 fileCnt
= fileCnt
+ 1
929 details
[ "change" ] = newestRevision
932 self
. commit ( details
, self
. extractFilesFromCommit ( details
), self
. branch
, self
. depotPath
)
934 print "IO error with git fast-import. Is your git version recent enough?"
935 print self
. gitError
. read ()
940 if len ( self
. changesFile
) > 0 :
941 output
= open ( self
. changesFile
). readlines ()
944 changeSet
. add ( int ( line
))
946 for change
in changeSet
:
947 changes
. append ( change
)
951 output
= mypopen ( "p4 changes %s ... %s " % ( self
. depotPath
, self
. changeRange
)). readlines ()
954 changeNum
= line
. split ( " " )[ 1 ]
955 changes
. append ( changeNum
)
959 if len ( changes
) == 0 :
961 print "no changes to import!"
965 for change
in changes
:
966 description
= p4Cmd ( "describe %s " % change
)
969 sys
. stdout
. write ( " \r importing revision %s ( %s%% )" % ( change
, cnt
* 100 / len ( changes
)))
974 files
= self
. extractFilesFromCommit ( description
)
975 if self
. detectBranches
:
976 for branch
in self
. branchesForCommit ( files
):
977 self
. knownBranches
. add ( branch
)
978 branchPrefix
= self
. depotPath
+ branch
+ "/"
980 filesForCommit
= self
. extractFilesInCommitToBranch ( files
, branchPrefix
)
984 ########### remove cnt!!!
985 if branch
not in self
. createdBranches
and cnt
> 2 :
986 self
. createdBranches
. add ( branch
)
987 parent
= self
. findBranchParent ( branchPrefix
, files
)
990 # elif len(parent) > 0:
991 # print "%s branched off of %s" % (branch, parent)
994 merged
= self
. findBranchSourceHeuristic ( filesForCommit
, branch
, branchPrefix
)
996 print "change %s could be a merge from %s into %s " % ( description
[ "change" ], merged
, branch
)
997 if not self
. changeIsBranchMerge ( merged
, branch
, int ( description
[ "change" ])):
1000 branch
= "refs/heads/" + branch
1002 parent
= "refs/heads/" + parent
1004 merged
= "refs/heads/" + merged
1005 self
. commit ( description
, files
, branch
, branchPrefix
, parent
, merged
)
1007 self
. commit ( description
, files
, self
. branch
, self
. depotPath
, self
. initialParent
)
1008 self
. initialParent
= ""
1010 print self
. gitError
. read ()
1017 self
. gitStream
. close ()
1018 self
. gitOutput
. close ()
1019 self
. gitError
. close ()
1020 importProcess
. wait ()
1024 class P4Rebase ( Command
):
1026 Command
.__ init
__ ( self
)
1028 self
. description
= "Fetches the latest revision from perforce and rebases the current work (branch) against it"
1030 def run ( self
, args
):
1033 print "Rebasing the current branch"
1034 oldHead
= mypopen ( "git rev-parse HEAD" ). read ()[:- 1 ]
1035 system ( "git rebase p4" )
1036 system ( "git diff-tree --stat --summary -M %s HEAD" % oldHead
)
1039 class P4Clone ( P4Sync
):
1041 P4Sync
.__ init
__ ( self
)
1042 self
. description
= "Creates a new git repository and imports from Perforce into it"
1043 self
. usage
= "usage: %prog [options] //depot/path[@revRange] [directory]"
1044 self
. needsGit
= False
1046 def run ( self
, args
):
1056 if not depotPath
. startswith ( "//" ):
1061 atPos
= dir . rfind ( "@" )
1064 hashPos
= dir . rfind ( "#" )
1066 dir = dir [ 0 : hashPos
]
1068 if dir . endswith ( "..." ):
1071 if dir . endswith ( "/" ):
1074 slashPos
= dir . rfind ( "/" )
1076 dir = dir [ slashPos
+ 1 :]
1078 print "Importing from %s into %s " % ( depotPath
, dir )
1082 if not P4Sync
. run ( self
, [ depotPath
]):
1084 if self
. branch
!= "master" :
1085 system ( "git branch master p4" )
1086 system ( "git checkout -f" )
1089 class HelpFormatter ( optparse
. IndentedHelpFormatter
):
1091 optparse
. IndentedHelpFormatter
.__ init
__ ( self
)
1093 def format_description ( self
, description
):
1095 return description
+ " \n "
1099 def printUsage ( commands
):
1100 print "usage: %s <command> [options]" % sys
. argv
[ 0 ]
1102 print "valid commands: %s " % ", " . join ( commands
)
1104 print "Try %s <command> --help for command specific help." % sys
. argv
[ 0 ]
1108 "debug" : P4Debug (),
1109 "submit" : P4Submit (),
1111 "rebase" : P4Rebase (),
1115 if len ( sys
. argv
[ 1 :]) == 0 :
1116 printUsage ( commands
. keys ())
1120 cmdName
= sys
. argv
[ 1 ]
1122 cmd
= commands
[ cmdName
]
1124 print "unknown command %s " % cmdName
1126 printUsage ( commands
. keys ())
1129 options
= cmd
. options
1134 if len ( options
) > 0 :
1135 options
. append ( optparse
. make_option ( "--git-dir" , dest
= "gitdir" ))
1137 parser
= optparse
. OptionParser ( cmd
. usage
. replace ( "%prog" , "%prog " + cmdName
),
1139 description
= cmd
. description
,
1140 formatter
= HelpFormatter ())
1142 ( cmd
, args
) = parser
. parse_args ( sys
. argv
[ 2 :], cmd
);
1146 if len ( gitdir
) == 0 :
1148 if not isValidGitDir ( gitdir
):
1149 gitdir
= mypopen ( "git rev-parse --git-dir" ). read ()[:- 1 ]
1150 if os
. path
. exists ( gitdir
):
1151 cdup
= mypopen ( "git rev-parse --show-cdup" ). read ()[:- 1 ];
1155 if not isValidGitDir ( gitdir
):
1156 if isValidGitDir ( gitdir
+ "/.git" ):
1159 die ( "fatal: cannot locate git repository at %s " % gitdir
)
1161 os
. environ
[ "GIT_DIR" ] = gitdir
1163 if not cmd
. run ( args
):