Give branches a nice project prefix and don't bail out on clone if we failed
[fast-export/barak.git] / git-p4
blob7d4273963725464776256b1ecda8fab97a25a5bc
1 #!/usr/bin/env python
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>
7 # 2007 Trolltech ASA
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
13 from sets import Set;
15 gitdir = os.environ.get("GIT_DIR", "")
17 def mypopen(command):
18 return os.popen(command, "rb");
20 def p4CmdList(cmd):
21 cmd = "p4 -G %s" % cmd
22 pipe = os.popen(cmd, "rb")
24 result = []
25 try:
26 while True:
27 entry = marshal.load(pipe)
28 result.append(entry)
29 except EOFError:
30 pass
31 pipe.close()
33 return result
35 def p4Cmd(cmd):
36 list = p4CmdList(cmd)
37 result = {}
38 for entry in list:
39 result.update(entry)
40 return result;
42 def p4Where(depotPath):
43 if not depotPath.endswith("/"):
44 depotPath += "/"
45 output = p4Cmd("where %s..." % depotPath)
46 clientPath = ""
47 if "path" in output:
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]
56 return clientPath
58 def die(msg):
59 sys.stderr.write(msg + "\n")
60 sys.exit(1)
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"):
67 return True;
68 return False
70 def parseRevision(ref):
71 return mypopen("git rev-parse %s" % ref).read()[:-1]
73 def system(cmd):
74 if os.system(cmd) != 0:
75 die("command failed: %s" % cmd)
77 def extractLogMessageFromGitCommit(commit):
78 logMessage = ""
79 foundTitle = False
80 for log in mypopen("git cat-file commit %s" % commit).readlines():
81 if not foundTitle:
82 if len(log) == 1:
83 foundTitle = True
84 continue
86 logMessage += log
87 return logMessage
89 def extractDepotPathAndChangeFromGitLog(log):
90 values = {}
91 for line in log.split("\n"):
92 line = line.strip()
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()
97 value = ""
98 equalPos = assignment.find("=")
99 if equalPos != -1:
100 variable = assignment[:equalPos].strip()
101 value = assignment[equalPos + 1:].strip()
102 if value.startswith("\"") and value.endswith("\""):
103 value = value[1:-1]
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;
112 class Command:
113 def __init__(self):
114 self.usage = "usage: %prog [options]"
115 self.needsGit = True
117 class P4Debug(Command):
118 def __init__(self):
119 Command.__init__(self)
120 self.options = [
122 self.description = "A tool to debug the output of p4 -G."
123 self.needsGit = False
125 def run(self, args):
126 for output in p4CmdList(" ".join(args)):
127 print output
128 return True
130 class P4Submit(Command):
131 def __init__(self):
132 Command.__init__(self)
133 self.options = [
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
144 self.reset = False
145 self.interactive = True
146 self.dryRun = False
147 self.substFile = ""
148 self.firstTime = True
149 self.origin = ""
151 self.logSubstitutions = {}
152 self.logSubstitutions["<enter description here>"] = "%log%"
153 self.logSubstitutions["\tDetails:"] = "\tDetails: %log%"
155 def check(self):
156 if len(p4CmdList("opened ...")) > 0:
157 die("You have files opened with perforce! Close them before starting the sync.")
159 def start(self):
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)
163 commits = []
164 for line in mypopen("git rev-list --no-merges %s..%s" % (self.origin, self.master)).readlines():
165 commits.append(line[:-1])
166 commits.reverse()
168 self.config["commits"] = commits
170 def prepareLogMessage(self, template, message):
171 result = ""
173 for line in template.split("\n"):
174 if line.startswith("#"):
175 result += line + "\n"
176 continue
178 substituted = False
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"
185 substituted = True
186 break
188 if not substituted:
189 result += line + "\n"
191 return result
193 def apply(self, id):
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()
196 filesToAdd = set()
197 filesToDelete = set()
198 editedFiles = set()
199 for line in diff:
200 modifier = line[0]
201 path = line[1:].strip()
202 if modifier == "M":
203 system("p4 edit \"%s\"" % path)
204 editedFiles.add(path)
205 elif modifier == "A":
206 filesToAdd.add(path)
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)
213 else:
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?"
222 response = "x"
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) ")
225 if response == "s":
226 print "Skipping! Good luck with the next patches..."
227 return
228 elif response == "a":
229 os.system(patchcmd)
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")
242 system(patchcmd)
244 for f in filesToAdd:
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()
256 if self.interactive:
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():
266 diff += "+" + line
267 f.close()
269 separatorLine = "######## everything below this line is just the diff #######"
270 if platform.system() == "Windows":
271 separatorLine += "\r"
272 separatorLine += "\n"
274 response = "e"
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
280 if response == "e":
281 [handle, fileName] = tempfile.mkstemp()
282 tmpFile = os.fdopen(handle, "w+")
283 tmpFile.write(submitTemplate + separatorLine + diff)
284 tmpFile.close()
285 defaultEditor = "vi"
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()
292 tmpFile.close()
293 os.remove(fileName)
294 submitTemplate = message[:message.index(separatorLine)]
296 if response == "y" or response == "yes":
297 if self.dryRun:
298 print submitTemplate
299 raw_input("Press return to continue...")
300 else:
301 pipe = os.popen("p4 submit -i", "wb")
302 pipe.write(submitTemplate)
303 pipe.close()
304 elif response == "s":
305 for f in editedFiles:
306 system("p4 revert \"%s\"" % f);
307 for f in filesToAdd:
308 system("p4 revert \"%s\"" % f);
309 system("rm %s" %f)
310 for f in filesToDelete:
311 system("p4 delete \"%s\"" % f);
312 return
313 else:
314 print "Not submitting!"
315 self.interactive = False
316 else:
317 fileName = "submit.txt"
318 file = open(fileName, "w+")
319 file.write(self.prepareLogMessage(template, logMessage))
320 file.close()
321 print "Perforce submit template written as %s. Please review/edit and then use p4 submit -i < %s to submit directly!" % (fileName, fileName)
323 def run(self, args):
324 global gitdir
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
329 if len(args) == 0:
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!")
333 elif len(args) == 1:
334 self.master = args[0]
335 else:
336 return False
338 depotPath = ""
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"
346 sys.exit(128)
348 self.clientPath = p4Where(depotPath)
350 if len(self.clientPath) == 0:
351 print "Error: Cannot locate perforce checkout of %s in client view" % depotPath
352 sys.exit(128)
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"):
363 self.origin = "p4"
364 else:
365 self.origin = "origin"
367 if self.reset:
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]
375 self.check()
376 self.configFile = gitdir + "/p4-git-sync.cfg"
377 self.config = shelve.open(self.configFile, writeback=True)
379 if self.firstTime:
380 self.start()
382 commits = self.config.get("commits", [])
384 while len(commits) > 0:
385 self.firstTime = False
386 commit = commits[0]
387 commits = commits[1:]
388 self.config["commits"] = commits
389 self.apply(commit)
390 if not self.interactive:
391 break
393 self.config.close()
395 if len(commits) == 0:
396 if self.firstTime:
397 print "No changes found to apply between %s and current HEAD" % self.origin
398 else:
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)
403 rebase = P4Rebase()
404 rebase.run([])
405 os.remove(self.configFile)
407 return True
409 class P4Sync(Command):
410 def __init__(self):
411 Command.__init__(self)
412 self.options = [
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
422 example:
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]"
431 self.silent = False
432 self.createdBranches = Set()
433 self.committedChanges = Set()
434 self.branch = ""
435 self.detectBranches = False
436 self.detectLabels = False
437 self.changesFile = ""
438 self.syncWithOrigin = False
439 self.verbose = False
441 def p4File(self, depotPath):
442 return os.popen("p4 print -q \"%s\"" % depotPath, "rb").read()
444 def extractFilesFromCommit(self, commit):
445 files = []
446 fnum = 0
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)
452 fnum = fnum + 1
453 continue
455 file = {}
456 file["path"] = path
457 file["rev"] = commit["rev%s" % fnum]
458 file["action"] = commit["action%s" % fnum]
459 file["type"] = commit["type%s" % fnum]
460 files.append(file)
461 fnum = fnum + 1
462 return files
464 def branchesForCommit(self, files):
465 branches = Set()
467 for file in files:
468 path = file["path"][len(self.depotPath):]
470 for branch in self.knownBranches.keys():
471 if path.startswith(branch):
472 branches.add(branch)
474 return branches
476 def commit(self, details, files, branch, branchPrefix, parent = ""):
477 epoch = details["time"]
478 author = details["user"]
480 if self.verbose:
481 print "commit into %s" % branch
483 self.gitStream.write("commit %s\n" % branch)
484 # gitStream.write("mark :%s\n" % details["change"])
485 self.committedChanges.add(int(details["change"]))
486 committer = ""
487 if author in self.users:
488 committer = "%s %s %s" % (self.users[author], epoch, self.tz)
489 else:
490 committer = "%s <a@b> %s %s" % (author, epoch, self.tz)
492 self.gitStream.write("committer %s\n" % committer)
494 self.gitStream.write("data <<EOT\n")
495 self.gitStream.write(details["desc"])
496 self.gitStream.write("\n[git-p4: depot-path = \"%s\": change = %s]\n" % (branchPrefix, details["change"]))
497 self.gitStream.write("EOT\n\n")
499 if len(parent) > 0:
500 if self.verbose:
501 print "parent %s" % parent
502 self.gitStream.write("from %s\n" % parent)
504 for file in files:
505 path = file["path"]
506 if not path.startswith(branchPrefix):
507 # if not silent:
508 # print "\nchanged files: ignoring path %s outside of branch prefix %s in change %s" % (path, branchPrefix, details["change"])
509 continue
510 rev = file["rev"]
511 depotPath = path + "#" + rev
512 relPath = path[len(branchPrefix):]
513 action = file["action"]
515 if file["type"] == "apple":
516 print "\nfile %s is a strange apple file that forks. Ignoring!" % path
517 continue
519 if action == "delete":
520 self.gitStream.write("D %s\n" % relPath)
521 else:
522 mode = 644
523 if file["type"].startswith("x"):
524 mode = 755
526 data = self.p4File(depotPath)
528 self.gitStream.write("M %s inline %s\n" % (mode, relPath))
529 self.gitStream.write("data %s\n" % len(data))
530 self.gitStream.write(data)
531 self.gitStream.write("\n")
533 self.gitStream.write("\n")
535 change = int(details["change"])
537 self.lastChange = change
539 if change in self.labels:
540 label = self.labels[change]
541 labelDetails = label[0]
542 labelRevisions = label[1]
544 files = p4CmdList("files %s...@%s" % (branchPrefix, change))
546 if len(files) == len(labelRevisions):
548 cleanedFiles = {}
549 for info in files:
550 if info["action"] == "delete":
551 continue
552 cleanedFiles[info["depotFile"]] = info["rev"]
554 if cleanedFiles == labelRevisions:
555 self.gitStream.write("tag tag_%s\n" % labelDetails["label"])
556 self.gitStream.write("from %s\n" % branch)
558 owner = labelDetails["Owner"]
559 tagger = ""
560 if author in self.users:
561 tagger = "%s %s %s" % (self.users[owner], epoch, self.tz)
562 else:
563 tagger = "%s <a@b> %s %s" % (owner, epoch, self.tz)
564 self.gitStream.write("tagger %s\n" % tagger)
565 self.gitStream.write("data <<EOT\n")
566 self.gitStream.write(labelDetails["Description"])
567 self.gitStream.write("EOT\n\n")
569 else:
570 if not self.silent:
571 print "Tag %s does not match with change %s: files do not match." % (labelDetails["label"], change)
573 else:
574 if not self.silent:
575 print "Tag %s does not match with change %s: file count is different." % (labelDetails["label"], change)
577 def extractFilesInCommitToBranch(self, files, branchPrefix):
578 newFiles = []
580 for file in files:
581 path = file["path"]
582 if path.startswith(branchPrefix):
583 newFiles.append(file)
585 return newFiles
587 def getUserMap(self):
588 self.users = {}
590 for output in p4CmdList("users"):
591 if not output.has_key("User"):
592 continue
593 self.users[output["User"]] = output["FullName"] + " <" + output["Email"] + ">"
595 def getLabels(self):
596 self.labels = {}
598 l = p4CmdList("labels %s..." % self.depotPath)
599 if len(l) > 0 and not self.silent:
600 print "Finding files belonging to labels in %s" % self.depotPath
602 for output in l:
603 label = output["label"]
604 revisions = {}
605 newestChange = 0
606 for file in p4CmdList("files //...@%s" % label):
607 revisions[file["depotFile"]] = file["rev"]
608 change = int(file["change"])
609 if change > newestChange:
610 newestChange = change
612 self.labels[newestChange] = [output, revisions]
614 def getBranchMapping(self):
615 # map from branch depot path to parent branch
616 self.knownBranches = {}
618 for info in p4CmdList("branches"):
619 details = p4Cmd("branch -o %s" % info["branch"])
620 viewIdx = 0
621 while details.has_key("View%s" % viewIdx):
622 paths = details["View%s" % viewIdx].split(" ")
623 viewIdx = viewIdx + 1
624 # require standard //depot/foo/... //depot/bar/... mapping
625 if len(paths) != 2 or not paths[0].endswith("/...") or not paths[1].endswith("/..."):
626 continue
627 source = paths[0]
628 destination = paths[1]
629 if source.startswith(self.depotPath) and destination.startswith(self.depotPath):
630 source = source[len(self.depotPath):-4]
631 destination = destination[len(self.depotPath):-4]
632 self.knownBranches[destination] = source
633 self.knownBranches[source] = source
635 def run(self, args):
636 self.depotPath = ""
637 self.changeRange = ""
638 self.initialParent = ""
639 self.previousDepotPath = ""
641 if self.syncWithOrigin and gitBranchExists("origin") and gitBranchExists("refs/remotes/p4/master"):
642 print "Syncing with origin first as requested by calling git fetch origin"
643 system("git fetch origin")
644 [originPreviousDepotPath, originP4Change] = extractDepotPathAndChangeFromGitLog(extractLogMessageFromGitCommit("origin"))
645 [p4PreviousDepotPath, p4Change] = extractDepotPathAndChangeFromGitLog(extractLogMessageFromGitCommit("p4"))
646 if len(originPreviousDepotPath) > 0 and len(originP4Change) > 0 and len(p4Change) > 0:
647 if originPreviousDepotPath == p4PreviousDepotPath:
648 originP4Change = int(originP4Change)
649 p4Change = int(p4Change)
650 if originP4Change > p4Change:
651 print "origin (%s) is newer than p4 (%s). Updating p4 branch from origin." % (originP4Change, p4Change)
652 system("git update-ref refs/remotes/p4/master origin");
653 else:
654 print "Cannot sync with origin. It was imported from %s while remotes/p4 was imported from %s" % (originPreviousDepotPath, p4PreviousDepotPath)
656 if len(self.branch) == 0:
657 self.branch = "refs/remotes/p4/master"
658 if gitBranchExists("refs/heads/p4"):
659 system("git update-ref %s refs/heads/p4" % self.branch)
660 system("git branch -D p4");
661 if not gitBranchExists("refs/remotes/p4/HEAD"):
662 system("git symbolic-ref refs/remotes/p4/HEAD %s" % self.branch)
664 if len(args) == 0:
665 if not gitBranchExists(self.branch) and gitBranchExists("origin"):
666 if not self.silent:
667 print "Creating %s branch in git repository based on origin" % self.branch
668 branch = self.branch
669 if not branch.startswith("refs"):
670 branch = "refs/heads/" + branch
671 system("git update-ref %s origin" % branch)
673 [self.previousDepotPath, p4Change] = extractDepotPathAndChangeFromGitLog(extractLogMessageFromGitCommit(self.branch))
674 if len(self.previousDepotPath) > 0 and len(p4Change) > 0:
675 p4Change = int(p4Change) + 1
676 self.depotPath = self.previousDepotPath
677 self.changeRange = "@%s,#head" % p4Change
678 self.initialParent = parseRevision(self.branch)
679 if not self.silent:
680 print "Performing incremental import into %s git branch" % self.branch
682 if not self.branch.startswith("refs/"):
683 self.branch = "refs/heads/" + self.branch
685 if len(self.depotPath) != 0:
686 self.depotPath = self.depotPath[:-1]
688 if len(args) == 0 and len(self.depotPath) != 0:
689 if not self.silent:
690 print "Depot path: %s" % self.depotPath
691 elif len(args) != 1:
692 return False
693 else:
694 if len(self.depotPath) != 0 and self.depotPath != args[0]:
695 print "previous import used depot path %s and now %s was specified. this doesn't work!" % (self.depotPath, args[0])
696 sys.exit(1)
697 self.depotPath = args[0]
699 self.revision = ""
700 self.users = {}
701 self.lastChange = 0
703 if self.depotPath.find("@") != -1:
704 atIdx = self.depotPath.index("@")
705 self.changeRange = self.depotPath[atIdx:]
706 if self.changeRange == "@all":
707 self.changeRange = ""
708 elif self.changeRange.find(",") == -1:
709 self.revision = self.changeRange
710 self.changeRange = ""
711 self.depotPath = self.depotPath[0:atIdx]
712 elif self.depotPath.find("#") != -1:
713 hashIdx = self.depotPath.index("#")
714 self.revision = self.depotPath[hashIdx:]
715 self.depotPath = self.depotPath[0:hashIdx]
716 elif len(self.previousDepotPath) == 0:
717 self.revision = "#head"
719 if self.depotPath.endswith("..."):
720 self.depotPath = self.depotPath[:-3]
722 if not self.depotPath.endswith("/"):
723 self.depotPath += "/"
725 self.getUserMap()
726 self.labels = {}
727 if self.detectLabels:
728 self.getLabels();
730 if self.detectBranches:
731 self.getBranchMapping();
732 self.branchPrefix = self.depotPath[self.depotPath[:-1].rfind("/") + 1:]
734 self.tz = "%+03d%02d" % (- time.timezone / 3600, ((- time.timezone % 3600) / 60))
736 importProcess = subprocess.Popen(["git", "fast-import"], stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE);
737 self.gitOutput = importProcess.stdout
738 self.gitStream = importProcess.stdin
739 self.gitError = importProcess.stderr
741 if len(self.revision) > 0:
742 print "Doing initial import of %s from revision %s" % (self.depotPath, self.revision)
744 details = { "user" : "git perforce import user", "time" : int(time.time()) }
745 details["desc"] = "Initial import of %s from the state at revision %s" % (self.depotPath, self.revision)
746 details["change"] = self.revision
747 newestRevision = 0
749 fileCnt = 0
750 for info in p4CmdList("files %s...%s" % (self.depotPath, self.revision)):
751 change = int(info["change"])
752 if change > newestRevision:
753 newestRevision = change
755 if info["action"] == "delete":
756 # don't increase the file cnt, otherwise details["depotFile123"] will have gaps!
757 #fileCnt = fileCnt + 1
758 continue
760 for prop in [ "depotFile", "rev", "action", "type" ]:
761 details["%s%s" % (prop, fileCnt)] = info[prop]
763 fileCnt = fileCnt + 1
765 details["change"] = newestRevision
767 try:
768 self.commit(details, self.extractFilesFromCommit(details), self.branch, self.depotPath)
769 except IOError:
770 print "IO error with git fast-import. Is your git version recent enough?"
771 print self.gitError.read()
773 else:
774 changes = []
776 if len(self.changesFile) > 0:
777 output = open(self.changesFile).readlines()
778 changeSet = Set()
779 for line in output:
780 changeSet.add(int(line))
782 for change in changeSet:
783 changes.append(change)
785 changes.sort()
786 else:
787 output = mypopen("p4 changes %s...%s" % (self.depotPath, self.changeRange)).readlines()
789 for line in output:
790 changeNum = line.split(" ")[1]
791 changes.append(changeNum)
793 changes.reverse()
795 if len(changes) == 0:
796 if not self.silent:
797 print "no changes to import!"
798 return True
800 cnt = 1
801 for change in changes:
802 description = p4Cmd("describe %s" % change)
804 if not self.silent:
805 sys.stdout.write("\rimporting revision %s (%s%%)" % (change, cnt * 100 / len(changes)))
806 sys.stdout.flush()
807 cnt = cnt + 1
809 try:
810 files = self.extractFilesFromCommit(description)
811 if self.detectBranches:
812 for branch in self.branchesForCommit(files):
813 branchPrefix = self.depotPath + branch + "/"
815 parent = ""
817 filesForCommit = self.extractFilesInCommitToBranch(files, branch)
819 if branch not in self.createdBranches:
820 self.createdBranches.add(branch)
821 parent = self.knownBranches[branch]
822 if parent == branch:
823 parent = ""
825 # main branch? use master
826 if branch == "main":
827 branch = "master"
828 else:
829 branch = self.branchPrefix + branch
831 if parent == "main":
832 parent = "master"
833 elif len(parent) > 0:
834 parent = self.branchPrefix + parent
836 branch = "refs/remotes/p4/" + branch
837 if len(parent) > 0:
838 parent = "refs/remotes/p4/" + parent
839 self.commit(description, files, branch, branchPrefix, parent)
840 else:
841 self.commit(description, files, self.branch, self.depotPath, self.initialParent)
842 self.initialParent = ""
843 except IOError:
844 print self.gitError.read()
845 sys.exit(1)
847 if not self.silent:
848 print ""
851 self.gitStream.close()
852 self.gitOutput.close()
853 self.gitError.close()
854 importProcess.wait()
856 return True
858 class P4Rebase(Command):
859 def __init__(self):
860 Command.__init__(self)
861 self.options = [ optparse.make_option("--with-origin", dest="syncWithOrigin", action="store_true") ]
862 self.description = "Fetches the latest revision from perforce and rebases the current work (branch) against it"
863 self.syncWithOrigin = False
865 def run(self, args):
866 sync = P4Sync()
867 sync.syncWithOrigin = self.syncWithOrigin
868 sync.run([])
869 print "Rebasing the current branch"
870 oldHead = mypopen("git rev-parse HEAD").read()[:-1]
871 system("git rebase p4")
872 system("git diff-tree --stat --summary -M %s HEAD" % oldHead)
873 return True
875 class P4Clone(P4Sync):
876 def __init__(self):
877 P4Sync.__init__(self)
878 self.description = "Creates a new git repository and imports from Perforce into it"
879 self.usage = "usage: %prog [options] //depot/path[@revRange] [directory]"
880 self.needsGit = False
882 def run(self, args):
883 if len(args) < 1:
884 return False
885 depotPath = args[0]
886 dir = ""
887 if len(args) == 2:
888 dir = args[1]
889 elif len(args) > 2:
890 return False
892 if not depotPath.startswith("//"):
893 return False
895 if len(dir) == 0:
896 dir = depotPath
897 atPos = dir.rfind("@")
898 if atPos != -1:
899 dir = dir[0:atPos]
900 hashPos = dir.rfind("#")
901 if hashPos != -1:
902 dir = dir[0:hashPos]
904 if dir.endswith("..."):
905 dir = dir[:-3]
907 if dir.endswith("/"):
908 dir = dir[:-1]
910 slashPos = dir.rfind("/")
911 if slashPos != -1:
912 dir = dir[slashPos + 1:]
914 print "Importing from %s into %s" % (depotPath, dir)
915 os.makedirs(dir)
916 os.chdir(dir)
917 system("git init")
918 if not P4Sync.run(self, [depotPath]):
919 return False
920 if self.branch != "master":
921 if gitBranchExists("refs/remotes/p4/master"):
922 system("git branch master refs/remotes/p4/master")
923 system("git checkout -f")
924 else:
925 print "Could not detect main branch. No checkout/master branch created."
926 return True
928 class HelpFormatter(optparse.IndentedHelpFormatter):
929 def __init__(self):
930 optparse.IndentedHelpFormatter.__init__(self)
932 def format_description(self, description):
933 if description:
934 return description + "\n"
935 else:
936 return ""
938 def printUsage(commands):
939 print "usage: %s <command> [options]" % sys.argv[0]
940 print ""
941 print "valid commands: %s" % ", ".join(commands)
942 print ""
943 print "Try %s <command> --help for command specific help." % sys.argv[0]
944 print ""
946 commands = {
947 "debug" : P4Debug(),
948 "submit" : P4Submit(),
949 "sync" : P4Sync(),
950 "rebase" : P4Rebase(),
951 "clone" : P4Clone()
954 if len(sys.argv[1:]) == 0:
955 printUsage(commands.keys())
956 sys.exit(2)
958 cmd = ""
959 cmdName = sys.argv[1]
960 try:
961 cmd = commands[cmdName]
962 except KeyError:
963 print "unknown command %s" % cmdName
964 print ""
965 printUsage(commands.keys())
966 sys.exit(2)
968 options = cmd.options
969 cmd.gitdir = gitdir
971 args = sys.argv[2:]
973 if len(options) > 0:
974 options.append(optparse.make_option("--git-dir", dest="gitdir"))
976 parser = optparse.OptionParser(cmd.usage.replace("%prog", "%prog " + cmdName),
977 options,
978 description = cmd.description,
979 formatter = HelpFormatter())
981 (cmd, args) = parser.parse_args(sys.argv[2:], cmd);
983 if cmd.needsGit:
984 gitdir = cmd.gitdir
985 if len(gitdir) == 0:
986 gitdir = ".git"
987 if not isValidGitDir(gitdir):
988 gitdir = mypopen("git rev-parse --git-dir").read()[:-1]
989 if os.path.exists(gitdir):
990 cdup = mypopen("git rev-parse --show-cdup").read()[:-1];
991 if len(cdup) > 0:
992 os.chdir(cdup);
994 if not isValidGitDir(gitdir):
995 if isValidGitDir(gitdir + "/.git"):
996 gitdir += "/.git"
997 else:
998 die("fatal: cannot locate git repository at %s" % gitdir)
1000 os.environ["GIT_DIR"] = gitdir
1002 if not cmd.run(args):
1003 parser.print_help()