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
["\tDetails:"] = "\tDetails: %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\nIf 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
in self
.users
:
505 committer
= "%s %s %s" % (self
.users
[author
], epoch
, self
.tz
)
507 committer
= "%s <a@b> %s %s" % (author
, epoch
, self
.tz
)
509 self
.gitStream
.write("committer %s\n" % committer
)
511 self
.gitStream
.write("data <<EOT\n")
512 self
.gitStream
.write(details
["desc"])
513 self
.gitStream
.write("\n[git-p4: depot-path = \"%s\": change = %s]\n" % (branchPrefix
, details
["change"]))
514 self
.gitStream
.write("EOT\n\n")
518 print "parent %s" % parent
519 self
.gitStream
.write("from %s\n" % parent
)
523 if not path
.startswith(branchPrefix
):
525 # print "\nchanged files: ignoring path %s outside of branch prefix %s in change %s" % (path, branchPrefix, details["change"])
528 depotPath
= path
+ "#" + rev
529 relPath
= path
[len(branchPrefix
):]
530 action
= file["action"]
532 if file["type"] == "apple":
533 print "\nfile %s is a strange apple file that forks. Ignoring!" % path
536 if action
== "delete":
537 self
.gitStream
.write("D %s\n" % relPath
)
540 if file["type"].startswith("x"):
543 data
= self
.p4File(depotPath
)
545 self
.gitStream
.write("M %s inline %s\n" % (mode
, relPath
))
546 self
.gitStream
.write("data %s\n" % len(data
))
547 self
.gitStream
.write(data
)
548 self
.gitStream
.write("\n")
550 self
.gitStream
.write("\n")
552 change
= int(details
["change"])
554 if self
.labels
.has_key(change
):
555 label
= self
.labels
[change
]
556 labelDetails
= label
[0]
557 labelRevisions
= label
[1]
559 print "Change %s is labelled %s" % (change
, labelDetails
)
561 files
= p4CmdList("files %s...@%s" % (branchPrefix
, change
))
563 if len(files
) == len(labelRevisions
):
567 if info
["action"] == "delete":
569 cleanedFiles
[info
["depotFile"]] = info
["rev"]
571 if cleanedFiles
== labelRevisions
:
572 self
.gitStream
.write("tag tag_%s\n" % labelDetails
["label"])
573 self
.gitStream
.write("from %s\n" % branch
)
575 owner
= labelDetails
["Owner"]
577 if author
in self
.users
:
578 tagger
= "%s %s %s" % (self
.users
[owner
], epoch
, self
.tz
)
580 tagger
= "%s <a@b> %s %s" % (owner
, epoch
, self
.tz
)
581 self
.gitStream
.write("tagger %s\n" % tagger
)
582 self
.gitStream
.write("data <<EOT\n")
583 self
.gitStream
.write(labelDetails
["Description"])
584 self
.gitStream
.write("EOT\n\n")
588 print "Tag %s does not match with change %s: files do not match." % (labelDetails
["label"], change
)
592 print "Tag %s does not match with change %s: file count is different." % (labelDetails
["label"], change
)
594 def getUserMap(self
):
597 for output
in p4CmdList("users"):
598 if not output
.has_key("User"):
600 self
.users
[output
["User"]] = output
["FullName"] + " <" + output
["Email"] + ">"
605 l
= p4CmdList("labels %s..." % self
.depotPath
)
606 if len(l
) > 0 and not self
.silent
:
607 print "Finding files belonging to labels in %s" % self
.depotPath
610 label
= output
["label"]
614 print "Querying files for label %s" % label
615 for file in p4CmdList("files %s...@%s" % (self
.depotPath
, label
)):
616 revisions
[file["depotFile"]] = file["rev"]
617 change
= int(file["change"])
618 if change
> newestChange
:
619 newestChange
= change
621 self
.labels
[newestChange
] = [output
, revisions
]
624 print "Label changes: %s" % self
.labels
.keys()
626 def getBranchMapping(self
):
627 self
.projectName
= self
.depotPath
[self
.depotPath
[:-1].rfind("/") + 1:]
629 for info
in p4CmdList("branches"):
630 details
= p4Cmd("branch -o %s" % info
["branch"])
632 while details
.has_key("View%s" % viewIdx
):
633 paths
= details
["View%s" % viewIdx
].split(" ")
634 viewIdx
= viewIdx
+ 1
635 # require standard //depot/foo/... //depot/bar/... mapping
636 if len(paths
) != 2 or not paths
[0].endswith("/...") or not paths
[1].endswith("/..."):
639 destination
= paths
[1]
640 if source
.startswith(self
.depotPath
) and destination
.startswith(self
.depotPath
):
641 source
= source
[len(self
.depotPath
):-4]
642 destination
= destination
[len(self
.depotPath
):-4]
643 if destination
not in self
.knownBranches
:
644 self
.knownBranches
[destination
] = source
645 if source
not in self
.knownBranches
:
646 self
.knownBranches
[source
] = source
648 def listExistingP4GitBranches(self
):
649 self
.p4BranchesInGit
= []
651 for line
in mypopen("git rev-parse --symbolic --remotes").readlines():
652 if line
.startswith("p4/") and line
!= "p4/HEAD\n":
654 self
.p4BranchesInGit
.append(branch
)
655 self
.initialParents
["refs/remotes/p4/" + branch
] = parseRevision(line
[:-1])
659 self
.changeRange
= ""
660 self
.initialParent
= ""
661 self
.previousDepotPath
= ""
662 # map from branch depot path to parent branch
663 self
.knownBranches
= {}
664 self
.initialParents
= {}
666 self
.listExistingP4GitBranches()
668 if self
.syncWithOrigin
and gitBranchExists("origin") and gitBranchExists("refs/remotes/p4/master") and not self
.detectBranches
:
669 ### needs to be ported to multi branch import
671 print "Syncing with origin first as requested by calling git fetch origin"
672 system("git fetch origin")
673 [originPreviousDepotPath
, originP4Change
] = extractDepotPathAndChangeFromGitLog(extractLogMessageFromGitCommit("origin"))
674 [p4PreviousDepotPath
, p4Change
] = extractDepotPathAndChangeFromGitLog(extractLogMessageFromGitCommit("p4"))
675 if len(originPreviousDepotPath
) > 0 and len(originP4Change
) > 0 and len(p4Change
) > 0:
676 if originPreviousDepotPath
== p4PreviousDepotPath
:
677 originP4Change
= int(originP4Change
)
678 p4Change
= int(p4Change
)
679 if originP4Change
> p4Change
:
680 print "origin (%s) is newer than p4 (%s). Updating p4 branch from origin." % (originP4Change
, p4Change
)
681 system("git update-ref refs/remotes/p4/master origin");
683 print "Cannot sync with origin. It was imported from %s while remotes/p4 was imported from %s" % (originPreviousDepotPath
, p4PreviousDepotPath
)
685 if len(self
.branch
) == 0:
686 self
.branch
= "refs/remotes/p4/master"
687 if gitBranchExists("refs/heads/p4"):
688 system("git update-ref %s refs/heads/p4" % self
.branch
)
689 system("git branch -D p4");
690 if not gitBranchExists("refs/remotes/p4/HEAD"):
691 system("git symbolic-ref refs/remotes/p4/HEAD %s" % self
.branch
)
694 if not gitBranchExists(self
.branch
) and gitBranchExists("origin") and not self
.detectBranches
:
695 ### needs to be ported to multi branch import
697 print "Creating %s branch in git repository based on origin" % self
.branch
699 if not branch
.startswith("refs"):
700 branch
= "refs/heads/" + branch
701 system("git update-ref %s origin" % branch
)
704 print "branches: %s" % self
.p4BranchesInGit
707 for branch
in self
.p4BranchesInGit
:
708 depotPath
, change
= extractDepotPathAndChangeFromGitLog(extractLogMessageFromGitCommit("refs/remotes/p4/" + branch
))
711 print "path %s change %s" % (depotPath
, change
)
713 if len(depotPath
) > 0 and len(change
) > 0:
714 change
= int(change
) + 1
715 p4Change
= max(p4Change
, change
)
717 if len(self
.previousDepotPath
) == 0:
718 self
.previousDepotPath
= depotPath
721 l
= min(len(self
.previousDepotPath
), len(depotPath
))
722 while i
< l
and self
.previousDepotPath
[i
] == depotPath
[i
]:
724 self
.previousDepotPath
= self
.previousDepotPath
[:i
]
727 self
.depotPath
= self
.previousDepotPath
728 self
.changeRange
= "@%s,#head" % p4Change
729 self
.initialParent
= parseRevision(self
.branch
)
731 print "Performing incremental import into %s git branch" % self
.branch
733 if not self
.branch
.startswith("refs/"):
734 self
.branch
= "refs/heads/" + self
.branch
736 if len(self
.depotPath
) != 0:
737 self
.depotPath
= self
.depotPath
[:-1]
739 if len(args
) == 0 and len(self
.depotPath
) != 0:
741 print "Depot path: %s" % self
.depotPath
745 if len(self
.depotPath
) != 0 and self
.depotPath
!= args
[0]:
746 print "previous import used depot path %s and now %s was specified. this doesn't work!" % (self
.depotPath
, args
[0])
748 self
.depotPath
= args
[0]
753 if self
.depotPath
.find("@") != -1:
754 atIdx
= self
.depotPath
.index("@")
755 self
.changeRange
= self
.depotPath
[atIdx
:]
756 if self
.changeRange
== "@all":
757 self
.changeRange
= ""
758 elif self
.changeRange
.find(",") == -1:
759 self
.revision
= self
.changeRange
760 self
.changeRange
= ""
761 self
.depotPath
= self
.depotPath
[0:atIdx
]
762 elif self
.depotPath
.find("#") != -1:
763 hashIdx
= self
.depotPath
.index("#")
764 self
.revision
= self
.depotPath
[hashIdx
:]
765 self
.depotPath
= self
.depotPath
[0:hashIdx
]
766 elif len(self
.previousDepotPath
) == 0:
767 self
.revision
= "#head"
769 if self
.depotPath
.endswith("..."):
770 self
.depotPath
= self
.depotPath
[:-3]
772 if not self
.depotPath
.endswith("/"):
773 self
.depotPath
+= "/"
777 if self
.detectLabels
:
780 if self
.detectBranches
:
781 self
.getBranchMapping();
783 print "p4-git branches: %s" % self
.p4BranchesInGit
784 print "initial parents: %s" % self
.initialParents
785 for b
in self
.p4BranchesInGit
:
787 b
= b
[len(self
.projectName
):]
788 self
.createdBranches
.add(b
)
790 self
.tz
= "%+03d%02d" % (- time
.timezone
/ 3600, ((- time
.timezone
% 3600) / 60))
792 importProcess
= subprocess
.Popen(["git", "fast-import"], stdin
=subprocess
.PIPE
, stdout
=subprocess
.PIPE
, stderr
=subprocess
.PIPE
);
793 self
.gitOutput
= importProcess
.stdout
794 self
.gitStream
= importProcess
.stdin
795 self
.gitError
= importProcess
.stderr
797 if len(self
.revision
) > 0:
798 print "Doing initial import of %s from revision %s" % (self
.depotPath
, self
.revision
)
800 details
= { "user" : "git perforce import user", "time" : int(time
.time()) }
801 details
["desc"] = "Initial import of %s from the state at revision %s" % (self
.depotPath
, self
.revision
)
802 details
["change"] = self
.revision
806 for info
in p4CmdList("files %s...%s" % (self
.depotPath
, self
.revision
)):
807 change
= int(info
["change"])
808 if change
> newestRevision
:
809 newestRevision
= change
811 if info
["action"] == "delete":
812 # don't increase the file cnt, otherwise details["depotFile123"] will have gaps!
813 #fileCnt = fileCnt + 1
816 for prop
in [ "depotFile", "rev", "action", "type" ]:
817 details
["%s%s" % (prop
, fileCnt
)] = info
[prop
]
819 fileCnt
= fileCnt
+ 1
821 details
["change"] = newestRevision
824 self
.commit(details
, self
.extractFilesFromCommit(details
), self
.branch
, self
.depotPath
)
826 print "IO error with git fast-import. Is your git version recent enough?"
827 print self
.gitError
.read()
832 if len(self
.changesFile
) > 0:
833 output
= open(self
.changesFile
).readlines()
836 changeSet
.add(int(line
))
838 for change
in changeSet
:
839 changes
.append(change
)
844 print "Getting p4 changes for %s...%s" % (self
.depotPath
, self
.changeRange
)
845 output
= mypopen("p4 changes %s...%s" % (self
.depotPath
, self
.changeRange
)).readlines()
848 changeNum
= line
.split(" ")[1]
849 changes
.append(changeNum
)
853 if len(changes
) == 0:
855 print "no changes to import!"
859 for change
in changes
:
860 description
= p4Cmd("describe %s" % change
)
863 sys
.stdout
.write("\rimporting revision %s (%s%%)" % (change
, cnt
* 100 / len(changes
)))
868 if self
.detectBranches
:
869 branches
= self
.splitFilesIntoBranches(description
)
870 for branch
in branches
.keys():
871 branchPrefix
= self
.depotPath
+ branch
+ "/"
875 filesForCommit
= branches
[branch
]
878 print "branch is %s" % branch
880 if branch
not in self
.createdBranches
:
881 self
.createdBranches
.add(branch
)
882 parent
= self
.knownBranches
[branch
]
886 print "parent determined through known branches: %s" % parent
888 # main branch? use master
892 branch
= self
.projectName
+ branch
896 elif len(parent
) > 0:
897 parent
= self
.projectName
+ parent
899 branch
= "refs/remotes/p4/" + branch
901 parent
= "refs/remotes/p4/" + parent
904 print "looking for initial parent for %s; current parent is %s" % (branch
, parent
)
906 if len(parent
) == 0 and branch
in self
.initialParents
:
907 parent
= self
.initialParents
[branch
]
908 del self
.initialParents
[branch
]
910 self
.commit(description
, filesForCommit
, branch
, branchPrefix
, parent
)
912 files
= self
.extractFilesFromCommit(description
)
913 self
.commit(description
, files
, self
.branch
, self
.depotPath
, self
.initialParent
)
914 self
.initialParent
= ""
916 print self
.gitError
.read()
923 self
.gitStream
.close()
924 if importProcess
.wait() != 0:
925 die("fast-import failed: %s" % self
.gitError
.read())
926 self
.gitOutput
.close()
927 self
.gitError
.close()
931 class P4Rebase(Command
):
933 Command
.__init
__(self
)
934 self
.options
= [ optparse
.make_option("--with-origin", dest
="syncWithOrigin", action
="store_true") ]
935 self
.description
= "Fetches the latest revision from perforce and rebases the current work (branch) against it"
936 self
.syncWithOrigin
= False
940 sync
.syncWithOrigin
= self
.syncWithOrigin
942 print "Rebasing the current branch"
943 oldHead
= mypopen("git rev-parse HEAD").read()[:-1]
944 system("git rebase p4")
945 system("git diff-tree --stat --summary -M %s HEAD" % oldHead
)
948 class P4Clone(P4Sync
):
950 P4Sync
.__init
__(self
)
951 self
.description
= "Creates a new git repository and imports from Perforce into it"
952 self
.usage
= "usage: %prog [options] //depot/path[@revRange] [directory]"
953 self
.needsGit
= False
965 if not depotPath
.startswith("//"):
970 atPos
= dir.rfind("@")
973 hashPos
= dir.rfind("#")
977 if dir.endswith("..."):
980 if dir.endswith("/"):
983 slashPos
= dir.rfind("/")
985 dir = dir[slashPos
+ 1:]
987 print "Importing from %s into %s" % (depotPath
, dir)
991 if not P4Sync
.run(self
, [depotPath
]):
993 if self
.branch
!= "master":
994 if gitBranchExists("refs/remotes/p4/master"):
995 system("git branch master refs/remotes/p4/master")
996 system("git checkout -f")
998 print "Could not detect main branch. No checkout/master branch created."
1001 class HelpFormatter(optparse
.IndentedHelpFormatter
):
1003 optparse
.IndentedHelpFormatter
.__init
__(self
)
1005 def format_description(self
, description
):
1007 return description
+ "\n"
1011 def printUsage(commands
):
1012 print "usage: %s <command> [options]" % sys
.argv
[0]
1014 print "valid commands: %s" % ", ".join(commands
)
1016 print "Try %s <command> --help for command specific help." % sys
.argv
[0]
1020 "debug" : P4Debug(),
1021 "submit" : P4Submit(),
1023 "rebase" : P4Rebase(),
1027 if len(sys
.argv
[1:]) == 0:
1028 printUsage(commands
.keys())
1032 cmdName
= sys
.argv
[1]
1034 cmd
= commands
[cmdName
]
1036 print "unknown command %s" % cmdName
1038 printUsage(commands
.keys())
1041 options
= cmd
.options
1046 if len(options
) > 0:
1047 options
.append(optparse
.make_option("--git-dir", dest
="gitdir"))
1049 parser
= optparse
.OptionParser(cmd
.usage
.replace("%prog", "%prog " + cmdName
),
1051 description
= cmd
.description
,
1052 formatter
= HelpFormatter())
1054 (cmd
, args
) = parser
.parse_args(sys
.argv
[2:], cmd
);
1058 if len(gitdir
) == 0:
1060 if not isValidGitDir(gitdir
):
1061 gitdir
= mypopen("git rev-parse --git-dir").read()[:-1]
1062 if os
.path
.exists(gitdir
):
1063 cdup
= mypopen("git rev-parse --show-cdup").read()[:-1];
1067 if not isValidGitDir(gitdir
):
1068 if isValidGitDir(gitdir
+ "/.git"):
1071 die("fatal: cannot locate git repository at %s" % gitdir
)
1073 os
.environ
["GIT_DIR"] = gitdir
1075 if not cmd
.run(args
):