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: * Consider making --with-origin the default, assuming that the git
11 # protocol is always more efficient. (needs manual testing first :)
14 import optparse
, sys
, os
, marshal
, popen2
, subprocess
, shelve
15 import tempfile
, getopt
, sha
, os
.path
, time
, platform
18 gitdir
= os
.environ
.get("GIT_DIR", "")
21 return os
.popen(command
, "rb");
24 cmd
= "p4 -G %s" % cmd
25 pipe
= os
.popen(cmd
, "rb")
30 entry
= marshal
.load(pipe
)
45 def p4Where(depotPath
):
46 if not depotPath
.endswith("/"):
48 output
= p4Cmd("where %s..." % depotPath
)
49 if output
["code"] == "error":
53 clientPath
= output
.get("path")
54 elif "data" in output
:
55 data
= output
.get("data")
56 lastSpace
= data
.rfind(" ")
57 clientPath
= data
[lastSpace
+ 1:]
59 if clientPath
.endswith("..."):
60 clientPath
= clientPath
[:-3]
64 sys
.stderr
.write(msg
+ "\n")
67 def currentGitBranch():
68 return mypopen("git name-rev HEAD").read().split(" ")[1][:-1]
70 def isValidGitDir(path
):
71 if os
.path
.exists(path
+ "/HEAD") and os
.path
.exists(path
+ "/refs") and os
.path
.exists(path
+ "/objects"):
75 def parseRevision(ref
):
76 return mypopen("git rev-parse %s" % ref
).read()[:-1]
79 if os
.system(cmd
) != 0:
80 die("command failed: %s" % cmd
)
82 def extractLogMessageFromGitCommit(commit
):
85 for log
in mypopen("git cat-file commit %s" % commit
).readlines():
94 def extractDepotPathAndChangeFromGitLog(log
):
96 for line
in log
.split("\n"):
98 if line
.startswith("[git-p4:") and line
.endswith("]"):
99 line
= line
[8:-1].strip()
100 for assignment
in line
.split(":"):
101 variable
= assignment
.strip()
103 equalPos
= assignment
.find("=")
105 variable
= assignment
[:equalPos
].strip()
106 value
= assignment
[equalPos
+ 1:].strip()
107 if value
.startswith("\"") and value
.endswith("\""):
109 values
[variable
] = value
111 return values
.get("depot-path"), values
.get("change")
113 def gitBranchExists(branch
):
114 proc
= subprocess
.Popen(["git", "rev-parse", branch
], stderr
=subprocess
.PIPE
, stdout
=subprocess
.PIPE
);
115 return proc
.wait() == 0;
119 self
.usage
= "usage: %prog [options]"
122 class P4Debug(Command
):
124 Command
.__init
__(self
)
127 self
.description
= "A tool to debug the output of p4 -G."
128 self
.needsGit
= False
131 for output
in p4CmdList(" ".join(args
)):
135 class P4RollBack(Command
):
137 Command
.__init
__(self
)
139 optparse
.make_option("--verbose", dest
="verbose", action
="store_true")
141 self
.description
= "A tool to debug the multi-branch import. Don't use :)"
147 maxChange
= int(args
[0])
148 for line
in mypopen("git rev-parse --symbolic --remotes").readlines():
149 if line
.startswith("p4/") and line
!= "p4/HEAD\n":
150 ref
= "refs/remotes/" + line
[:-1]
151 log
= extractLogMessageFromGitCommit(ref
)
152 depotPath
, change
= extractDepotPathAndChangeFromGitLog(log
)
155 if len(p4Cmd("changes -m 1 %s...@%s" % (depotPath
, maxChange
))) == 0:
156 print "Branch %s did not exist at change %s, deleting." % (ref
, maxChange
)
157 system("git update-ref -d %s `git rev-parse %s`" % (ref
, ref
))
160 while len(change
) > 0 and int(change
) > maxChange
:
163 print "%s is at %s ; rewinding towards %s" % (ref
, change
, maxChange
)
164 system("git update-ref %s \"%s^\"" % (ref
, ref
))
165 log
= extractLogMessageFromGitCommit(ref
)
166 depotPath
, change
= extractDepotPathAndChangeFromGitLog(log
)
169 print "%s rewound to %s" % (ref
, change
)
173 class P4Submit(Command
):
175 Command
.__init
__(self
)
177 optparse
.make_option("--continue", action
="store_false", dest
="firstTime"),
178 optparse
.make_option("--origin", dest
="origin"),
179 optparse
.make_option("--reset", action
="store_true", dest
="reset"),
180 optparse
.make_option("--log-substitutions", dest
="substFile"),
181 optparse
.make_option("--noninteractive", action
="store_false"),
182 optparse
.make_option("--dry-run", action
="store_true"),
183 optparse
.make_option("--direct", dest
="directSubmit", action
="store_true"),
185 self
.description
= "Submit changes from git to the perforce depot."
186 self
.usage
+= " [name of git branch to submit into perforce depot]"
187 self
.firstTime
= True
189 self
.interactive
= True
192 self
.firstTime
= True
194 self
.directSubmit
= False
196 self
.logSubstitutions
= {}
197 self
.logSubstitutions
["<enter description here>"] = "%log%"
198 self
.logSubstitutions
["\tDetails:"] = "\tDetails: %log%"
201 if len(p4CmdList("opened ...")) > 0:
202 die("You have files opened with perforce! Close them before starting the sync.")
205 if len(self
.config
) > 0 and not self
.reset
:
206 die("Cannot start sync. Previous sync config found at %s\nIf you want to start submitting again from scratch maybe you want to call git-p4 submit --reset" % self
.configFile
)
209 if self
.directSubmit
:
212 for line
in mypopen("git rev-list --no-merges %s..%s" % (self
.origin
, self
.master
)).readlines():
213 commits
.append(line
[:-1])
216 self
.config
["commits"] = commits
218 def prepareLogMessage(self
, template
, message
):
221 for line
in template
.split("\n"):
222 if line
.startswith("#"):
223 result
+= line
+ "\n"
227 for key
in self
.logSubstitutions
.keys():
228 if line
.find(key
) != -1:
229 value
= self
.logSubstitutions
[key
]
230 value
= value
.replace("%log%", message
)
231 if value
!= "@remove@":
232 result
+= line
.replace(key
, value
) + "\n"
237 result
+= line
+ "\n"
242 if self
.directSubmit
:
243 print "Applying local change in working directory/index"
244 diff
= self
.diffStatus
246 print "Applying %s" % (mypopen("git log --max-count=1 --pretty=oneline %s" % id).read())
247 diff
= mypopen("git diff-tree -r --name-status \"%s^\" \"%s\"" % (id, id)).readlines()
249 filesToDelete
= set()
253 path
= line
[1:].strip()
255 system("p4 edit \"%s\"" % path
)
256 editedFiles
.add(path
)
257 elif modifier
== "A":
259 if path
in filesToDelete
:
260 filesToDelete
.remove(path
)
261 elif modifier
== "D":
262 filesToDelete
.add(path
)
263 if path
in filesToAdd
:
264 filesToAdd
.remove(path
)
266 die("unknown modifier %s for %s" % (modifier
, path
))
268 if self
.directSubmit
:
269 diffcmd
= "cat \"%s\"" % self
.diffFile
271 diffcmd
= "git format-patch -k --stdout \"%s^\"..\"%s\"" % (id, id)
272 patchcmd
= diffcmd
+ " | git apply "
273 tryPatchCmd
= patchcmd
+ "--check -"
274 applyPatchCmd
= patchcmd
+ "--check --apply -"
276 if os
.system(tryPatchCmd
) != 0:
277 print "Unfortunately applying the change failed!"
278 print "What do you want to do?"
280 while response
!= "s" and response
!= "a" and response
!= "w":
281 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) ")
283 print "Skipping! Good luck with the next patches..."
285 elif response
== "a":
286 os
.system(applyPatchCmd
)
287 if len(filesToAdd
) > 0:
288 print "You may also want to call p4 add on the following files:"
289 print " ".join(filesToAdd
)
290 if len(filesToDelete
):
291 print "The following files should be scheduled for deletion with p4 delete:"
292 print " ".join(filesToDelete
)
293 die("Please resolve and submit the conflict manually and continue afterwards with git-p4 submit --continue")
294 elif response
== "w":
295 system(diffcmd
+ " > patch.txt")
296 print "Patch saved to patch.txt in %s !" % self
.clientPath
297 die("Please resolve and submit the conflict manually and continue afterwards with git-p4 submit --continue")
299 system(applyPatchCmd
)
302 system("p4 add %s" % f
)
303 for f
in filesToDelete
:
304 system("p4 revert %s" % f
)
305 system("p4 delete %s" % f
)
308 if not self
.directSubmit
:
309 logMessage
= extractLogMessageFromGitCommit(id)
310 logMessage
= logMessage
.replace("\n", "\n\t")
311 logMessage
= logMessage
[:-1]
313 template
= mypopen("p4 change -o").read()
316 submitTemplate
= self
.prepareLogMessage(template
, logMessage
)
317 diff
= mypopen("p4 diff -du ...").read()
319 for newFile
in filesToAdd
:
320 diff
+= "==== new file ====\n"
321 diff
+= "--- /dev/null\n"
322 diff
+= "+++ %s\n" % newFile
323 f
= open(newFile
, "r")
324 for line
in f
.readlines():
328 separatorLine
= "######## everything below this line is just the diff #######"
329 if platform
.system() == "Windows":
330 separatorLine
+= "\r"
331 separatorLine
+= "\n"
334 firstIteration
= True
335 while response
== "e":
336 if not firstIteration
:
337 response
= raw_input("Do you want to submit this change? [y]es/[e]dit/[n]o/[s]kip ")
338 firstIteration
= False
340 [handle
, fileName
] = tempfile
.mkstemp()
341 tmpFile
= os
.fdopen(handle
, "w+")
342 tmpFile
.write(submitTemplate
+ separatorLine
+ diff
)
345 if platform
.system() == "Windows":
346 defaultEditor
= "notepad"
347 editor
= os
.environ
.get("EDITOR", defaultEditor
);
348 system(editor
+ " " + fileName
)
349 tmpFile
= open(fileName
, "rb")
350 message
= tmpFile
.read()
353 submitTemplate
= message
[:message
.index(separatorLine
)]
355 if response
== "y" or response
== "yes":
358 raw_input("Press return to continue...")
360 if self
.directSubmit
:
361 print "Submitting to git first"
362 os
.chdir(self
.oldWorkingDirectory
)
363 pipe
= os
.popen("git commit -a -F -", "wb")
364 pipe
.write(submitTemplate
)
366 os
.chdir(self
.clientPath
)
368 pipe
= os
.popen("p4 submit -i", "wb")
369 pipe
.write(submitTemplate
)
371 elif response
== "s":
372 for f
in editedFiles
:
373 system("p4 revert \"%s\"" % f
);
375 system("p4 revert \"%s\"" % f
);
377 for f
in filesToDelete
:
378 system("p4 delete \"%s\"" % f
);
381 print "Not submitting!"
382 self
.interactive
= False
384 fileName
= "submit.txt"
385 file = open(fileName
, "w+")
386 file.write(self
.prepareLogMessage(template
, logMessage
))
388 print "Perforce submit template written as %s. Please review/edit and then use p4 submit -i < %s to submit directly!" % (fileName
, fileName
)
392 # make gitdir absolute so we can cd out into the perforce checkout
393 gitdir
= os
.path
.abspath(gitdir
)
394 os
.environ
["GIT_DIR"] = gitdir
397 self
.master
= currentGitBranch()
398 if len(self
.master
) == 0 or not os
.path
.exists("%s/refs/heads/%s" % (gitdir
, self
.master
)):
399 die("Detecting current git branch failed!")
401 self
.master
= args
[0]
406 if gitBranchExists("p4"):
407 [depotPath
, dummy
] = extractDepotPathAndChangeFromGitLog(extractLogMessageFromGitCommit("p4"))
408 if len(depotPath
) == 0 and gitBranchExists("origin"):
409 [depotPath
, dummy
] = extractDepotPathAndChangeFromGitLog(extractLogMessageFromGitCommit("origin"))
411 if len(depotPath
) == 0:
412 print "Internal error: cannot locate perforce depot path from existing branches"
415 self
.clientPath
= p4Where(depotPath
)
417 if len(self
.clientPath
) == 0:
418 print "Error: Cannot locate perforce checkout of %s in client view" % depotPath
421 print "Perforce checkout for depot path %s located at %s" % (depotPath
, self
.clientPath
)
422 self
.oldWorkingDirectory
= os
.getcwd()
424 if self
.directSubmit
:
425 self
.diffStatus
= mypopen("git diff -r --name-status HEAD").readlines()
426 if len(self
.diffStatus
) == 0:
427 print "No changes in working directory to submit."
429 patch
= mypopen("git diff -p --binary --diff-filter=ACMRTUXB HEAD").read()
430 self
.diffFile
= gitdir
+ "/p4-git-diff"
431 f
= open(self
.diffFile
, "wb")
435 os
.chdir(self
.clientPath
)
436 response
= raw_input("Do you want to sync %s with p4 sync? [y]es/[n]o " % self
.clientPath
)
437 if response
== "y" or response
== "yes":
438 system("p4 sync ...")
440 if len(self
.origin
) == 0:
441 if gitBranchExists("p4"):
444 self
.origin
= "origin"
447 self
.firstTime
= True
449 if len(self
.substFile
) > 0:
450 for line
in open(self
.substFile
, "r").readlines():
451 tokens
= line
[:-1].split("=")
452 self
.logSubstitutions
[tokens
[0]] = tokens
[1]
455 self
.configFile
= gitdir
+ "/p4-git-sync.cfg"
456 self
.config
= shelve
.open(self
.configFile
, writeback
=True)
461 commits
= self
.config
.get("commits", [])
463 while len(commits
) > 0:
464 self
.firstTime
= False
466 commits
= commits
[1:]
467 self
.config
["commits"] = commits
469 if not self
.interactive
:
474 if self
.directSubmit
:
475 os
.remove(self
.diffFile
)
477 if len(commits
) == 0:
479 print "No changes found to apply between %s and current HEAD" % self
.origin
481 print "All changes applied!"
482 os
.chdir(self
.oldWorkingDirectory
)
483 response
= raw_input("Do you want to sync from Perforce now using git-p4 rebase? [y]es/[n]o ")
484 if response
== "y" or response
== "yes":
487 os
.remove(self
.configFile
)
491 class P4Sync(Command
):
493 Command
.__init
__(self
)
495 optparse
.make_option("--branch", dest
="branch"),
496 optparse
.make_option("--detect-branches", dest
="detectBranches", action
="store_true"),
497 optparse
.make_option("--changesfile", dest
="changesFile"),
498 optparse
.make_option("--silent", dest
="silent", action
="store_true"),
499 optparse
.make_option("--detect-labels", dest
="detectLabels", action
="store_true"),
500 optparse
.make_option("--with-origin", dest
="syncWithOrigin", action
="store_true"),
501 optparse
.make_option("--verbose", dest
="verbose", action
="store_true"),
502 optparse
.make_option("--import-local", dest
="importIntoRemotes", action
="store_false")
504 self
.description
= """Imports from Perforce into a git repository.\n
506 //depot/my/project/ -- to import the current head
507 //depot/my/project/@all -- to import everything
508 //depot/my/project/@1,6 -- to import only from revision 1 to 6
510 (a ... is not needed in the path p4 specification, it's added implicitly)"""
512 self
.usage
+= " //depot/path[@revRange]"
515 self
.createdBranches
= Set()
516 self
.committedChanges
= Set()
518 self
.detectBranches
= False
519 self
.detectLabels
= False
520 self
.changesFile
= ""
521 self
.syncWithOrigin
= False
523 self
.importIntoRemotes
= True
525 def p4File(self
, depotPath
):
526 return os
.popen("p4 print -q \"%s\"" % depotPath
, "rb").read()
528 def extractFilesFromCommit(self
, commit
):
531 while commit
.has_key("depotFile%s" % fnum
):
532 path
= commit
["depotFile%s" % fnum
]
533 if not path
.startswith(self
.depotPath
):
534 # if not self.silent:
535 # print "\nchanged files: ignoring path %s outside of %s in change %s" % (path, self.depotPath, change)
541 file["rev"] = commit
["rev%s" % fnum
]
542 file["action"] = commit
["action%s" % fnum
]
543 file["type"] = commit
["type%s" % fnum
]
548 def splitFilesIntoBranches(self
, commit
):
552 while commit
.has_key("depotFile%s" % fnum
):
553 path
= commit
["depotFile%s" % fnum
]
554 if not path
.startswith(self
.depotPath
):
555 # if not self.silent:
556 # print "\nchanged files: ignoring path %s outside of %s in change %s" % (path, self.depotPath, change)
562 file["rev"] = commit
["rev%s" % fnum
]
563 file["action"] = commit
["action%s" % fnum
]
564 file["type"] = commit
["type%s" % fnum
]
567 relPath
= path
[len(self
.depotPath
):]
569 for branch
in self
.knownBranches
.keys():
570 if relPath
.startswith(branch
+ "/"): # add a trailing slash so that a commit into qt/4.2foo doesn't end up in qt/4.2
571 if branch
not in branches
:
572 branches
[branch
] = []
573 branches
[branch
].append(file)
577 def commit(self
, details
, files
, branch
, branchPrefix
, parent
= ""):
578 epoch
= details
["time"]
579 author
= details
["user"]
582 print "commit into %s" % branch
584 self
.gitStream
.write("commit %s\n" % branch
)
585 # gitStream.write("mark :%s\n" % details["change"])
586 self
.committedChanges
.add(int(details
["change"]))
588 if author
not in self
.users
:
589 self
.getUserMapFromPerforceServer()
590 if author
in self
.users
:
591 committer
= "%s %s %s" % (self
.users
[author
], epoch
, self
.tz
)
593 committer
= "%s <a@b> %s %s" % (author
, epoch
, self
.tz
)
595 self
.gitStream
.write("committer %s\n" % committer
)
597 self
.gitStream
.write("data <<EOT\n")
598 self
.gitStream
.write(details
["desc"])
599 self
.gitStream
.write("\n[git-p4: depot-path = \"%s\": change = %s]\n" % (branchPrefix
, details
["change"]))
600 self
.gitStream
.write("EOT\n\n")
604 print "parent %s" % parent
605 self
.gitStream
.write("from %s\n" % parent
)
609 if not path
.startswith(branchPrefix
):
611 # print "\nchanged files: ignoring path %s outside of branch prefix %s in change %s" % (path, branchPrefix, details["change"])
614 depotPath
= path
+ "#" + rev
615 relPath
= path
[len(branchPrefix
):]
616 action
= file["action"]
618 if file["type"] == "apple":
619 print "\nfile %s is a strange apple file that forks. Ignoring!" % path
622 if action
== "delete":
623 self
.gitStream
.write("D %s\n" % relPath
)
626 if file["type"].startswith("x"):
629 data
= self
.p4File(depotPath
)
631 self
.gitStream
.write("M %s inline %s\n" % (mode
, relPath
))
632 self
.gitStream
.write("data %s\n" % len(data
))
633 self
.gitStream
.write(data
)
634 self
.gitStream
.write("\n")
636 self
.gitStream
.write("\n")
638 change
= int(details
["change"])
640 if self
.labels
.has_key(change
):
641 label
= self
.labels
[change
]
642 labelDetails
= label
[0]
643 labelRevisions
= label
[1]
645 print "Change %s is labelled %s" % (change
, labelDetails
)
647 files
= p4CmdList("files %s...@%s" % (branchPrefix
, change
))
649 if len(files
) == len(labelRevisions
):
653 if info
["action"] == "delete":
655 cleanedFiles
[info
["depotFile"]] = info
["rev"]
657 if cleanedFiles
== labelRevisions
:
658 self
.gitStream
.write("tag tag_%s\n" % labelDetails
["label"])
659 self
.gitStream
.write("from %s\n" % branch
)
661 owner
= labelDetails
["Owner"]
663 if author
in self
.users
:
664 tagger
= "%s %s %s" % (self
.users
[owner
], epoch
, self
.tz
)
666 tagger
= "%s <a@b> %s %s" % (owner
, epoch
, self
.tz
)
667 self
.gitStream
.write("tagger %s\n" % tagger
)
668 self
.gitStream
.write("data <<EOT\n")
669 self
.gitStream
.write(labelDetails
["Description"])
670 self
.gitStream
.write("EOT\n\n")
674 print "Tag %s does not match with change %s: files do not match." % (labelDetails
["label"], change
)
678 print "Tag %s does not match with change %s: file count is different." % (labelDetails
["label"], change
)
680 def getUserMapFromPerforceServer(self
):
683 for output
in p4CmdList("users"):
684 if not output
.has_key("User"):
686 self
.users
[output
["User"]] = output
["FullName"] + " <" + output
["Email"] + ">"
688 cache
= open(gitdir
+ "/p4-usercache.txt", "wb")
689 for user
in self
.users
.keys():
690 cache
.write("%s\t%s\n" % (user
, self
.users
[user
]))
693 def loadUserMapFromCache(self
):
696 cache
= open(gitdir
+ "/p4-usercache.txt", "rb")
697 lines
= cache
.readlines()
700 entry
= line
[:-1].split("\t")
701 self
.users
[entry
[0]] = entry
[1]
703 self
.getUserMapFromPerforceServer()
708 l
= p4CmdList("labels %s..." % self
.depotPath
)
709 if len(l
) > 0 and not self
.silent
:
710 print "Finding files belonging to labels in %s" % self
.depotPath
713 label
= output
["label"]
717 print "Querying files for label %s" % label
718 for file in p4CmdList("files %s...@%s" % (self
.depotPath
, label
)):
719 revisions
[file["depotFile"]] = file["rev"]
720 change
= int(file["change"])
721 if change
> newestChange
:
722 newestChange
= change
724 self
.labels
[newestChange
] = [output
, revisions
]
727 print "Label changes: %s" % self
.labels
.keys()
729 def getBranchMapping(self
):
730 self
.projectName
= self
.depotPath
[self
.depotPath
[:-1].rfind("/") + 1:]
732 for info
in p4CmdList("branches"):
733 details
= p4Cmd("branch -o %s" % info
["branch"])
735 while details
.has_key("View%s" % viewIdx
):
736 paths
= details
["View%s" % viewIdx
].split(" ")
737 viewIdx
= viewIdx
+ 1
738 # require standard //depot/foo/... //depot/bar/... mapping
739 if len(paths
) != 2 or not paths
[0].endswith("/...") or not paths
[1].endswith("/..."):
742 destination
= paths
[1]
743 if source
.startswith(self
.depotPath
) and destination
.startswith(self
.depotPath
):
744 source
= source
[len(self
.depotPath
):-4]
745 destination
= destination
[len(self
.depotPath
):-4]
746 if destination
not in self
.knownBranches
:
747 self
.knownBranches
[destination
] = source
748 if source
not in self
.knownBranches
:
749 self
.knownBranches
[source
] = source
751 def listExistingP4GitBranches(self
):
752 self
.p4BranchesInGit
= []
754 cmdline
= "git rev-parse --symbolic "
755 if self
.importIntoRemotes
:
756 cmdline
+= " --remotes"
758 cmdline
+= " --branches"
760 for line
in mypopen(cmdline
).readlines():
761 if line
.startswith("p4/") and line
!= "p4/HEAD\n":
763 self
.p4BranchesInGit
.append(branch
)
764 self
.initialParents
[self
.refPrefix
+ branch
] = parseRevision(line
[:-1])
768 self
.changeRange
= ""
769 self
.initialParent
= ""
770 self
.previousDepotPath
= ""
771 # map from branch depot path to parent branch
772 self
.knownBranches
= {}
773 self
.initialParents
= {}
775 if self
.importIntoRemotes
:
776 self
.refPrefix
= "refs/remotes/p4/"
778 self
.refPrefix
= "refs/heads/p4/"
780 createP4HeadRef
= False;
782 if self
.syncWithOrigin
and gitBranchExists("origin") and gitBranchExists(self
.refPrefix
+ "master") and not self
.detectBranches
:
783 ### needs to be ported to multi branch import
785 print "Syncing with origin first as requested by calling git fetch origin"
786 system("git fetch origin")
787 [originPreviousDepotPath
, originP4Change
] = extractDepotPathAndChangeFromGitLog(extractLogMessageFromGitCommit("origin"))
788 [p4PreviousDepotPath
, p4Change
] = extractDepotPathAndChangeFromGitLog(extractLogMessageFromGitCommit("p4"))
789 if len(originPreviousDepotPath
) > 0 and len(originP4Change
) > 0 and len(p4Change
) > 0:
790 if originPreviousDepotPath
== p4PreviousDepotPath
:
791 originP4Change
= int(originP4Change
)
792 p4Change
= int(p4Change
)
793 if originP4Change
> p4Change
:
794 print "origin (%s) is newer than p4 (%s). Updating p4 branch from origin." % (originP4Change
, p4Change
)
795 system("git update-ref " + self
.refPrefix
+ "master origin");
797 print "Cannot sync with origin. It was imported from %s while remotes/p4 was imported from %s" % (originPreviousDepotPath
, p4PreviousDepotPath
)
799 if len(self
.branch
) == 0:
800 self
.branch
= self
.refPrefix
+ "master"
801 if gitBranchExists("refs/heads/p4") and self
.importIntoRemotes
:
802 system("git update-ref %s refs/heads/p4" % self
.branch
)
803 system("git branch -D p4");
804 # create it /after/ importing, when master exists
805 if not gitBranchExists(self
.refPrefix
+ "HEAD") and self
.importIntoRemotes
:
806 createP4HeadRef
= True
808 # this needs to be called after the conversion from heads/p4 to remotes/p4/master
809 self
.listExistingP4GitBranches()
810 if len(self
.p4BranchesInGit
) > 1 and not self
.silent
:
811 print "Importing from/into multiple branches"
812 self
.detectBranches
= True
815 if not gitBranchExists(self
.branch
) and gitBranchExists("origin") and not self
.detectBranches
:
816 ### needs to be ported to multi branch import
818 print "Creating %s branch in git repository based on origin" % self
.branch
820 if not branch
.startswith("refs"):
821 branch
= "refs/heads/" + branch
822 system("git update-ref %s origin" % branch
)
825 print "branches: %s" % self
.p4BranchesInGit
828 for branch
in self
.p4BranchesInGit
:
829 depotPath
, change
= extractDepotPathAndChangeFromGitLog(extractLogMessageFromGitCommit(self
.refPrefix
+ branch
))
832 print "path %s change %s" % (depotPath
, change
)
834 if len(depotPath
) > 0 and len(change
) > 0:
835 change
= int(change
) + 1
836 p4Change
= max(p4Change
, change
)
838 if len(self
.previousDepotPath
) == 0:
839 self
.previousDepotPath
= depotPath
842 l
= min(len(self
.previousDepotPath
), len(depotPath
))
843 while i
< l
and self
.previousDepotPath
[i
] == depotPath
[i
]:
845 self
.previousDepotPath
= self
.previousDepotPath
[:i
]
848 self
.depotPath
= self
.previousDepotPath
849 self
.changeRange
= "@%s,#head" % p4Change
850 self
.initialParent
= parseRevision(self
.branch
)
851 if not self
.silent
and not self
.detectBranches
:
852 print "Performing incremental import into %s git branch" % self
.branch
854 if not self
.branch
.startswith("refs/"):
855 self
.branch
= "refs/heads/" + self
.branch
857 if len(self
.depotPath
) != 0:
858 self
.depotPath
= self
.depotPath
[:-1]
860 if len(args
) == 0 and len(self
.depotPath
) != 0:
862 print "Depot path: %s" % self
.depotPath
866 if len(self
.depotPath
) != 0 and self
.depotPath
!= args
[0]:
867 print "previous import used depot path %s and now %s was specified. this doesn't work!" % (self
.depotPath
, args
[0])
869 self
.depotPath
= args
[0]
874 if self
.depotPath
.find("@") != -1:
875 atIdx
= self
.depotPath
.index("@")
876 self
.changeRange
= self
.depotPath
[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
.depotPath
= self
.depotPath
[0:atIdx
]
883 elif self
.depotPath
.find("#") != -1:
884 hashIdx
= self
.depotPath
.index("#")
885 self
.revision
= self
.depotPath
[hashIdx
:]
886 self
.depotPath
= self
.depotPath
[0:hashIdx
]
887 elif len(self
.previousDepotPath
) == 0:
888 self
.revision
= "#head"
890 if self
.depotPath
.endswith("..."):
891 self
.depotPath
= self
.depotPath
[:-3]
893 if not self
.depotPath
.endswith("/"):
894 self
.depotPath
+= "/"
896 self
.loadUserMapFromCache()
898 if self
.detectLabels
:
901 if self
.detectBranches
:
902 self
.getBranchMapping();
904 print "p4-git branches: %s" % self
.p4BranchesInGit
905 print "initial parents: %s" % self
.initialParents
906 for b
in self
.p4BranchesInGit
:
908 b
= b
[len(self
.projectName
):]
909 self
.createdBranches
.add(b
)
911 self
.tz
= "%+03d%02d" % (- time
.timezone
/ 3600, ((- time
.timezone
% 3600) / 60))
913 importProcess
= subprocess
.Popen(["git", "fast-import"], stdin
=subprocess
.PIPE
, stdout
=subprocess
.PIPE
, stderr
=subprocess
.PIPE
);
914 self
.gitOutput
= importProcess
.stdout
915 self
.gitStream
= importProcess
.stdin
916 self
.gitError
= importProcess
.stderr
918 if len(self
.revision
) > 0:
919 print "Doing initial import of %s from revision %s" % (self
.depotPath
, self
.revision
)
921 details
= { "user" : "git perforce import user", "time" : int(time
.time()) }
922 details
["desc"] = "Initial import of %s from the state at revision %s" % (self
.depotPath
, self
.revision
)
923 details
["change"] = self
.revision
927 for info
in p4CmdList("files %s...%s" % (self
.depotPath
, self
.revision
)):
928 change
= int(info
["change"])
929 if change
> newestRevision
:
930 newestRevision
= change
932 if info
["action"] == "delete":
933 # don't increase the file cnt, otherwise details["depotFile123"] will have gaps!
934 #fileCnt = fileCnt + 1
937 for prop
in [ "depotFile", "rev", "action", "type" ]:
938 details
["%s%s" % (prop
, fileCnt
)] = info
[prop
]
940 fileCnt
= fileCnt
+ 1
942 details
["change"] = newestRevision
945 self
.commit(details
, self
.extractFilesFromCommit(details
), self
.branch
, self
.depotPath
)
947 print "IO error with git fast-import. Is your git version recent enough?"
948 print self
.gitError
.read()
953 if len(self
.changesFile
) > 0:
954 output
= open(self
.changesFile
).readlines()
957 changeSet
.add(int(line
))
959 for change
in changeSet
:
960 changes
.append(change
)
965 print "Getting p4 changes for %s...%s" % (self
.depotPath
, self
.changeRange
)
966 output
= mypopen("p4 changes %s...%s" % (self
.depotPath
, self
.changeRange
)).readlines()
969 changeNum
= line
.split(" ")[1]
970 changes
.append(changeNum
)
974 if len(changes
) == 0:
976 print "No changes to import!"
979 self
.updatedBranches
= set()
982 for change
in changes
:
983 description
= p4Cmd("describe %s" % change
)
986 sys
.stdout
.write("\rImporting revision %s (%s%%)" % (change
, cnt
* 100 / len(changes
)))
991 if self
.detectBranches
:
992 branches
= self
.splitFilesIntoBranches(description
)
993 for branch
in branches
.keys():
994 branchPrefix
= self
.depotPath
+ branch
+ "/"
998 filesForCommit
= branches
[branch
]
1001 print "branch is %s" % branch
1003 self
.updatedBranches
.add(branch
)
1005 if branch
not in self
.createdBranches
:
1006 self
.createdBranches
.add(branch
)
1007 parent
= self
.knownBranches
[branch
]
1008 if parent
== branch
:
1011 print "parent determined through known branches: %s" % parent
1013 # main branch? use master
1014 if branch
== "main":
1017 branch
= self
.projectName
+ branch
1019 if parent
== "main":
1021 elif len(parent
) > 0:
1022 parent
= self
.projectName
+ parent
1024 branch
= self
.refPrefix
+ branch
1026 parent
= self
.refPrefix
+ parent
1029 print "looking for initial parent for %s; current parent is %s" % (branch
, parent
)
1031 if len(parent
) == 0 and branch
in self
.initialParents
:
1032 parent
= self
.initialParents
[branch
]
1033 del self
.initialParents
[branch
]
1035 self
.commit(description
, filesForCommit
, branch
, branchPrefix
, parent
)
1037 files
= self
.extractFilesFromCommit(description
)
1038 self
.commit(description
, files
, self
.branch
, self
.depotPath
, self
.initialParent
)
1039 self
.initialParent
= ""
1041 print self
.gitError
.read()
1046 if len(self
.updatedBranches
) > 0:
1047 sys
.stdout
.write("Updated branches: ")
1048 for b
in self
.updatedBranches
:
1049 sys
.stdout
.write("%s " % b
)
1050 sys
.stdout
.write("\n")
1053 self
.gitStream
.close()
1054 if importProcess
.wait() != 0:
1055 die("fast-import failed: %s" % self
.gitError
.read())
1056 self
.gitOutput
.close()
1057 self
.gitError
.close()
1060 system("git symbolic-ref %s/HEAD %s" % (self
.refPrefix
, self
.branch
))
1064 class P4Rebase(Command
):
1066 Command
.__init
__(self
)
1067 self
.options
= [ optparse
.make_option("--with-origin", dest
="syncWithOrigin", action
="store_true") ]
1068 self
.description
= "Fetches the latest revision from perforce and rebases the current work (branch) against it"
1069 self
.syncWithOrigin
= False
1071 def run(self
, args
):
1073 sync
.syncWithOrigin
= self
.syncWithOrigin
1075 print "Rebasing the current branch"
1076 oldHead
= mypopen("git rev-parse HEAD").read()[:-1]
1077 system("git rebase p4")
1078 system("git diff-tree --stat --summary -M %s HEAD" % oldHead
)
1081 class P4Clone(P4Sync
):
1083 P4Sync
.__init
__(self
)
1084 self
.description
= "Creates a new git repository and imports from Perforce into it"
1085 self
.usage
= "usage: %prog [options] //depot/path[@revRange] [directory]"
1086 self
.needsGit
= False
1088 def run(self
, args
):
1100 if not depotPath
.startswith("//"):
1105 atPos
= dir.rfind("@")
1108 hashPos
= dir.rfind("#")
1110 dir = dir[0:hashPos
]
1112 if dir.endswith("..."):
1115 if dir.endswith("/"):
1118 slashPos
= dir.rfind("/")
1120 dir = dir[slashPos
+ 1:]
1122 print "Importing from %s into %s" % (depotPath
, dir)
1126 gitdir
= os
.getcwd() + "/.git"
1127 if not P4Sync
.run(self
, [depotPath
]):
1129 if self
.branch
!= "master":
1130 if gitBranchExists("refs/remotes/p4/master"):
1131 system("git branch master refs/remotes/p4/master")
1132 system("git checkout -f")
1134 print "Could not detect main branch. No checkout/master branch created."
1137 class HelpFormatter(optparse
.IndentedHelpFormatter
):
1139 optparse
.IndentedHelpFormatter
.__init
__(self
)
1141 def format_description(self
, description
):
1143 return description
+ "\n"
1147 def printUsage(commands
):
1148 print "usage: %s <command> [options]" % sys
.argv
[0]
1150 print "valid commands: %s" % ", ".join(commands
)
1152 print "Try %s <command> --help for command specific help." % sys
.argv
[0]
1156 "debug" : P4Debug(),
1157 "submit" : P4Submit(),
1159 "rebase" : P4Rebase(),
1160 "clone" : P4Clone(),
1161 "rollback" : P4RollBack()
1164 if len(sys
.argv
[1:]) == 0:
1165 printUsage(commands
.keys())
1169 cmdName
= sys
.argv
[1]
1171 cmd
= commands
[cmdName
]
1173 print "unknown command %s" % cmdName
1175 printUsage(commands
.keys())
1178 options
= cmd
.options
1183 if len(options
) > 0:
1184 options
.append(optparse
.make_option("--git-dir", dest
="gitdir"))
1186 parser
= optparse
.OptionParser(cmd
.usage
.replace("%prog", "%prog " + cmdName
),
1188 description
= cmd
.description
,
1189 formatter
= HelpFormatter())
1191 (cmd
, args
) = parser
.parse_args(sys
.argv
[2:], cmd
);
1195 if len(gitdir
) == 0:
1197 if not isValidGitDir(gitdir
):
1198 gitdir
= mypopen("git rev-parse --git-dir").read()[:-1]
1199 if os
.path
.exists(gitdir
):
1200 cdup
= mypopen("git rev-parse --show-cdup").read()[:-1];
1204 if not isValidGitDir(gitdir
):
1205 if isValidGitDir(gitdir
+ "/.git"):
1208 die("fatal: cannot locate git repository at %s" % gitdir
)
1210 os
.environ
["GIT_DIR"] = gitdir
1212 if not cmd
.run(args
):