1#!/usr/bin/env python
2#
3# git-p4.py -- A tool for bidirectional operation between a Perforce depot and git.
4#
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>
9#
10
11import optparse, sys, os, marshal, popen2, subprocess, shelve
12import tempfile, getopt, sha, os.path, time, platform
13from sets import Set;
14
15gitdir = os.environ.get("GIT_DIR", "")
16
17def mypopen(command):
18 return os.popen(command, "rb");
19
20def p4CmdList(cmd):
21 cmd = "p4 -G %s" % cmd
22 pipe = os.popen(cmd, "rb")
23
24 result = []
25 try:
26 while True:
27 entry = marshal.load(pipe)
28 result.append(entry)
29 except EOFError:
30 pass
31 exitCode = pipe.close()
32 if exitCode != None:
33 entry = {}
34 entry["p4ExitCode"] = exitCode
35 result.append(entry)
36
37 return result
38
39def p4Cmd(cmd):
40 list = p4CmdList(cmd)
41 result = {}
42 for entry in list:
43 result.update(entry)
44 return result;
45
46def p4Where(depotPath):
47 if not depotPath.endswith("/"):
48 depotPath += "/"
49 output = p4Cmd("where %s..." % depotPath)
50 if output["code"] == "error":
51 return ""
52 clientPath = ""
53 if "path" in output:
54 clientPath = output.get("path")
55 elif "data" in output:
56 data = output.get("data")
57 lastSpace = data.rfind(" ")
58 clientPath = data[lastSpace + 1:]
59
60 if clientPath.endswith("..."):
61 clientPath = clientPath[:-3]
62 return clientPath
63
64def die(msg):
65 sys.stderr.write(msg + "\n")
66 sys.exit(1)
67
68def currentGitBranch():
69 return mypopen("git name-rev HEAD").read().split(" ")[1][:-1]
70
71def isValidGitDir(path):
72 if os.path.exists(path + "/HEAD") and os.path.exists(path + "/refs") and os.path.exists(path + "/objects"):
73 return True;
74 return False
75
76def parseRevision(ref):
77 return mypopen("git rev-parse %s" % ref).read()[:-1]
78
79def system(cmd):
80 if os.system(cmd) != 0:
81 die("command failed: %s" % cmd)
82
83def extractLogMessageFromGitCommit(commit):
84 logMessage = ""
85 foundTitle = False
86 for log in mypopen("git cat-file commit %s" % commit).readlines():
87 if not foundTitle:
88 if len(log) == 1:
89 foundTitle = True
90 continue
91
92 logMessage += log
93 return logMessage
94
95def extractDepotPathAndChangeFromGitLog(log):
96 values = {}
97 for line in log.split("\n"):
98 line = line.strip()
99 if line.startswith("[git-p4:") and line.endswith("]"):
100 line = line[8:-1].strip()
101 for assignment in line.split(":"):
102 variable = assignment.strip()
103 value = ""
104 equalPos = assignment.find("=")
105 if equalPos != -1:
106 variable = assignment[:equalPos].strip()
107 value = assignment[equalPos + 1:].strip()
108 if value.startswith("\"") and value.endswith("\""):
109 value = value[1:-1]
110 values[variable] = value
111
112 return values.get("depot-path"), values.get("change")
113
114def gitBranchExists(branch):
115 proc = subprocess.Popen(["git", "rev-parse", branch], stderr=subprocess.PIPE, stdout=subprocess.PIPE);
116 return proc.wait() == 0;
117
118def gitConfig(key):
119 return mypopen("git config %s" % key).read()[:-1]
120
121class Command:
122 def __init__(self):
123 self.usage = "usage: %prog [options]"
124 self.needsGit = True
125
126class P4Debug(Command):
127 def __init__(self):
128 Command.__init__(self)
129 self.options = [
130 ]
131 self.description = "A tool to debug the output of p4 -G."
132 self.needsGit = False
133
134 def run(self, args):
135 for output in p4CmdList(" ".join(args)):
136 print output
137 return True
138
139class P4RollBack(Command):
140 def __init__(self):
141 Command.__init__(self)
142 self.options = [
143 optparse.make_option("--verbose", dest="verbose", action="store_true"),
144 optparse.make_option("--local", dest="rollbackLocalBranches", action="store_true")
145 ]
146 self.description = "A tool to debug the multi-branch import. Don't use :)"
147 self.verbose = False
148 self.rollbackLocalBranches = False
149
150 def run(self, args):
151 if len(args) != 1:
152 return False
153 maxChange = int(args[0])
154
155 if "p4ExitCode" in p4Cmd("changes -m 1"):
156 die("Problems executing p4");
157
158 if self.rollbackLocalBranches:
159 refPrefix = "refs/heads/"
160 lines = mypopen("git rev-parse --symbolic --branches").readlines()
161 else:
162 refPrefix = "refs/remotes/"
163 lines = mypopen("git rev-parse --symbolic --remotes").readlines()
164
165 for line in lines:
166 if self.rollbackLocalBranches or (line.startswith("p4/") and line != "p4/HEAD\n"):
167 ref = refPrefix + line[:-1]
168 log = extractLogMessageFromGitCommit(ref)
169 depotPath, change = extractDepotPathAndChangeFromGitLog(log)
170 changed = False
171
172 if len(p4Cmd("changes -m 1 %s...@%s" % (depotPath, maxChange))) == 0:
173 print "Branch %s did not exist at change %s, deleting." % (ref, maxChange)
174 system("git update-ref -d %s `git rev-parse %s`" % (ref, ref))
175 continue
176
177 while len(change) > 0 and int(change) > maxChange:
178 changed = True
179 if self.verbose:
180 print "%s is at %s ; rewinding towards %s" % (ref, change, maxChange)
181 system("git update-ref %s \"%s^\"" % (ref, ref))
182 log = extractLogMessageFromGitCommit(ref)
183 depotPath, change = extractDepotPathAndChangeFromGitLog(log)
184
185 if changed:
186 print "%s rewound to %s" % (ref, change)
187
188 return True
189
190class P4Submit(Command):
191 def __init__(self):
192 Command.__init__(self)
193 self.options = [
194 optparse.make_option("--continue", action="store_false", dest="firstTime"),
195 optparse.make_option("--origin", dest="origin"),
196 optparse.make_option("--reset", action="store_true", dest="reset"),
197 optparse.make_option("--log-substitutions", dest="substFile"),
198 optparse.make_option("--dry-run", action="store_true"),
199 optparse.make_option("--direct", dest="directSubmit", action="store_true"),
200 optparse.make_option("--trust-me-like-a-fool", dest="trustMeLikeAFool", action="store_true"),
201 ]
202 self.description = "Submit changes from git to the perforce depot."
203 self.usage += " [name of git branch to submit into perforce depot]"
204 self.firstTime = True
205 self.reset = False
206 self.interactive = True
207 self.dryRun = False
208 self.substFile = ""
209 self.firstTime = True
210 self.origin = ""
211 self.directSubmit = False
212 self.trustMeLikeAFool = False
213
214 self.logSubstitutions = {}
215 self.logSubstitutions["<enter description here>"] = "%log%"
216 self.logSubstitutions["\tDetails:"] = "\tDetails: %log%"
217
218 def check(self):
219 if len(p4CmdList("opened ...")) > 0:
220 die("You have files opened with perforce! Close them before starting the sync.")
221
222 def start(self):
223 if len(self.config) > 0 and not self.reset:
224 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)
225
226 commits = []
227 if self.directSubmit:
228 commits.append("0")
229 else:
230 for line in mypopen("git rev-list --no-merges %s..%s" % (self.origin, self.master)).readlines():
231 commits.append(line[:-1])
232 commits.reverse()
233
234 self.config["commits"] = commits
235
236 def prepareLogMessage(self, template, message):
237 result = ""
238
239 for line in template.split("\n"):
240 if line.startswith("#"):
241 result += line + "\n"
242 continue
243
244 substituted = False
245 for key in self.logSubstitutions.keys():
246 if line.find(key) != -1:
247 value = self.logSubstitutions[key]
248 value = value.replace("%log%", message)
249 if value != "@remove@":
250 result += line.replace(key, value) + "\n"
251 substituted = True
252 break
253
254 if not substituted:
255 result += line + "\n"
256
257 return result
258
259 def apply(self, id):
260 if self.directSubmit:
261 print "Applying local change in working directory/index"
262 diff = self.diffStatus
263 else:
264 print "Applying %s" % (mypopen("git log --max-count=1 --pretty=oneline %s" % id).read())
265 diff = mypopen("git diff-tree -r --name-status \"%s^\" \"%s\"" % (id, id)).readlines()
266 filesToAdd = set()
267 filesToDelete = set()
268 editedFiles = set()
269 for line in diff:
270 modifier = line[0]
271 path = line[1:].strip()
272 if modifier == "M":
273 system("p4 edit \"%s\"" % path)
274 editedFiles.add(path)
275 elif modifier == "A":
276 filesToAdd.add(path)
277 if path in filesToDelete:
278 filesToDelete.remove(path)
279 elif modifier == "D":
280 filesToDelete.add(path)
281 if path in filesToAdd:
282 filesToAdd.remove(path)
283 else:
284 die("unknown modifier %s for %s" % (modifier, path))
285
286 if self.directSubmit:
287 diffcmd = "cat \"%s\"" % self.diffFile
288 else:
289 diffcmd = "git format-patch -k --stdout \"%s^\"..\"%s\"" % (id, id)
290 patchcmd = diffcmd + " | git apply "
291 tryPatchCmd = patchcmd + "--check -"
292 applyPatchCmd = patchcmd + "--check --apply -"
293
294 if os.system(tryPatchCmd) != 0:
295 print "Unfortunately applying the change failed!"
296 print "What do you want to do?"
297 response = "x"
298 while response != "s" and response != "a" and response != "w":
299 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) ")
300 if response == "s":
301 print "Skipping! Good luck with the next patches..."
302 return
303 elif response == "a":
304 os.system(applyPatchCmd)
305 if len(filesToAdd) > 0:
306 print "You may also want to call p4 add on the following files:"
307 print " ".join(filesToAdd)
308 if len(filesToDelete):
309 print "The following files should be scheduled for deletion with p4 delete:"
310 print " ".join(filesToDelete)
311 die("Please resolve and submit the conflict manually and continue afterwards with git-p4 submit --continue")
312 elif response == "w":
313 system(diffcmd + " > patch.txt")
314 print "Patch saved to patch.txt in %s !" % self.clientPath
315 die("Please resolve and submit the conflict manually and continue afterwards with git-p4 submit --continue")
316
317 system(applyPatchCmd)
318
319 for f in filesToAdd:
320 system("p4 add %s" % f)
321 for f in filesToDelete:
322 system("p4 revert %s" % f)
323 system("p4 delete %s" % f)
324
325 logMessage = ""
326 if not self.directSubmit:
327 logMessage = extractLogMessageFromGitCommit(id)
328 logMessage = logMessage.replace("\n", "\n\t")
329 logMessage = logMessage[:-1]
330
331 template = mypopen("p4 change -o").read()
332
333 if self.interactive:
334 submitTemplate = self.prepareLogMessage(template, logMessage)
335 diff = mypopen("p4 diff -du ...").read()
336
337 for newFile in filesToAdd:
338 diff += "==== new file ====\n"
339 diff += "--- /dev/null\n"
340 diff += "+++ %s\n" % newFile
341 f = open(newFile, "r")
342 for line in f.readlines():
343 diff += "+" + line
344 f.close()
345
346 separatorLine = "######## everything below this line is just the diff #######"
347 if platform.system() == "Windows":
348 separatorLine += "\r"
349 separatorLine += "\n"
350
351 response = "e"
352 if self.trustMeLikeAFool:
353 response = "y"
354
355 firstIteration = True
356 while response == "e":
357 if not firstIteration:
358 response = raw_input("Do you want to submit this change? [y]es/[e]dit/[n]o/[s]kip ")
359 firstIteration = False
360 if response == "e":
361 [handle, fileName] = tempfile.mkstemp()
362 tmpFile = os.fdopen(handle, "w+")
363 tmpFile.write(submitTemplate + separatorLine + diff)
364 tmpFile.close()
365 defaultEditor = "vi"
366 if platform.system() == "Windows":
367 defaultEditor = "notepad"
368 editor = os.environ.get("EDITOR", defaultEditor);
369 system(editor + " " + fileName)
370 tmpFile = open(fileName, "rb")
371 message = tmpFile.read()
372 tmpFile.close()
373 os.remove(fileName)
374 submitTemplate = message[:message.index(separatorLine)]
375
376 if response == "y" or response == "yes":
377 if self.dryRun:
378 print submitTemplate
379 raw_input("Press return to continue...")
380 else:
381 if self.directSubmit:
382 print "Submitting to git first"
383 os.chdir(self.oldWorkingDirectory)
384 pipe = os.popen("git commit -a -F -", "wb")
385 pipe.write(submitTemplate)
386 pipe.close()
387 os.chdir(self.clientPath)
388
389 pipe = os.popen("p4 submit -i", "wb")
390 pipe.write(submitTemplate)
391 pipe.close()
392 elif response == "s":
393 for f in editedFiles:
394 system("p4 revert \"%s\"" % f);
395 for f in filesToAdd:
396 system("p4 revert \"%s\"" % f);
397 system("rm %s" %f)
398 for f in filesToDelete:
399 system("p4 delete \"%s\"" % f);
400 return
401 else:
402 print "Not submitting!"
403 self.interactive = False
404 else:
405 fileName = "submit.txt"
406 file = open(fileName, "w+")
407 file.write(self.prepareLogMessage(template, logMessage))
408 file.close()
409 print "Perforce submit template written as %s. Please review/edit and then use p4 submit -i < %s to submit directly!" % (fileName, fileName)
410
411 def run(self, args):
412 global gitdir
413 # make gitdir absolute so we can cd out into the perforce checkout
414 gitdir = os.path.abspath(gitdir)
415 os.environ["GIT_DIR"] = gitdir
416
417 if len(args) == 0:
418 self.master = currentGitBranch()
419 if len(self.master) == 0 or not gitBranchExists("refs/heads/%s" % self.master):
420 die("Detecting current git branch failed!")
421 elif len(args) == 1:
422 self.master = args[0]
423 else:
424 return False
425
426 depotPath = ""
427 if gitBranchExists("p4"):
428 [depotPath, dummy] = extractDepotPathAndChangeFromGitLog(extractLogMessageFromGitCommit("p4"))
429 if len(depotPath) == 0 and gitBranchExists("origin"):
430 [depotPath, dummy] = extractDepotPathAndChangeFromGitLog(extractLogMessageFromGitCommit("origin"))
431
432 if len(depotPath) == 0:
433 print "Internal error: cannot locate perforce depot path from existing branches"
434 sys.exit(128)
435
436 self.clientPath = p4Where(depotPath)
437
438 if len(self.clientPath) == 0:
439 print "Error: Cannot locate perforce checkout of %s in client view" % depotPath
440 sys.exit(128)
441
442 print "Perforce checkout for depot path %s located at %s" % (depotPath, self.clientPath)
443 self.oldWorkingDirectory = os.getcwd()
444
445 if self.directSubmit:
446 self.diffStatus = mypopen("git diff -r --name-status HEAD").readlines()
447 if len(self.diffStatus) == 0:
448 print "No changes in working directory to submit."
449 return True
450 patch = mypopen("git diff -p --binary --diff-filter=ACMRTUXB HEAD").read()
451 self.diffFile = gitdir + "/p4-git-diff"
452 f = open(self.diffFile, "wb")
453 f.write(patch)
454 f.close();
455
456 os.chdir(self.clientPath)
457 response = raw_input("Do you want to sync %s with p4 sync? [y]es/[n]o " % self.clientPath)
458 if response == "y" or response == "yes":
459 system("p4 sync ...")
460
461 if len(self.origin) == 0:
462 if gitBranchExists("p4"):
463 self.origin = "p4"
464 else:
465 self.origin = "origin"
466
467 if self.reset:
468 self.firstTime = True
469
470 if len(self.substFile) > 0:
471 for line in open(self.substFile, "r").readlines():
472 tokens = line[:-1].split("=")
473 self.logSubstitutions[tokens[0]] = tokens[1]
474
475 self.check()
476 self.configFile = gitdir + "/p4-git-sync.cfg"
477 self.config = shelve.open(self.configFile, writeback=True)
478
479 if self.firstTime:
480 self.start()
481
482 commits = self.config.get("commits", [])
483
484 while len(commits) > 0:
485 self.firstTime = False
486 commit = commits[0]
487 commits = commits[1:]
488 self.config["commits"] = commits
489 self.apply(commit)
490 if not self.interactive:
491 break
492
493 self.config.close()
494
495 if self.directSubmit:
496 os.remove(self.diffFile)
497
498 if len(commits) == 0:
499 if self.firstTime:
500 print "No changes found to apply between %s and current HEAD" % self.origin
501 else:
502 print "All changes applied!"
503 os.chdir(self.oldWorkingDirectory)
504 response = raw_input("Do you want to sync from Perforce now using git-p4 rebase? [y]es/[n]o ")
505 if response == "y" or response == "yes":
506 rebase = P4Rebase()
507 rebase.run([])
508 os.remove(self.configFile)
509
510 return True
511
512class P4Sync(Command):
513 def __init__(self):
514 Command.__init__(self)
515 self.options = [
516 optparse.make_option("--branch", dest="branch"),
517 optparse.make_option("--detect-branches", dest="detectBranches", action="store_true"),
518 optparse.make_option("--changesfile", dest="changesFile"),
519 optparse.make_option("--silent", dest="silent", action="store_true"),
520 optparse.make_option("--detect-labels", dest="detectLabels", action="store_true"),
521 optparse.make_option("--verbose", dest="verbose", action="store_true"),
522 optparse.make_option("--import-local", dest="importIntoRemotes", action="store_false"),
523 optparse.make_option("--max-changes", dest="maxChanges")
524 ]
525 self.description = """Imports from Perforce into a git repository.\n
526 example:
527 //depot/my/project/ -- to import the current head
528 //depot/my/project/@all -- to import everything
529 //depot/my/project/@1,6 -- to import only from revision 1 to 6
530
531 (a ... is not needed in the path p4 specification, it's added implicitly)"""
532
533 self.usage += " //depot/path[@revRange]"
534
535 self.silent = False
536 self.createdBranches = Set()
537 self.committedChanges = Set()
538 self.branch = ""
539 self.detectBranches = False
540 self.detectLabels = False
541 self.changesFile = ""
542 self.syncWithOrigin = True
543 self.verbose = False
544 self.importIntoRemotes = True
545 self.maxChanges = ""
546 self.isWindows = (platform.system() == "Windows")
547
548 if gitConfig("git-p4.syncFromOrigin") == "false":
549 self.syncWithOrigin = False
550
551 def p4File(self, depotPath):
552 return os.popen("p4 print -q \"%s\"" % depotPath, "rb").read()
553
554 def extractFilesFromCommit(self, commit):
555 files = []
556 fnum = 0
557 while commit.has_key("depotFile%s" % fnum):
558 path = commit["depotFile%s" % fnum]
559 if not path.startswith(self.depotPath):
560 # if not self.silent:
561 # print "\nchanged files: ignoring path %s outside of %s in change %s" % (path, self.depotPath, change)
562 fnum = fnum + 1
563 continue
564
565 file = {}
566 file["path"] = path
567 file["rev"] = commit["rev%s" % fnum]
568 file["action"] = commit["action%s" % fnum]
569 file["type"] = commit["type%s" % fnum]
570 files.append(file)
571 fnum = fnum + 1
572 return files
573
574 def splitFilesIntoBranches(self, commit):
575 branches = {}
576
577 fnum = 0
578 while commit.has_key("depotFile%s" % fnum):
579 path = commit["depotFile%s" % fnum]
580 if not path.startswith(self.depotPath):
581 # if not self.silent:
582 # print "\nchanged files: ignoring path %s outside of %s in change %s" % (path, self.depotPath, change)
583 fnum = fnum + 1
584 continue
585
586 file = {}
587 file["path"] = path
588 file["rev"] = commit["rev%s" % fnum]
589 file["action"] = commit["action%s" % fnum]
590 file["type"] = commit["type%s" % fnum]
591 fnum = fnum + 1
592
593 relPath = path[len(self.depotPath):]
594
595 for branch in self.knownBranches.keys():
596 if relPath.startswith(branch + "/"): # add a trailing slash so that a commit into qt/4.2foo doesn't end up in qt/4.2
597 if branch not in branches:
598 branches[branch] = []
599 branches[branch].append(file)
600
601 return branches
602
603 def commit(self, details, files, branch, branchPrefix, parent = ""):
604 epoch = details["time"]
605 author = details["user"]
606
607 if self.verbose:
608 print "commit into %s" % branch
609
610 self.gitStream.write("commit %s\n" % branch)
611 # gitStream.write("mark :%s\n" % details["change"])
612 self.committedChanges.add(int(details["change"]))
613 committer = ""
614 if author not in self.users:
615 self.getUserMapFromPerforceServer()
616 if author in self.users:
617 committer = "%s %s %s" % (self.users[author], epoch, self.tz)
618 else:
619 committer = "%s <a@b> %s %s" % (author, epoch, self.tz)
620
621 self.gitStream.write("committer %s\n" % committer)
622
623 self.gitStream.write("data <<EOT\n")
624 self.gitStream.write(details["desc"])
625 self.gitStream.write("\n[git-p4: depot-path = \"%s\": change = %s]\n" % (branchPrefix, details["change"]))
626 self.gitStream.write("EOT\n\n")
627
628 if len(parent) > 0:
629 if self.verbose:
630 print "parent %s" % parent
631 self.gitStream.write("from %s\n" % parent)
632
633 for file in files:
634 path = file["path"]
635 if not path.startswith(branchPrefix):
636 # if not silent:
637 # print "\nchanged files: ignoring path %s outside of branch prefix %s in change %s" % (path, branchPrefix, details["change"])
638 continue
639 rev = file["rev"]
640 depotPath = path + "#" + rev
641 relPath = path[len(branchPrefix):]
642 action = file["action"]
643
644 if file["type"] == "apple":
645 print "\nfile %s is a strange apple file that forks. Ignoring!" % path
646 continue
647
648 if action == "delete":
649 self.gitStream.write("D %s\n" % relPath)
650 else:
651 mode = 644
652 if file["type"].startswith("x"):
653 mode = 755
654
655 data = self.p4File(depotPath)
656
657 if self.isWindows and file["type"].endswith("text"):
658 data = data.replace("\r\n", "\n")
659
660 self.gitStream.write("M %s inline %s\n" % (mode, relPath))
661 self.gitStream.write("data %s\n" % len(data))
662 self.gitStream.write(data)
663 self.gitStream.write("\n")
664
665 self.gitStream.write("\n")
666
667 change = int(details["change"])
668
669 if self.labels.has_key(change):
670 label = self.labels[change]
671 labelDetails = label[0]
672 labelRevisions = label[1]
673 if self.verbose:
674 print "Change %s is labelled %s" % (change, labelDetails)
675
676 files = p4CmdList("files %s...@%s" % (branchPrefix, change))
677
678 if len(files) == len(labelRevisions):
679
680 cleanedFiles = {}
681 for info in files:
682 if info["action"] == "delete":
683 continue
684 cleanedFiles[info["depotFile"]] = info["rev"]
685
686 if cleanedFiles == labelRevisions:
687 self.gitStream.write("tag tag_%s\n" % labelDetails["label"])
688 self.gitStream.write("from %s\n" % branch)
689
690 owner = labelDetails["Owner"]
691 tagger = ""
692 if author in self.users:
693 tagger = "%s %s %s" % (self.users[owner], epoch, self.tz)
694 else:
695 tagger = "%s <a@b> %s %s" % (owner, epoch, self.tz)
696 self.gitStream.write("tagger %s\n" % tagger)
697 self.gitStream.write("data <<EOT\n")
698 self.gitStream.write(labelDetails["Description"])
699 self.gitStream.write("EOT\n\n")
700
701 else:
702 if not self.silent:
703 print "Tag %s does not match with change %s: files do not match." % (labelDetails["label"], change)
704
705 else:
706 if not self.silent:
707 print "Tag %s does not match with change %s: file count is different." % (labelDetails["label"], change)
708
709 def getUserMapFromPerforceServer(self):
710 if self.userMapFromPerforceServer:
711 return
712 self.users = {}
713
714 for output in p4CmdList("users"):
715 if not output.has_key("User"):
716 continue
717 self.users[output["User"]] = output["FullName"] + " <" + output["Email"] + ">"
718
719 cache = open(gitdir + "/p4-usercache.txt", "wb")
720 for user in self.users.keys():
721 cache.write("%s\t%s\n" % (user, self.users[user]))
722 cache.close();
723 self.userMapFromPerforceServer = True
724
725 def loadUserMapFromCache(self):
726 self.users = {}
727 self.userMapFromPerforceServer = False
728 try:
729 cache = open(gitdir + "/p4-usercache.txt", "rb")
730 lines = cache.readlines()
731 cache.close()
732 for line in lines:
733 entry = line[:-1].split("\t")
734 self.users[entry[0]] = entry[1]
735 except IOError:
736 self.getUserMapFromPerforceServer()
737
738 def getLabels(self):
739 self.labels = {}
740
741 l = p4CmdList("labels %s..." % self.depotPath)
742 if len(l) > 0 and not self.silent:
743 print "Finding files belonging to labels in %s" % self.depotPath
744
745 for output in l:
746 label = output["label"]
747 revisions = {}
748 newestChange = 0
749 if self.verbose:
750 print "Querying files for label %s" % label
751 for file in p4CmdList("files %s...@%s" % (self.depotPath, label)):
752 revisions[file["depotFile"]] = file["rev"]
753 change = int(file["change"])
754 if change > newestChange:
755 newestChange = change
756
757 self.labels[newestChange] = [output, revisions]
758
759 if self.verbose:
760 print "Label changes: %s" % self.labels.keys()
761
762 def getBranchMapping(self):
763 self.projectName = self.depotPath[self.depotPath[:-1].rfind("/") + 1:]
764
765 for info in p4CmdList("branches"):
766 details = p4Cmd("branch -o %s" % info["branch"])
767 viewIdx = 0
768 while details.has_key("View%s" % viewIdx):
769 paths = details["View%s" % viewIdx].split(" ")
770 viewIdx = viewIdx + 1
771 # require standard //depot/foo/... //depot/bar/... mapping
772 if len(paths) != 2 or not paths[0].endswith("/...") or not paths[1].endswith("/..."):
773 continue
774 source = paths[0]
775 destination = paths[1]
776 if source.startswith(self.depotPath) and destination.startswith(self.depotPath):
777 source = source[len(self.depotPath):-4]
778 destination = destination[len(self.depotPath):-4]
779 if destination not in self.knownBranches:
780 self.knownBranches[destination] = source
781 if source not in self.knownBranches:
782 self.knownBranches[source] = source
783
784 def listExistingP4GitBranches(self):
785 self.p4BranchesInGit = []
786
787 cmdline = "git rev-parse --symbolic "
788 if self.importIntoRemotes:
789 cmdline += " --remotes"
790 else:
791 cmdline += " --branches"
792
793 for line in mypopen(cmdline).readlines():
794 if self.importIntoRemotes and ((not line.startswith("p4/")) or line == "p4/HEAD\n"):
795 continue
796 if self.importIntoRemotes:
797 # strip off p4
798 branch = line[3:-1]
799 else:
800 branch = line[:-1]
801 self.p4BranchesInGit.append(branch)
802 self.initialParents[self.refPrefix + branch] = parseRevision(line[:-1])
803
804 def createOrUpdateBranchesFromOrigin(self):
805 if not self.silent:
806 print "Creating/updating branch(es) in %s based on origin branch(es)" % self.refPrefix
807
808 for line in mypopen("git rev-parse --symbolic --remotes"):
809 if (not line.startswith("origin/")) or line.endswith("HEAD\n"):
810 continue
811
812 headName = line[len("origin/"):-1]
813 remoteHead = self.refPrefix + headName
814 originHead = "origin/" + headName
815
816 [originPreviousDepotPath, originP4Change] = extractDepotPathAndChangeFromGitLog(extractLogMessageFromGitCommit(originHead))
817 if len(originPreviousDepotPath) == 0 or len(originP4Change) == 0:
818 continue
819
820 update = False
821 if not gitBranchExists(remoteHead):
822 if self.verbose:
823 print "creating %s" % remoteHead
824 update = True
825 else:
826 [p4PreviousDepotPath, p4Change] = extractDepotPathAndChangeFromGitLog(extractLogMessageFromGitCommit(remoteHead))
827 if len(p4Change) > 0:
828 if originPreviousDepotPath == p4PreviousDepotPath:
829 originP4Change = int(originP4Change)
830 p4Change = int(p4Change)
831 if originP4Change > p4Change:
832 print "%s (%s) is newer than %s (%s). Updating p4 branch from origin." % (originHead, originP4Change, remoteHead, p4Change)
833 update = True
834 else:
835 print "Ignoring: %s was imported from %s while %s was imported from %s" % (originHead, originPreviousDepotPath, remoteHead, p4PreviousDepotPath)
836
837 if update:
838 system("git update-ref %s %s" % (remoteHead, originHead))
839
840 def run(self, args):
841 self.depotPath = ""
842 self.changeRange = ""
843 self.initialParent = ""
844 self.previousDepotPath = ""
845 # map from branch depot path to parent branch
846 self.knownBranches = {}
847 self.initialParents = {}
848 self.hasOrigin = gitBranchExists("origin")
849
850 if self.importIntoRemotes:
851 self.refPrefix = "refs/remotes/p4/"
852 else:
853 self.refPrefix = "refs/heads/"
854
855 if self.syncWithOrigin:
856 if self.hasOrigin:
857 if not self.silent:
858 print "Syncing with origin first by calling git fetch origin"
859 system("git fetch origin")
860
861 if len(self.branch) == 0:
862 self.branch = self.refPrefix + "master"
863 if gitBranchExists("refs/heads/p4") and self.importIntoRemotes:
864 system("git update-ref %s refs/heads/p4" % self.branch)
865 system("git branch -D p4");
866 # create it /after/ importing, when master exists
867 if not gitBranchExists(self.refPrefix + "HEAD") and self.importIntoRemotes:
868 system("git symbolic-ref %sHEAD %s" % (self.refPrefix, self.branch))
869
870 if len(args) == 0:
871 if self.hasOrigin:
872 self.createOrUpdateBranchesFromOrigin()
873 self.listExistingP4GitBranches()
874
875 if len(self.p4BranchesInGit) > 1:
876 if not self.silent:
877 print "Importing from/into multiple branches"
878 self.detectBranches = True
879
880 if self.verbose:
881 print "branches: %s" % self.p4BranchesInGit
882
883 p4Change = 0
884 for branch in self.p4BranchesInGit:
885 depotPath, change = extractDepotPathAndChangeFromGitLog(extractLogMessageFromGitCommit(self.refPrefix + branch))
886
887 if self.verbose:
888 print "path %s change %s" % (depotPath, change)
889
890 if len(depotPath) > 0 and len(change) > 0:
891 change = int(change) + 1
892 p4Change = max(p4Change, change)
893
894 if len(self.previousDepotPath) == 0:
895 self.previousDepotPath = depotPath
896 else:
897 i = 0
898 l = min(len(self.previousDepotPath), len(depotPath))
899 while i < l and self.previousDepotPath[i] == depotPath[i]:
900 i = i + 1
901 self.previousDepotPath = self.previousDepotPath[:i]
902
903 if p4Change > 0:
904 self.depotPath = self.previousDepotPath
905 self.changeRange = "@%s,#head" % p4Change
906 self.initialParent = parseRevision(self.branch)
907 if not self.silent and not self.detectBranches:
908 print "Performing incremental import into %s git branch" % self.branch
909
910 if not self.branch.startswith("refs/"):
911 self.branch = "refs/heads/" + self.branch
912
913 if len(self.depotPath) != 0:
914 self.depotPath = self.depotPath[:-1]
915
916 if len(args) == 0 and len(self.depotPath) != 0:
917 if not self.silent:
918 print "Depot path: %s" % self.depotPath
919 elif len(args) != 1:
920 return False
921 else:
922 if len(self.depotPath) != 0 and self.depotPath != args[0]:
923 print "previous import used depot path %s and now %s was specified. this doesn't work!" % (self.depotPath, args[0])
924 sys.exit(1)
925 self.depotPath = args[0]
926
927 self.revision = ""
928 self.users = {}
929
930 if self.depotPath.find("@") != -1:
931 atIdx = self.depotPath.index("@")
932 self.changeRange = self.depotPath[atIdx:]
933 if self.changeRange == "@all":
934 self.changeRange = ""
935 elif self.changeRange.find(",") == -1:
936 self.revision = self.changeRange
937 self.changeRange = ""
938 self.depotPath = self.depotPath[0:atIdx]
939 elif self.depotPath.find("#") != -1:
940 hashIdx = self.depotPath.index("#")
941 self.revision = self.depotPath[hashIdx:]
942 self.depotPath = self.depotPath[0:hashIdx]
943 elif len(self.previousDepotPath) == 0:
944 self.revision = "#head"
945
946 if self.depotPath.endswith("..."):
947 self.depotPath = self.depotPath[:-3]
948
949 if not self.depotPath.endswith("/"):
950 self.depotPath += "/"
951
952 self.loadUserMapFromCache()
953 self.labels = {}
954 if self.detectLabels:
955 self.getLabels();
956
957 if self.detectBranches:
958 self.getBranchMapping();
959 if self.verbose:
960 print "p4-git branches: %s" % self.p4BranchesInGit
961 print "initial parents: %s" % self.initialParents
962 for b in self.p4BranchesInGit:
963 if b != "master":
964 b = b[len(self.projectName):]
965 self.createdBranches.add(b)
966
967 self.tz = "%+03d%02d" % (- time.timezone / 3600, ((- time.timezone % 3600) / 60))
968
969 importProcess = subprocess.Popen(["git", "fast-import"], stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE);
970 self.gitOutput = importProcess.stdout
971 self.gitStream = importProcess.stdin
972 self.gitError = importProcess.stderr
973
974 if len(self.revision) > 0:
975 print "Doing initial import of %s from revision %s" % (self.depotPath, self.revision)
976
977 details = { "user" : "git perforce import user", "time" : int(time.time()) }
978 details["desc"] = "Initial import of %s from the state at revision %s" % (self.depotPath, self.revision)
979 details["change"] = self.revision
980 newestRevision = 0
981
982 fileCnt = 0
983 for info in p4CmdList("files %s...%s" % (self.depotPath, self.revision)):
984 change = int(info["change"])
985 if change > newestRevision:
986 newestRevision = change
987
988 if info["action"] == "delete":
989 # don't increase the file cnt, otherwise details["depotFile123"] will have gaps!
990 #fileCnt = fileCnt + 1
991 continue
992
993 for prop in [ "depotFile", "rev", "action", "type" ]:
994 details["%s%s" % (prop, fileCnt)] = info[prop]
995
996 fileCnt = fileCnt + 1
997
998 details["change"] = newestRevision
999
1000 try:
1001 self.commit(details, self.extractFilesFromCommit(details), self.branch, self.depotPath)
1002 except IOError:
1003 print "IO error with git fast-import. Is your git version recent enough?"
1004 print self.gitError.read()
1005
1006 else:
1007 changes = []
1008
1009 if len(self.changesFile) > 0:
1010 output = open(self.changesFile).readlines()
1011 changeSet = Set()
1012 for line in output:
1013 changeSet.add(int(line))
1014
1015 for change in changeSet:
1016 changes.append(change)
1017
1018 changes.sort()
1019 else:
1020 if self.verbose:
1021 print "Getting p4 changes for %s...%s" % (self.depotPath, self.changeRange)
1022 output = mypopen("p4 changes %s...%s" % (self.depotPath, self.changeRange)).readlines()
1023
1024 for line in output:
1025 changeNum = line.split(" ")[1]
1026 changes.append(changeNum)
1027
1028 changes.reverse()
1029
1030 if len(self.maxChanges) > 0:
1031 changes = changes[0:min(int(self.maxChanges), len(changes))]
1032
1033 if len(changes) == 0:
1034 if not self.silent:
1035 print "No changes to import!"
1036 return True
1037
1038 self.updatedBranches = set()
1039
1040 cnt = 1
1041 for change in changes:
1042 description = p4Cmd("describe %s" % change)
1043
1044 if not self.silent:
1045 sys.stdout.write("\rImporting revision %s (%s%%)" % (change, cnt * 100 / len(changes)))
1046 sys.stdout.flush()
1047 cnt = cnt + 1
1048
1049 try:
1050 if self.detectBranches:
1051 branches = self.splitFilesIntoBranches(description)
1052 for branch in branches.keys():
1053 branchPrefix = self.depotPath + branch + "/"
1054
1055 parent = ""
1056
1057 filesForCommit = branches[branch]
1058
1059 if self.verbose:
1060 print "branch is %s" % branch
1061
1062 self.updatedBranches.add(branch)
1063
1064 if branch not in self.createdBranches:
1065 self.createdBranches.add(branch)
1066 parent = self.knownBranches[branch]
1067 if parent == branch:
1068 parent = ""
1069 elif self.verbose:
1070 print "parent determined through known branches: %s" % parent
1071
1072 # main branch? use master
1073 if branch == "main":
1074 branch = "master"
1075 else:
1076 branch = self.projectName + branch
1077
1078 if parent == "main":
1079 parent = "master"
1080 elif len(parent) > 0:
1081 parent = self.projectName + parent
1082
1083 branch = self.refPrefix + branch
1084 if len(parent) > 0:
1085 parent = self.refPrefix + parent
1086
1087 if self.verbose:
1088 print "looking for initial parent for %s; current parent is %s" % (branch, parent)
1089
1090 if len(parent) == 0 and branch in self.initialParents:
1091 parent = self.initialParents[branch]
1092 del self.initialParents[branch]
1093
1094 self.commit(description, filesForCommit, branch, branchPrefix, parent)
1095 else:
1096 files = self.extractFilesFromCommit(description)
1097 self.commit(description, files, self.branch, self.depotPath, self.initialParent)
1098 self.initialParent = ""
1099 except IOError:
1100 print self.gitError.read()
1101 sys.exit(1)
1102
1103 if not self.silent:
1104 print ""
1105 if len(self.updatedBranches) > 0:
1106 sys.stdout.write("Updated branches: ")
1107 for b in self.updatedBranches:
1108 sys.stdout.write("%s " % b)
1109 sys.stdout.write("\n")
1110
1111
1112 self.gitStream.close()
1113 if importProcess.wait() != 0:
1114 die("fast-import failed: %s" % self.gitError.read())
1115 self.gitOutput.close()
1116 self.gitError.close()
1117
1118 return True
1119
1120class P4Rebase(Command):
1121 def __init__(self):
1122 Command.__init__(self)
1123 self.options = [ ]
1124 self.description = "Fetches the latest revision from perforce and rebases the current work (branch) against it"
1125
1126 def run(self, args):
1127 sync = P4Sync()
1128 sync.run([])
1129 print "Rebasing the current branch"
1130 oldHead = mypopen("git rev-parse HEAD").read()[:-1]
1131 system("git rebase p4")
1132 system("git diff-tree --stat --summary -M %s HEAD" % oldHead)
1133 return True
1134
1135class P4Clone(P4Sync):
1136 def __init__(self):
1137 P4Sync.__init__(self)
1138 self.description = "Creates a new git repository and imports from Perforce into it"
1139 self.usage = "usage: %prog [options] //depot/path[@revRange] [directory]"
1140 self.needsGit = False
1141
1142 def run(self, args):
1143 global gitdir
1144
1145 if len(args) < 1:
1146 return False
1147 depotPath = args[0]
1148 dir = ""
1149 if len(args) == 2:
1150 dir = args[1]
1151 elif len(args) > 2:
1152 return False
1153
1154 if not depotPath.startswith("//"):
1155 return False
1156
1157 if len(dir) == 0:
1158 dir = depotPath
1159 atPos = dir.rfind("@")
1160 if atPos != -1:
1161 dir = dir[0:atPos]
1162 hashPos = dir.rfind("#")
1163 if hashPos != -1:
1164 dir = dir[0:hashPos]
1165
1166 if dir.endswith("..."):
1167 dir = dir[:-3]
1168
1169 if dir.endswith("/"):
1170 dir = dir[:-1]
1171
1172 slashPos = dir.rfind("/")
1173 if slashPos != -1:
1174 dir = dir[slashPos + 1:]
1175
1176 print "Importing from %s into %s" % (depotPath, dir)
1177 os.makedirs(dir)
1178 os.chdir(dir)
1179 system("git init")
1180 gitdir = os.getcwd() + "/.git"
1181 if not P4Sync.run(self, [depotPath]):
1182 return False
1183 if self.branch != "master":
1184 if gitBranchExists("refs/remotes/p4/master"):
1185 system("git branch master refs/remotes/p4/master")
1186 system("git checkout -f")
1187 else:
1188 print "Could not detect main branch. No checkout/master branch created."
1189 return True
1190
1191class HelpFormatter(optparse.IndentedHelpFormatter):
1192 def __init__(self):
1193 optparse.IndentedHelpFormatter.__init__(self)
1194
1195 def format_description(self, description):
1196 if description:
1197 return description + "\n"
1198 else:
1199 return ""
1200
1201def printUsage(commands):
1202 print "usage: %s <command> [options]" % sys.argv[0]
1203 print ""
1204 print "valid commands: %s" % ", ".join(commands)
1205 print ""
1206 print "Try %s <command> --help for command specific help." % sys.argv[0]
1207 print ""
1208
1209commands = {
1210 "debug" : P4Debug(),
1211 "submit" : P4Submit(),
1212 "sync" : P4Sync(),
1213 "rebase" : P4Rebase(),
1214 "clone" : P4Clone(),
1215 "rollback" : P4RollBack()
1216}
1217
1218if len(sys.argv[1:]) == 0:
1219 printUsage(commands.keys())
1220 sys.exit(2)
1221
1222cmd = ""
1223cmdName = sys.argv[1]
1224try:
1225 cmd = commands[cmdName]
1226except KeyError:
1227 print "unknown command %s" % cmdName
1228 print ""
1229 printUsage(commands.keys())
1230 sys.exit(2)
1231
1232options = cmd.options
1233cmd.gitdir = gitdir
1234
1235args = sys.argv[2:]
1236
1237if len(options) > 0:
1238 options.append(optparse.make_option("--git-dir", dest="gitdir"))
1239
1240 parser = optparse.OptionParser(cmd.usage.replace("%prog", "%prog " + cmdName),
1241 options,
1242 description = cmd.description,
1243 formatter = HelpFormatter())
1244
1245 (cmd, args) = parser.parse_args(sys.argv[2:], cmd);
1246
1247if cmd.needsGit:
1248 gitdir = cmd.gitdir
1249 if len(gitdir) == 0:
1250 gitdir = ".git"
1251 if not isValidGitDir(gitdir):
1252 gitdir = mypopen("git rev-parse --git-dir").read()[:-1]
1253 if os.path.exists(gitdir):
1254 cdup = mypopen("git rev-parse --show-cdup").read()[:-1];
1255 if len(cdup) > 0:
1256 os.chdir(cdup);
1257
1258 if not isValidGitDir(gitdir):
1259 if isValidGitDir(gitdir + "/.git"):
1260 gitdir += "/.git"
1261 else:
1262 die("fatal: cannot locate git repository at %s" % gitdir)
1263
1264 os.environ["GIT_DIR"] = gitdir
1265
1266if not cmd.run(args):
1267 parser.print_help()
1268