]>
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>
11 import optparse
, sys
, os
, marshal
, popen2
, subprocess
, shelve
12 import tempfile
, getopt
, sha
, os
. path
, time
, platform
15 gitdir
= os
. environ
. get ( "GIT_DIR" , "" )
18 return os
. popen ( command
, "rb" );
21 cmd
= "p4 -G %s " % cmd
22 pipe
= os
. popen ( cmd
, "rb" )
27 entry
= marshal
. load ( pipe
)
42 def p4Where ( depotPath
):
43 if not depotPath
. endswith ( "/" ):
45 output
= p4Cmd ( "where %s ..." % depotPath
)
48 clientPath
= output
. get ( "path" )
49 elif "data" in output
:
50 data
= output
. get ( "data" )
51 lastSpace
= data
. rfind ( " " )
52 clientPath
= data
[ lastSpace
+ 1 :]
54 if clientPath
. endswith ( "..." ):
55 clientPath
= clientPath
[:- 3 ]
59 sys
. stderr
. write ( msg
+ " \n " )
62 def currentGitBranch ():
63 return mypopen ( "git name-rev HEAD" ). read (). split ( " " )[ 1 ][:- 1 ]
65 def isValidGitDir ( path
):
66 if os
. path
. exists ( path
+ "/HEAD" ) and os
. path
. exists ( path
+ "/refs" ) and os
. path
. exists ( path
+ "/objects" ):
70 def parseRevision ( ref
):
71 return mypopen ( "git rev-parse %s " % ref
). read ()[:- 1 ]
74 if os
. system ( cmd
) != 0 :
75 die ( "command failed: %s " % cmd
)
77 def extractLogMessageFromGitCommit ( commit
):
80 for log
in mypopen ( "git cat-file commit %s " % commit
). readlines ():
89 def extractDepotPathAndChangeFromGitLog ( log
):
91 for line
in log
. split ( " \n " ):
93 if line
. startswith ( "[git-p4:" ) and line
. endswith ( "]" ):
94 line
= line
[ 8 :- 1 ]. strip ()
95 for assignment
in line
. split ( ":" ):
96 variable
= assignment
. strip ()
98 equalPos
= assignment
. find ( "=" )
100 variable
= assignment
[: equalPos
]. strip ()
101 value
= assignment
[ equalPos
+ 1 :]. strip ()
102 if value
. startswith ( " \" " ) and value
. endswith ( " \" " ):
104 values
[ variable
] = value
106 return values
. get ( "depot-path" ), values
. get ( "change" )
108 def gitBranchExists ( branch
):
109 proc
= subprocess
. Popen ([ "git" , "rev-parse" , branch
], stderr
= subprocess
. PIPE
, stdout
= subprocess
. PIPE
);
110 return proc
. wait () == 0 ;
114 self
. usage
= "usage: %prog [options]"
117 class P4Debug ( Command
):
119 Command
.__ init
__ ( self
)
122 self
. description
= "A tool to debug the output of p4 -G."
123 self
. needsGit
= False
126 for output
in p4CmdList ( " " . join ( args
)):
130 class P4Submit ( Command
):
132 Command
.__ init
__ ( self
)
134 optparse
. make_option ( "--continue" , action
= "store_false" , dest
= "firstTime" ),
135 optparse
. make_option ( "--origin" , dest
= "origin" ),
136 optparse
. make_option ( "--reset" , action
= "store_true" , dest
= "reset" ),
137 optparse
. make_option ( "--log-substitutions" , dest
= "substFile" ),
138 optparse
. make_option ( "--noninteractive" , action
= "store_false" ),
139 optparse
. make_option ( "--dry-run" , action
= "store_true" ),
141 self
. description
= "Submit changes from git to the perforce depot."
142 self
. usage
+= " [name of git branch to submit into perforce depot]"
143 self
. firstTime
= True
145 self
. interactive
= True
148 self
. firstTime
= True
151 self
. logSubstitutions
= {}
152 self
. logSubstitutions
[ "<enter description here>" ] = "%log%"
153 self
. logSubstitutions
[ " \t Details:" ] = " \t Details: %log%"
156 if len ( p4CmdList ( "opened ..." )) > 0 :
157 die ( "You have files opened with perforce! Close them before starting the sync." )
160 if len ( self
. config
) > 0 and not self
. reset
:
161 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
)
164 for line
in mypopen ( "git rev-list --no-merges %s .. %s " % ( self
. origin
, self
. master
)). readlines ():
165 commits
. append ( line
[:- 1 ])
168 self
. config
[ "commits" ] = commits
170 def prepareLogMessage ( self
, template
, message
):
173 for line
in template
. split ( " \n " ):
174 if line
. startswith ( "#" ):
175 result
+= line
+ " \n "
179 for key
in self
. logSubstitutions
. keys ():
180 if line
. find ( key
) != - 1 :
181 value
= self
. logSubstitutions
[ key
]
182 value
= value
. replace ( "%log%" , message
)
183 if value
!= "@remove@" :
184 result
+= line
. replace ( key
, value
) + " \n "
189 result
+= line
+ " \n "
194 print "Applying %s " % ( mypopen ( "git log --max-count=1 --pretty=oneline %s " % id ). read ())
195 diff
= mypopen ( "git diff-tree -r --name-status \" %s ^ \" \" %s \" " % ( id , id )). readlines ()
197 filesToDelete
= set ()
201 path
= line
[ 1 :]. strip ()
203 system ( "p4 edit \" %s \" " % path
)
204 editedFiles
. add ( path
)
205 elif modifier
== "A" :
207 if path
in filesToDelete
:
208 filesToDelete
. remove ( path
)
209 elif modifier
== "D" :
210 filesToDelete
. add ( path
)
211 if path
in filesToAdd
:
212 filesToAdd
. remove ( path
)
214 die ( "unknown modifier %s for %s " % ( modifier
, path
))
216 diffcmd
= "git diff-tree -p --diff-filter=ACMRTUXB \" %s ^ \" \" %s \" " % ( id , id )
217 patchcmd
= diffcmd
+ " | patch -p1"
219 if os
. system ( patchcmd
+ " --dry-run --silent" ) != 0 :
220 print "Unfortunately applying the change failed!"
221 print "What do you want to do?"
223 while response
!= "s" and response
!= "a" and response
!= "w" :
224 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) " )
226 print "Skipping! Good luck with the next patches..."
228 elif response
== "a" :
230 if len ( filesToAdd
) > 0 :
231 print "You may also want to call p4 add on the following files:"
232 print " " . join ( filesToAdd
)
233 if len ( filesToDelete
):
234 print "The following files should be scheduled for deletion with p4 delete:"
235 print " " . join ( filesToDelete
)
236 die ( "Please resolve and submit the conflict manually and continue afterwards with git-p4 submit --continue" )
237 elif response
== "w" :
238 system ( diffcmd
+ " > patch.txt" )
239 print "Patch saved to patch.txt in %s !" % self
. clientPath
240 die ( "Please resolve and submit the conflict manually and continue afterwards with git-p4 submit --continue" )
245 system ( "p4 add %s " % f
)
246 for f
in filesToDelete
:
247 system ( "p4 revert %s " % f
)
248 system ( "p4 delete %s " % f
)
250 logMessage
= extractLogMessageFromGitCommit ( id )
251 logMessage
= logMessage
. replace ( " \n " , " \n\t " )
252 logMessage
= logMessage
[:- 1 ]
254 template
= mypopen ( "p4 change -o" ). read ()
257 submitTemplate
= self
. prepareLogMessage ( template
, logMessage
)
258 diff
= mypopen ( "p4 diff -du ..." ). read ()
260 for newFile
in filesToAdd
:
261 diff
+= "==== new file ==== \n "
262 diff
+= "--- /dev/null \n "
263 diff
+= "+++ %s \n " % newFile
264 f
= open ( newFile
, "r" )
265 for line
in f
. readlines ():
269 separatorLine
= "######## everything below this line is just the diff #######"
270 if platform
. system () == "Windows" :
271 separatorLine
+= " \r "
272 separatorLine
+= " \n "
275 firstIteration
= True
276 while response
== "e" :
277 if not firstIteration
:
278 response
= raw_input ( "Do you want to submit this change? [y]es/[e]dit/[n]o/[s]kip " )
279 firstIteration
= False
281 [ handle
, fileName
] = tempfile
. mkstemp ()
282 tmpFile
= os
. fdopen ( handle
, "w+" )
283 tmpFile
. write ( submitTemplate
+ separatorLine
+ diff
)
286 if platform
. system () == "Windows" :
287 defaultEditor
= "notepad"
288 editor
= os
. environ
. get ( "EDITOR" , defaultEditor
);
289 system ( editor
+ " " + fileName
)
290 tmpFile
= open ( fileName
, "rb" )
291 message
= tmpFile
. read ()
294 submitTemplate
= message
[: message
. index ( separatorLine
)]
296 if response
== "y" or response
== "yes" :
299 raw_input ( "Press return to continue..." )
301 pipe
= os
. popen ( "p4 submit -i" , "wb" )
302 pipe
. write ( submitTemplate
)
304 elif response
== "s" :
305 for f
in editedFiles
:
306 system ( "p4 revert \" %s \" " % f
);
308 system ( "p4 revert \" %s \" " % f
);
310 for f
in filesToDelete
:
311 system ( "p4 delete \" %s \" " % f
);
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 self
. clientPath
= p4Where ( depotPath
)
350 if len ( self
. 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
, self
. clientPath
)
355 oldWorkingDirectory
= os
. getcwd ()
356 os
. chdir ( self
. clientPath
)
357 response
= raw_input ( "Do you want to sync %s with p4 sync? [y]es/[n]o " % self
. clientPath
)
358 if response
== "y" or response
== "yes" :
359 system ( "p4 sync ..." )
361 if len ( self
. origin
) == 0 :
362 if gitBranchExists ( "p4" ):
365 self
. origin
= "origin"
368 self
. firstTime
= True
370 if len ( self
. substFile
) > 0 :
371 for line
in open ( self
. substFile
, "r" ). readlines ():
372 tokens
= line
[:- 1 ]. split ( "=" )
373 self
. logSubstitutions
[ tokens
[ 0 ]] = tokens
[ 1 ]
376 self
. configFile
= gitdir
+ "/p4-git-sync.cfg"
377 self
. config
= shelve
. open ( self
. configFile
, writeback
= True )
382 commits
= self
. config
. get ( "commits" , [])
384 while len ( commits
) > 0 :
385 self
. firstTime
= False
387 commits
= commits
[ 1 :]
388 self
. config
[ "commits" ] = commits
390 if not self
. interactive
:
395 if len ( commits
) == 0 :
397 print "No changes found to apply between %s and current HEAD" % self
. origin
399 print "All changes applied!"
400 response
= raw_input ( "Do you want to sync from Perforce now using git-p4 rebase? [y]es/[n]o " )
401 if response
== "y" or response
== "yes" :
402 os
. chdir ( oldWorkingDirectory
)
405 os
. remove ( self
. configFile
)
409 class P4Sync ( Command
):
411 Command
.__ init
__ ( self
)
413 optparse
. make_option ( "--branch" , dest
= "branch" ),
414 optparse
. make_option ( "--detect-branches" , dest
= "detectBranches" , action
= "store_true" ),
415 optparse
. make_option ( "--changesfile" , dest
= "changesFile" ),
416 optparse
. make_option ( "--silent" , dest
= "silent" , action
= "store_true" ),
417 optparse
. make_option ( "--detect-labels" , dest
= "detectLabels" , action
= "store_true" ),
418 optparse
. make_option ( "--with-origin" , dest
= "syncWithOrigin" , action
= "store_true" ),
419 optparse
. make_option ( "--verbose" , dest
= "verbose" , action
= "store_true" )
421 self
. description
= """Imports from Perforce into a git repository. \n
423 //depot/my/project/ -- to import the current head
424 //depot/my/project/@all -- to import everything
425 //depot/my/project/@1,6 -- to import only from revision 1 to 6
427 (a ... is not needed in the path p4 specification, it's added implicitly)"""
429 self
. usage
+= " //depot/path[@revRange]"
432 self
. createdBranches
= Set ()
433 self
. committedChanges
= Set ()
435 self
. detectBranches
= False
436 self
. detectLabels
= False
437 self
. changesFile
= ""
438 self
. syncWithOrigin
= False
441 def p4File ( self
, depotPath
):
442 return os
. popen ( "p4 print -q \" %s \" " % depotPath
, "rb" ). read ()
444 def extractFilesFromCommit ( self
, commit
):
447 while commit
. has_key ( "depotFile %s " % fnum
):
448 path
= commit
[ "depotFile %s " % fnum
]
449 if not path
. startswith ( self
. depotPath
):
450 # if not self.silent:
451 # print "\nchanged files: ignoring path %s outside of %s in change %s" % (path, self.depotPath, change)
457 file [ "rev" ] = commit
[ "rev %s " % fnum
]
458 file [ "action" ] = commit
[ "action %s " % fnum
]
459 file [ "type" ] = commit
[ "type %s " % fnum
]
464 def splitFilesIntoBranches ( self
, commit
):
468 while commit
. has_key ( "depotFile %s " % fnum
):
469 path
= commit
[ "depotFile %s " % fnum
]
470 if not path
. startswith ( self
. depotPath
):
471 # if not self.silent:
472 # print "\nchanged files: ignoring path %s outside of %s in change %s" % (path, self.depotPath, change)
478 file [ "rev" ] = commit
[ "rev %s " % fnum
]
479 file [ "action" ] = commit
[ "action %s " % fnum
]
480 file [ "type" ] = commit
[ "type %s " % fnum
]
483 relPath
= path
[ len ( self
. depotPath
):]
485 for branch
in self
. knownBranches
. keys ():
486 if relPath
. startswith ( branch
):
487 if branch
not in branches
:
488 branches
[ branch
] = []
489 branches
[ branch
]. append ( file )
493 def commit ( self
, details
, files
, branch
, branchPrefix
, parent
= "" ):
494 epoch
= details
[ "time" ]
495 author
= details
[ "user" ]
498 print "commit into %s " % branch
500 self
. gitStream
. write ( "commit %s \n " % branch
)
501 # gitStream.write("mark :%s\n" % details["change"])
502 self
. committedChanges
. add ( int ( details
[ "change" ]))
504 if author
not in self
. users
:
505 self
. getUserMapFromPerforceServer ()
506 if author
in self
. users
:
507 committer
= " %s %s %s " % ( self
. users
[ author
], epoch
, self
. tz
)
509 committer
= " %s <a@b> %s %s " % ( author
, epoch
, self
. tz
)
511 self
. gitStream
. write ( "committer %s \n " % committer
)
513 self
. gitStream
. write ( "data <<EOT \n " )
514 self
. gitStream
. write ( details
[ "desc" ])
515 self
. gitStream
. write ( " \n [git-p4: depot-path = \" %s \" : change = %s ] \n " % ( branchPrefix
, details
[ "change" ]))
516 self
. gitStream
. write ( "EOT \n\n " )
520 print "parent %s " % parent
521 self
. gitStream
. write ( "from %s \n " % parent
)
525 if not path
. startswith ( branchPrefix
):
527 # print "\nchanged files: ignoring path %s outside of branch prefix %s in change %s" % (path, branchPrefix, details["change"])
530 depotPath
= path
+ "#" + rev
531 relPath
= path
[ len ( branchPrefix
):]
532 action
= file [ "action" ]
534 if file [ "type" ] == "apple" :
535 print " \n file %s is a strange apple file that forks. Ignoring!" % path
538 if action
== "delete" :
539 self
. gitStream
. write ( "D %s \n " % relPath
)
542 if file [ "type" ]. startswith ( "x" ):
545 data
= self
. p4File ( depotPath
)
547 self
. gitStream
. write ( "M %s inline %s \n " % ( mode
, relPath
))
548 self
. gitStream
. write ( "data %s \n " % len ( data
))
549 self
. gitStream
. write ( data
)
550 self
. gitStream
. write ( " \n " )
552 self
. gitStream
. write ( " \n " )
554 change
= int ( details
[ "change" ])
556 if self
. labels
. has_key ( change
):
557 label
= self
. labels
[ change
]
558 labelDetails
= label
[ 0 ]
559 labelRevisions
= label
[ 1 ]
561 print "Change %s is labelled %s " % ( change
, labelDetails
)
563 files
= p4CmdList ( "files %s ...@ %s " % ( branchPrefix
, change
))
565 if len ( files
) == len ( labelRevisions
):
569 if info
[ "action" ] == "delete" :
571 cleanedFiles
[ info
[ "depotFile" ]] = info
[ "rev" ]
573 if cleanedFiles
== labelRevisions
:
574 self
. gitStream
. write ( "tag tag_ %s \n " % labelDetails
[ "label" ])
575 self
. gitStream
. write ( "from %s \n " % branch
)
577 owner
= labelDetails
[ "Owner" ]
579 if author
in self
. users
:
580 tagger
= " %s %s %s " % ( self
. users
[ owner
], epoch
, self
. tz
)
582 tagger
= " %s <a@b> %s %s " % ( owner
, epoch
, self
. tz
)
583 self
. gitStream
. write ( "tagger %s \n " % tagger
)
584 self
. gitStream
. write ( "data <<EOT \n " )
585 self
. gitStream
. write ( labelDetails
[ "Description" ])
586 self
. gitStream
. write ( "EOT \n\n " )
590 print "Tag %s does not match with change %s : files do not match." % ( labelDetails
[ "label" ], change
)
594 print "Tag %s does not match with change %s : file count is different." % ( labelDetails
[ "label" ], change
)
596 def getUserMapFromPerforceServer ( self
):
599 for output
in p4CmdList ( "users" ):
600 if not output
. has_key ( "User" ):
602 self
. users
[ output
[ "User" ]] = output
[ "FullName" ] + " <" + output
[ "Email" ] + ">"
604 cache
= open ( gitdir
+ "/p4-usercache.txt" , "wb" )
605 for user
in self
. users
. keys ():
606 cache
. write ( " %s \t %s \n " % ( user
, self
. users
[ user
]))
609 def loadUserMapFromCache ( self
):
612 cache
= open ( gitdir
+ "/p4-usercache.txt" , "rb" )
613 lines
= cache
. readlines ()
616 entry
= line
[:- 1 ]. split ( " \t " )
617 self
. users
[ entry
[ 0 ]] = entry
[ 1 ]
619 self
. getUserMapFromPerforceServer ()
624 l
= p4CmdList ( "labels %s ..." % self
. depotPath
)
625 if len ( l
) > 0 and not self
. silent
:
626 print "Finding files belonging to labels in %s " % self
. depotPath
629 label
= output
[ "label" ]
633 print "Querying files for label %s " % label
634 for file in p4CmdList ( "files %s ...@ %s " % ( self
. depotPath
, label
)):
635 revisions
[ file [ "depotFile" ]] = file [ "rev" ]
636 change
= int ( file [ "change" ])
637 if change
> newestChange
:
638 newestChange
= change
640 self
. labels
[ newestChange
] = [ output
, revisions
]
643 print "Label changes: %s " % self
. labels
. keys ()
645 def getBranchMapping ( self
):
646 self
. projectName
= self
. depotPath
[ self
. depotPath
[:- 1 ]. rfind ( "/" ) + 1 :]
648 for info
in p4CmdList ( "branches" ):
649 details
= p4Cmd ( "branch -o %s " % info
[ "branch" ])
651 while details
. has_key ( "View %s " % viewIdx
):
652 paths
= details
[ "View %s " % viewIdx
]. split ( " " )
653 viewIdx
= viewIdx
+ 1
654 # require standard //depot/foo/... //depot/bar/... mapping
655 if len ( paths
) != 2 or not paths
[ 0 ]. endswith ( "/..." ) or not paths
[ 1 ]. endswith ( "/..." ):
658 destination
= paths
[ 1 ]
659 if source
. startswith ( self
. depotPath
) and destination
. startswith ( self
. depotPath
):
660 source
= source
[ len ( self
. depotPath
):- 4 ]
661 destination
= destination
[ len ( self
. depotPath
):- 4 ]
662 if destination
not in self
. knownBranches
:
663 self
. knownBranches
[ destination
] = source
664 if source
not in self
. knownBranches
:
665 self
. knownBranches
[ source
] = source
667 def listExistingP4GitBranches ( self
):
668 self
. p4BranchesInGit
= []
670 for line
in mypopen ( "git rev-parse --symbolic --remotes" ). readlines ():
671 if line
. startswith ( "p4/" ) and line
!= "p4/HEAD \n " :
673 self
. p4BranchesInGit
. append ( branch
)
674 self
. initialParents
[ "refs/remotes/p4/" + branch
] = parseRevision ( line
[:- 1 ])
678 self
. changeRange
= ""
679 self
. initialParent
= ""
680 self
. previousDepotPath
= ""
681 # map from branch depot path to parent branch
682 self
. knownBranches
= {}
683 self
. initialParents
= {}
685 self
. listExistingP4GitBranches ()
687 if self
. syncWithOrigin
and gitBranchExists ( "origin" ) and gitBranchExists ( "refs/remotes/p4/master" ) and not self
. detectBranches
:
688 ### needs to be ported to multi branch import
690 print "Syncing with origin first as requested by calling git fetch origin"
691 system ( "git fetch origin" )
692 [ originPreviousDepotPath
, originP4Change
] = extractDepotPathAndChangeFromGitLog ( extractLogMessageFromGitCommit ( "origin" ))
693 [ p4PreviousDepotPath
, p4Change
] = extractDepotPathAndChangeFromGitLog ( extractLogMessageFromGitCommit ( "p4" ))
694 if len ( originPreviousDepotPath
) > 0 and len ( originP4Change
) > 0 and len ( p4Change
) > 0 :
695 if originPreviousDepotPath
== p4PreviousDepotPath
:
696 originP4Change
= int ( originP4Change
)
697 p4Change
= int ( p4Change
)
698 if originP4Change
> p4Change
:
699 print "origin ( %s ) is newer than p4 ( %s ). Updating p4 branch from origin." % ( originP4Change
, p4Change
)
700 system ( "git update-ref refs/remotes/p4/master origin" );
702 print "Cannot sync with origin. It was imported from %s while remotes/p4 was imported from %s " % ( originPreviousDepotPath
, p4PreviousDepotPath
)
704 if len ( self
. branch
) == 0 :
705 self
. branch
= "refs/remotes/p4/master"
706 if gitBranchExists ( "refs/heads/p4" ):
707 system ( "git update-ref %s refs/heads/p4" % self
. branch
)
708 system ( "git branch -D p4" );
709 if not gitBranchExists ( "refs/remotes/p4/HEAD" ):
710 system ( "git symbolic-ref refs/remotes/p4/HEAD %s " % self
. branch
)
713 if not gitBranchExists ( self
. branch
) and gitBranchExists ( "origin" ) and not self
. detectBranches
:
714 ### needs to be ported to multi branch import
716 print "Creating %s branch in git repository based on origin" % self
. branch
718 if not branch
. startswith ( "refs" ):
719 branch
= "refs/heads/" + branch
720 system ( "git update-ref %s origin" % branch
)
723 print "branches: %s " % self
. p4BranchesInGit
726 for branch
in self
. p4BranchesInGit
:
727 depotPath
, change
= extractDepotPathAndChangeFromGitLog ( extractLogMessageFromGitCommit ( "refs/remotes/p4/" + branch
))
730 print "path %s change %s " % ( depotPath
, change
)
732 if len ( depotPath
) > 0 and len ( change
) > 0 :
733 change
= int ( change
) + 1
734 p4Change
= max ( p4Change
, change
)
736 if len ( self
. previousDepotPath
) == 0 :
737 self
. previousDepotPath
= depotPath
740 l
= min ( len ( self
. previousDepotPath
), len ( depotPath
))
741 while i
< l
and self
. previousDepotPath
[ i
] == depotPath
[ i
]:
743 self
. previousDepotPath
= self
. previousDepotPath
[: i
]
746 self
. depotPath
= self
. previousDepotPath
747 self
. changeRange
= "@ %s ,#head" % p4Change
748 self
. initialParent
= parseRevision ( self
. branch
)
750 print "Performing incremental import into %s git branch" % self
. branch
752 if not self
. branch
. startswith ( "refs/" ):
753 self
. branch
= "refs/heads/" + self
. branch
755 if len ( self
. depotPath
) != 0 :
756 self
. depotPath
= self
. depotPath
[:- 1 ]
758 if len ( args
) == 0 and len ( self
. depotPath
) != 0 :
760 print "Depot path: %s " % self
. depotPath
764 if len ( self
. depotPath
) != 0 and self
. depotPath
!= args
[ 0 ]:
765 print "previous import used depot path %s and now %s was specified. this doesn't work!" % ( self
. depotPath
, args
[ 0 ])
767 self
. depotPath
= args
[ 0 ]
772 if self
. depotPath
. find ( "@" ) != - 1 :
773 atIdx
= self
. depotPath
. index ( "@" )
774 self
. changeRange
= self
. depotPath
[ atIdx
:]
775 if self
. changeRange
== "@all" :
776 self
. changeRange
= ""
777 elif self
. changeRange
. find ( "," ) == - 1 :
778 self
. revision
= self
. changeRange
779 self
. changeRange
= ""
780 self
. depotPath
= self
. depotPath
[ 0 : atIdx
]
781 elif self
. depotPath
. find ( "#" ) != - 1 :
782 hashIdx
= self
. depotPath
. index ( "#" )
783 self
. revision
= self
. depotPath
[ hashIdx
:]
784 self
. depotPath
= self
. depotPath
[ 0 : hashIdx
]
785 elif len ( self
. previousDepotPath
) == 0 :
786 self
. revision
= "#head"
788 if self
. depotPath
. endswith ( "..." ):
789 self
. depotPath
= self
. depotPath
[:- 3 ]
791 if not self
. depotPath
. endswith ( "/" ):
792 self
. depotPath
+= "/"
794 self
. loadUserMapFromCache ()
796 if self
. detectLabels
:
799 if self
. detectBranches
:
800 self
. getBranchMapping ();
802 print "p4-git branches: %s " % self
. p4BranchesInGit
803 print "initial parents: %s " % self
. initialParents
804 for b
in self
. p4BranchesInGit
:
806 b
= b
[ len ( self
. projectName
):]
807 self
. createdBranches
. add ( b
)
809 self
. tz
= " %+0 3d %0 2d" % (- time
. timezone
/ 3600 , ((- time
. timezone
% 3600 ) / 60 ))
811 importProcess
= subprocess
. Popen ([ "git" , "fast-import" ], stdin
= subprocess
. PIPE
, stdout
= subprocess
. PIPE
, stderr
= subprocess
. PIPE
);
812 self
. gitOutput
= importProcess
. stdout
813 self
. gitStream
= importProcess
. stdin
814 self
. gitError
= importProcess
. stderr
816 if len ( self
. revision
) > 0 :
817 print "Doing initial import of %s from revision %s " % ( self
. depotPath
, self
. revision
)
819 details
= { "user" : "git perforce import user" , "time" : int ( time
. time ()) }
820 details
[ "desc" ] = "Initial import of %s from the state at revision %s " % ( self
. depotPath
, self
. revision
)
821 details
[ "change" ] = self
. revision
825 for info
in p4CmdList ( "files %s ... %s " % ( self
. depotPath
, self
. revision
)):
826 change
= int ( info
[ "change" ])
827 if change
> newestRevision
:
828 newestRevision
= change
830 if info
[ "action" ] == "delete" :
831 # don't increase the file cnt, otherwise details["depotFile123"] will have gaps!
832 #fileCnt = fileCnt + 1
835 for prop
in [ "depotFile" , "rev" , "action" , "type" ]:
836 details
[ " %s%s " % ( prop
, fileCnt
)] = info
[ prop
]
838 fileCnt
= fileCnt
+ 1
840 details
[ "change" ] = newestRevision
843 self
. commit ( details
, self
. extractFilesFromCommit ( details
), self
. branch
, self
. depotPath
)
845 print "IO error with git fast-import. Is your git version recent enough?"
846 print self
. gitError
. read ()
851 if len ( self
. changesFile
) > 0 :
852 output
= open ( self
. changesFile
). readlines ()
855 changeSet
. add ( int ( line
))
857 for change
in changeSet
:
858 changes
. append ( change
)
863 print "Getting p4 changes for %s ... %s " % ( self
. depotPath
, self
. changeRange
)
864 output
= mypopen ( "p4 changes %s ... %s " % ( self
. depotPath
, self
. changeRange
)). readlines ()
867 changeNum
= line
. split ( " " )[ 1 ]
868 changes
. append ( changeNum
)
872 if len ( changes
) == 0 :
874 print "no changes to import!"
878 for change
in changes
:
879 description
= p4Cmd ( "describe %s " % change
)
882 sys
. stdout
. write ( " \r importing revision %s ( %s%% )" % ( change
, cnt
* 100 / len ( changes
)))
887 if self
. detectBranches
:
888 branches
= self
. splitFilesIntoBranches ( description
)
889 for branch
in branches
. keys ():
890 branchPrefix
= self
. depotPath
+ branch
+ "/"
894 filesForCommit
= branches
[ branch
]
897 print "branch is %s " % branch
899 if branch
not in self
. createdBranches
:
900 self
. createdBranches
. add ( branch
)
901 parent
= self
. knownBranches
[ branch
]
905 print "parent determined through known branches: %s " % parent
907 # main branch? use master
911 branch
= self
. projectName
+ branch
915 elif len ( parent
) > 0 :
916 parent
= self
. projectName
+ parent
918 branch
= "refs/remotes/p4/" + branch
920 parent
= "refs/remotes/p4/" + parent
923 print "looking for initial parent for %s ; current parent is %s " % ( branch
, parent
)
925 if len ( parent
) == 0 and branch
in self
. initialParents
:
926 parent
= self
. initialParents
[ branch
]
927 del self
. initialParents
[ branch
]
929 self
. commit ( description
, filesForCommit
, branch
, branchPrefix
, parent
)
931 files
= self
. extractFilesFromCommit ( description
)
932 self
. commit ( description
, files
, self
. branch
, self
. depotPath
, self
. initialParent
)
933 self
. initialParent
= ""
935 print self
. gitError
. read ()
942 self
. gitStream
. close ()
943 if importProcess
. wait () != 0 :
944 die ( "fast-import failed: %s " % self
. gitError
. read ())
945 self
. gitOutput
. close ()
946 self
. gitError
. close ()
950 class P4Rebase ( Command
):
952 Command
.__ init
__ ( self
)
953 self
. options
= [ optparse
. make_option ( "--with-origin" , dest
= "syncWithOrigin" , action
= "store_true" ) ]
954 self
. description
= "Fetches the latest revision from perforce and rebases the current work (branch) against it"
955 self
. syncWithOrigin
= False
959 sync
. syncWithOrigin
= self
. syncWithOrigin
961 print "Rebasing the current branch"
962 oldHead
= mypopen ( "git rev-parse HEAD" ). read ()[:- 1 ]
963 system ( "git rebase p4" )
964 system ( "git diff-tree --stat --summary -M %s HEAD" % oldHead
)
967 class P4Clone ( P4Sync
):
969 P4Sync
.__ init
__ ( self
)
970 self
. description
= "Creates a new git repository and imports from Perforce into it"
971 self
. usage
= "usage: %prog [options] //depot/path[@revRange] [directory]"
972 self
. needsGit
= False
984 if not depotPath
. startswith ( "//" ):
989 atPos
= dir . rfind ( "@" )
992 hashPos
= dir . rfind ( "#" )
996 if dir . endswith ( "..." ):
999 if dir . endswith ( "/" ):
1002 slashPos
= dir . rfind ( "/" )
1004 dir = dir [ slashPos
+ 1 :]
1006 print "Importing from %s into %s " % ( depotPath
, dir )
1010 if not P4Sync
. run ( self
, [ depotPath
]):
1012 if self
. branch
!= "master" :
1013 if gitBranchExists ( "refs/remotes/p4/master" ):
1014 system ( "git branch master refs/remotes/p4/master" )
1015 system ( "git checkout -f" )
1017 print "Could not detect main branch. No checkout/master branch created."
1020 class HelpFormatter ( optparse
. IndentedHelpFormatter
):
1022 optparse
. IndentedHelpFormatter
.__ init
__ ( self
)
1024 def format_description ( self
, description
):
1026 return description
+ " \n "
1030 def printUsage ( commands
):
1031 print "usage: %s <command> [options]" % sys
. argv
[ 0 ]
1033 print "valid commands: %s " % ", " . join ( commands
)
1035 print "Try %s <command> --help for command specific help." % sys
. argv
[ 0 ]
1039 "debug" : P4Debug (),
1040 "submit" : P4Submit (),
1042 "rebase" : P4Rebase (),
1046 if len ( sys
. argv
[ 1 :]) == 0 :
1047 printUsage ( commands
. keys ())
1051 cmdName
= sys
. argv
[ 1 ]
1053 cmd
= commands
[ cmdName
]
1055 print "unknown command %s " % cmdName
1057 printUsage ( commands
. keys ())
1060 options
= cmd
. options
1065 if len ( options
) > 0 :
1066 options
. append ( optparse
. make_option ( "--git-dir" , dest
= "gitdir" ))
1068 parser
= optparse
. OptionParser ( cmd
. usage
. replace ( "%prog" , "%prog " + cmdName
),
1070 description
= cmd
. description
,
1071 formatter
= HelpFormatter ())
1073 ( cmd
, args
) = parser
. parse_args ( sys
. argv
[ 2 :], cmd
);
1077 if len ( gitdir
) == 0 :
1079 if not isValidGitDir ( gitdir
):
1080 gitdir
= mypopen ( "git rev-parse --git-dir" ). read ()[:- 1 ]
1081 if os
. path
. exists ( gitdir
):
1082 cdup
= mypopen ( "git rev-parse --show-cdup" ). read ()[:- 1 ];
1086 if not isValidGitDir ( gitdir
):
1087 if isValidGitDir ( gitdir
+ "/.git" ):
1090 die ( "fatal: cannot locate git repository at %s " % gitdir
)
1092 os
. environ
[ "GIT_DIR" ] = gitdir
1094 if not cmd
. run ( args
):