Code

01efd92809acab951d550fd69776912174f56eb5
[git.git] / contrib / fast-import / git-p4
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 <simon@lst.de>
6 # Copyright: 2007 Simon Hausmann <simon@lst.de>
7 #            2007 Trolltech ASA
8 # License: MIT <http://www.opensource.org/licenses/mit-license.php>
9 #
11 import optparse, sys, os, marshal, popen2, subprocess, shelve
12 import tempfile, getopt, sha, os.path, time, platform
13 import re
15 from sets import Set;
17 verbose = False
19 def write_pipe(c, str):
20     if verbose:
21         sys.stderr.write('writing pipe: %s\n' % c)
23     pipe = os.popen(c, 'w')
24     val = pipe.write(str)
25     if pipe.close():
26         sys.stderr.write('Command failed: %s' % c)
27         sys.exit(1)
29     return val
31 def read_pipe(c, ignore_error=False):
32     if verbose:
33         sys.stderr.write('reading pipe: %s\n' % c)
35     pipe = os.popen(c, 'rb')
36     val = pipe.read()
37     if pipe.close() and not ignore_error:
38         sys.stderr.write('Command failed: %s\n' % c)
39         sys.exit(1)
41     return val
44 def read_pipe_lines(c):
45     if verbose:
46         sys.stderr.write('reading pipe: %s\n' % c)
47     ## todo: check return status
48     pipe = os.popen(c, 'rb')
49     val = pipe.readlines()
50     if pipe.close():
51         sys.stderr.write('Command failed: %s\n' % c)
52         sys.exit(1)
54     return val
56 def system(cmd):
57     if verbose:
58         sys.stderr.write("executing %s\n" % cmd)
59     if os.system(cmd) != 0:
60         die("command failed: %s" % cmd)
62 def p4CmdList(cmd):
63     cmd = "p4 -G %s" % cmd
64     if verbose:
65         sys.stderr.write("Opening pipe: %s\n" % cmd)
66     pipe = os.popen(cmd, "rb")
68     result = []
69     try:
70         while True:
71             entry = marshal.load(pipe)
72             result.append(entry)
73     except EOFError:
74         pass
75     exitCode = pipe.close()
76     if exitCode != None:
77         entry = {}
78         entry["p4ExitCode"] = exitCode
79         result.append(entry)
81     return result
83 def p4Cmd(cmd):
84     list = p4CmdList(cmd)
85     result = {}
86     for entry in list:
87         result.update(entry)
88     return result;
90 def p4Where(depotPath):
91     if not depotPath.endswith("/"):
92         depotPath += "/"
93     output = p4Cmd("where %s..." % depotPath)
94     if output["code"] == "error":
95         return ""
96     clientPath = ""
97     if "path" in output:
98         clientPath = output.get("path")
99     elif "data" in output:
100         data = output.get("data")
101         lastSpace = data.rfind(" ")
102         clientPath = data[lastSpace + 1:]
104     if clientPath.endswith("..."):
105         clientPath = clientPath[:-3]
106     return clientPath
108 def die(msg):
109     sys.stderr.write(msg + "\n")
110     sys.exit(1)
112 def currentGitBranch():
113     return read_pipe("git name-rev HEAD").split(" ")[1].strip()
115 def isValidGitDir(path):
116     if (os.path.exists(path + "/HEAD")
117         and os.path.exists(path + "/refs") and os.path.exists(path + "/objects")):
118         return True;
119     return False
121 def parseRevision(ref):
122     return read_pipe("git rev-parse %s" % ref).strip()
124 def extractLogMessageFromGitCommit(commit):
125     logMessage = ""
127     ## fixme: title is first line of commit, not 1st paragraph.
128     foundTitle = False
129     for log in read_pipe_lines("git cat-file commit %s" % commit):
130        if not foundTitle:
131            if len(log) == 1:
132                foundTitle = True
133            continue
135        logMessage += log
136     return logMessage
138 def extractSettingsGitLog(log):
139     values = {}
140     for line in log.split("\n"):
141         line = line.strip()
142         m = re.search (r"^ *\[git-p4: (.*)\]$", line)
143         if not m:
144             continue
146         assignments = m.group(1).split (':')
147         for a in assignments:
148             vals = a.split ('=')
149             key = vals[0].strip()
150             val = ('='.join (vals[1:])).strip()
151             if val.endswith ('\"') and val.startswith('"'):
152                 val = val[1:-1]
154             values[key] = val
156     values['depot-paths'] = values.get("depot-paths").split(',')
157     return values
159 def gitBranchExists(branch):
160     proc = subprocess.Popen(["git", "rev-parse", branch],
161                             stderr=subprocess.PIPE, stdout=subprocess.PIPE);
162     return proc.wait() == 0;
164 def gitConfig(key):
165     return read_pipe("git config %s" % key, ignore_error=True).strip()
167 class Command:
168     def __init__(self):
169         self.usage = "usage: %prog [options]"
170         self.needsGit = True
172 class P4Debug(Command):
173     def __init__(self):
174         Command.__init__(self)
175         self.options = [
176             optparse.make_option("--verbose", dest="verbose", action="store_true"),
177             ]
178         self.description = "A tool to debug the output of p4 -G."
179         self.needsGit = False
181     def run(self, args):
182         for output in p4CmdList(" ".join(args)):
183             print output
184         return True
186 class P4RollBack(Command):
187     def __init__(self):
188         Command.__init__(self)
189         self.options = [
190             optparse.make_option("--verbose", dest="verbose", action="store_true"),
191             optparse.make_option("--local", dest="rollbackLocalBranches", action="store_true")
192         ]
193         self.description = "A tool to debug the multi-branch import. Don't use :)"
194         self.verbose = False
195         self.rollbackLocalBranches = False
197     def run(self, args):
198         if len(args) != 1:
199             return False
200         maxChange = int(args[0])
202         if "p4ExitCode" in p4Cmd("changes -m 1"):
203             die("Problems executing p4");
205         if self.rollbackLocalBranches:
206             refPrefix = "refs/heads/"
207             lines = read_pipe_lines("git rev-parse --symbolic --branches")
208         else:
209             refPrefix = "refs/remotes/"
210             lines = read_pipe_lines("git rev-parse --symbolic --remotes")
212         for line in lines:
213             if self.rollbackLocalBranches or (line.startswith("p4/") and line != "p4/HEAD\n"):
214                 line = line.strip()
215                 ref = refPrefix + line
216                 log = extractLogMessageFromGitCommit(ref)
217                 settings = extractSettingsGitLog(log)
219                 depotPaths = settings['depot-paths']
220                 change = settings['change']
222                 changed = False
224                 if len(p4Cmd("changes -m 1 "  + ' '.join (['%s...@%s' % (p, maxChange)
225                                                            for p in depotPaths]))) == 0:
226                     print "Branch %s did not exist at change %s, deleting." % (ref, maxChange)
227                     system("git update-ref -d %s `git rev-parse %s`" % (ref, ref))
228                     continue
230                 while change and int(change) > maxChange:
231                     changed = True
232                     if self.verbose:
233                         print "%s is at %s ; rewinding towards %s" % (ref, change, maxChange)
234                     system("git update-ref %s \"%s^\"" % (ref, ref))
235                     log = extractLogMessageFromGitCommit(ref)
236                     settings =  extractSettingsGitLog(log)
239                     depotPaths = settings['depot-paths']
240                     change = settings['change']
242                 if changed:
243                     print "%s rewound to %s" % (ref, change)
245         return True
247 class P4Submit(Command):
248     def __init__(self):
249         Command.__init__(self)
250         self.options = [
251                 optparse.make_option("--continue", action="store_false", dest="firstTime"),
252                 optparse.make_option("--verbose", dest="verbose", action="store_true"),
253                 optparse.make_option("--origin", dest="origin"),
254                 optparse.make_option("--reset", action="store_true", dest="reset"),
255                 optparse.make_option("--log-substitutions", dest="substFile"),
256                 optparse.make_option("--dry-run", action="store_true"),
257                 optparse.make_option("--direct", dest="directSubmit", action="store_true"),
258                 optparse.make_option("--trust-me-like-a-fool", dest="trustMeLikeAFool", action="store_true"),
259         ]
260         self.description = "Submit changes from git to the perforce depot."
261         self.usage += " [name of git branch to submit into perforce depot]"
262         self.firstTime = True
263         self.reset = False
264         self.interactive = True
265         self.dryRun = False
266         self.substFile = ""
267         self.firstTime = True
268         self.origin = ""
269         self.directSubmit = False
270         self.trustMeLikeAFool = False
272         self.logSubstitutions = {}
273         self.logSubstitutions["<enter description here>"] = "%log%"
274         self.logSubstitutions["\tDetails:"] = "\tDetails:  %log%"
276     def check(self):
277         if len(p4CmdList("opened ...")) > 0:
278             die("You have files opened with perforce! Close them before starting the sync.")
280     def start(self):
281         if len(self.config) > 0 and not self.reset:
282             die("Cannot start sync. Previous sync config found at %s\n"
283                 "If you want to start submitting again from scratch "
284                 "maybe you want to call git-p4 submit --reset" % self.configFile)
286         commits = []
287         if self.directSubmit:
288             commits.append("0")
289         else:
290             for line in read_pipe_lines("git rev-list --no-merges %s..%s" % (self.origin, self.master)):
291                 commits.append(line.strip())
292             commits.reverse()
294         self.config["commits"] = commits
296     def prepareLogMessage(self, template, message):
297         result = ""
299         for line in template.split("\n"):
300             if line.startswith("#"):
301                 result += line + "\n"
302                 continue
304             substituted = False
305             for key in self.logSubstitutions.keys():
306                 if line.find(key) != -1:
307                     value = self.logSubstitutions[key]
308                     value = value.replace("%log%", message)
309                     if value != "@remove@":
310                         result += line.replace(key, value) + "\n"
311                     substituted = True
312                     break
314             if not substituted:
315                 result += line + "\n"
317         return result
319     def applyCommit(self, id):
320         if self.directSubmit:
321             print "Applying local change in working directory/index"
322             diff = self.diffStatus
323         else:
324             print "Applying %s" % (read_pipe("git log --max-count=1 --pretty=oneline %s" % id))
325             diff = read_pipe_lines("git diff-tree -r --name-status \"%s^\" \"%s\"" % (id, id))
326         filesToAdd = set()
327         filesToDelete = set()
328         editedFiles = set()
329         for line in diff:
330             modifier = line[0]
331             path = line[1:].strip()
332             if modifier == "M":
333                 system("p4 edit \"%s\"" % path)
334                 editedFiles.add(path)
335             elif modifier == "A":
336                 filesToAdd.add(path)
337                 if path in filesToDelete:
338                     filesToDelete.remove(path)
339             elif modifier == "D":
340                 filesToDelete.add(path)
341                 if path in filesToAdd:
342                     filesToAdd.remove(path)
343             else:
344                 die("unknown modifier %s for %s" % (modifier, path))
346         if self.directSubmit:
347             diffcmd = "cat \"%s\"" % self.diffFile
348         else:
349             diffcmd = "git format-patch -k --stdout \"%s^\"..\"%s\"" % (id, id)
350         patchcmd = diffcmd + " | git apply "
351         tryPatchCmd = patchcmd + "--check -"
352         applyPatchCmd = patchcmd + "--check --apply -"
354         if os.system(tryPatchCmd) != 0:
355             print "Unfortunately applying the change failed!"
356             print "What do you want to do?"
357             response = "x"
358             while response != "s" and response != "a" and response != "w":
359                 response = raw_input("[s]kip this patch / [a]pply the patch forcibly "
360                                      "and with .rej files / [w]rite the patch to a file (patch.txt) ")
361             if response == "s":
362                 print "Skipping! Good luck with the next patches..."
363                 return
364             elif response == "a":
365                 os.system(applyPatchCmd)
366                 if len(filesToAdd) > 0:
367                     print "You may also want to call p4 add on the following files:"
368                     print " ".join(filesToAdd)
369                 if len(filesToDelete):
370                     print "The following files should be scheduled for deletion with p4 delete:"
371                     print " ".join(filesToDelete)
372                 die("Please resolve and submit the conflict manually and "
373                     + "continue afterwards with git-p4 submit --continue")
374             elif response == "w":
375                 system(diffcmd + " > patch.txt")
376                 print "Patch saved to patch.txt in %s !" % self.clientPath
377                 die("Please resolve and submit the conflict manually and "
378                     "continue afterwards with git-p4 submit --continue")
380         system(applyPatchCmd)
382         for f in filesToAdd:
383             system("p4 add %s" % f)
384         for f in filesToDelete:
385             system("p4 revert %s" % f)
386             system("p4 delete %s" % f)
388         logMessage = ""
389         if not self.directSubmit:
390             logMessage = extractLogMessageFromGitCommit(id)
391             logMessage = logMessage.replace("\n", "\n\t")
392             logMessage = logMessage.strip()
394         template = read_pipe("p4 change -o")
396         if self.interactive:
397             submitTemplate = self.prepareLogMessage(template, logMessage)
398             diff = read_pipe("p4 diff -du ...")
400             for newFile in filesToAdd:
401                 diff += "==== new file ====\n"
402                 diff += "--- /dev/null\n"
403                 diff += "+++ %s\n" % newFile
404                 f = open(newFile, "r")
405                 for line in f.readlines():
406                     diff += "+" + line
407                 f.close()
409             separatorLine = "######## everything below this line is just the diff #######"
410             if platform.system() == "Windows":
411                 separatorLine += "\r"
412             separatorLine += "\n"
414             response = "e"
415             if self.trustMeLikeAFool:
416                 response = "y"
418             firstIteration = True
419             while response == "e":
420                 if not firstIteration:
421                     response = raw_input("Do you want to submit this change? [y]es/[e]dit/[n]o/[s]kip ")
422                 firstIteration = False
423                 if response == "e":
424                     [handle, fileName] = tempfile.mkstemp()
425                     tmpFile = os.fdopen(handle, "w+")
426                     tmpFile.write(submitTemplate + separatorLine + diff)
427                     tmpFile.close()
428                     defaultEditor = "vi"
429                     if platform.system() == "Windows":
430                         defaultEditor = "notepad"
431                     editor = os.environ.get("EDITOR", defaultEditor);
432                     system(editor + " " + fileName)
433                     tmpFile = open(fileName, "rb")
434                     message = tmpFile.read()
435                     tmpFile.close()
436                     os.remove(fileName)
437                     submitTemplate = message[:message.index(separatorLine)]
439             if response == "y" or response == "yes":
440                if self.dryRun:
441                    print submitTemplate
442                    raw_input("Press return to continue...")
443                else:
444                    if self.directSubmit:
445                        print "Submitting to git first"
446                        os.chdir(self.oldWorkingDirectory)
447                        write_pipe("git commit -a -F -", submitTemplate)
448                        os.chdir(self.clientPath)
450                    write_pipe("p4 submit -i", submitTemplate)
451             elif response == "s":
452                 for f in editedFiles:
453                     system("p4 revert \"%s\"" % f);
454                 for f in filesToAdd:
455                     system("p4 revert \"%s\"" % f);
456                     system("rm %s" %f)
457                 for f in filesToDelete:
458                     system("p4 delete \"%s\"" % f);
459                 return
460             else:
461                 print "Not submitting!"
462                 self.interactive = False
463         else:
464             fileName = "submit.txt"
465             file = open(fileName, "w+")
466             file.write(self.prepareLogMessage(template, logMessage))
467             file.close()
468             print ("Perforce submit template written as %s. "
469                    + "Please review/edit and then use p4 submit -i < %s to submit directly!"
470                    % (fileName, fileName))
472     def run(self, args):
473         # make gitdir absolute so we can cd out into the perforce checkout
474         os.environ["GIT_DIR"] = gitdir
476         if len(args) == 0:
477             self.master = currentGitBranch()
478             if len(self.master) == 0 or not gitBranchExists("refs/heads/%s" % self.master):
479                 die("Detecting current git branch failed!")
480         elif len(args) == 1:
481             self.master = args[0]
482         else:
483             return False
485         depotPath = ""
486         settings = None
487         if gitBranchExists("p4"):
488             settings = extractSettingsGitLog(extractLogMessageFromGitCommit("p4"))
489         if len(depotPath) == 0 and gitBranchExists("origin"):
490             settings = extractSettingsGitLog(extractLogMessageFromGitCommit("origin"))
491         depotPaths = settings['depot-paths']
493         if len(depotPath) == 0:
494             print "Internal error: cannot locate perforce depot path from existing branches"
495             sys.exit(128)
497         self.clientPath = p4Where(depotPath)
499         if len(self.clientPath) == 0:
500             print "Error: Cannot locate perforce checkout of %s in client view" % depotPath
501             sys.exit(128)
503         print "Perforce checkout for depot path %s located at %s" % (depotPath, self.clientPath)
504         self.oldWorkingDirectory = os.getcwd()
506         if self.directSubmit:
507             self.diffStatus = read_pipe_lines("git diff -r --name-status HEAD")
508             if len(self.diffStatus) == 0:
509                 print "No changes in working directory to submit."
510                 return True
511             patch = read_pipe("git diff -p --binary --diff-filter=ACMRTUXB HEAD")
512             self.diffFile = self.gitdir + "/p4-git-diff"
513             f = open(self.diffFile, "wb")
514             f.write(patch)
515             f.close();
517         os.chdir(self.clientPath)
518         response = raw_input("Do you want to sync %s with p4 sync? [y]es/[n]o " % self.clientPath)
519         if response == "y" or response == "yes":
520             system("p4 sync ...")
522         if len(self.origin) == 0:
523             if gitBranchExists("p4"):
524                 self.origin = "p4"
525             else:
526                 self.origin = "origin"
528         if self.reset:
529             self.firstTime = True
531         if len(self.substFile) > 0:
532             for line in open(self.substFile, "r").readlines():
533                 tokens = line.strip().split("=")
534                 self.logSubstitutions[tokens[0]] = tokens[1]
536         self.check()
537         self.configFile = self.gitdir + "/p4-git-sync.cfg"
538         self.config = shelve.open(self.configFile, writeback=True)
540         if self.firstTime:
541             self.start()
543         commits = self.config.get("commits", [])
545         while len(commits) > 0:
546             self.firstTime = False
547             commit = commits[0]
548             commits = commits[1:]
549             self.config["commits"] = commits
550             self.applyCommit(commit)
551             if not self.interactive:
552                 break
554         self.config.close()
556         if self.directSubmit:
557             os.remove(self.diffFile)
559         if len(commits) == 0:
560             if self.firstTime:
561                 print "No changes found to apply between %s and current HEAD" % self.origin
562             else:
563                 print "All changes applied!"
564                 os.chdir(self.oldWorkingDirectory)
565                 response = raw_input("Do you want to sync from Perforce now using git-p4 rebase? [y]es/[n]o ")
566                 if response == "y" or response == "yes":
567                     rebase = P4Rebase()
568                     rebase.run([])
569             os.remove(self.configFile)
571         return True
573 class P4Sync(Command):
574     def __init__(self):
575         Command.__init__(self)
576         self.options = [
577                 optparse.make_option("--branch", dest="branch"),
578                 optparse.make_option("--detect-branches", dest="detectBranches", action="store_true"),
579                 optparse.make_option("--changesfile", dest="changesFile"),
580                 optparse.make_option("--silent", dest="silent", action="store_true"),
581                 optparse.make_option("--detect-labels", dest="detectLabels", action="store_true"),
582                 optparse.make_option("--verbose", dest="verbose", action="store_true"),
583                 optparse.make_option("--import-local", dest="importIntoRemotes", action="store_false"),
584                 optparse.make_option("--max-changes", dest="maxChanges"),
585                 optparse.make_option("--keep-path", dest="keepRepoPath", action='store_true')
586         ]
587         self.description = """Imports from Perforce into a git repository.\n
588     example:
589     //depot/my/project/ -- to import the current head
590     //depot/my/project/@all -- to import everything
591     //depot/my/project/@1,6 -- to import only from revision 1 to 6
593     (a ... is not needed in the path p4 specification, it's added implicitly)"""
595         self.usage += " //depot/path[@revRange]"
596         self.silent = False
597         self.createdBranches = Set()
598         self.committedChanges = Set()
599         self.branch = ""
600         self.detectBranches = False
601         self.detectLabels = False
602         self.changesFile = ""
603         self.syncWithOrigin = True
604         self.verbose = False
605         self.importIntoRemotes = True
606         self.maxChanges = ""
607         self.isWindows = (platform.system() == "Windows")
608         self.keepRepoPath = False
609         self.depotPaths = None
611         if gitConfig("git-p4.syncFromOrigin") == "false":
612             self.syncWithOrigin = False
614     def extractFilesFromCommit(self, commit):
615         files = []
616         fnum = 0
617         while commit.has_key("depotFile%s" % fnum):
618             path =  commit["depotFile%s" % fnum]
620             found = [p for p in self.depotPaths
621                      if path.startswith (p)]
622             if not found:
623                 fnum = fnum + 1
624                 continue
626             file = {}
627             file["path"] = path
628             file["rev"] = commit["rev%s" % fnum]
629             file["action"] = commit["action%s" % fnum]
630             file["type"] = commit["type%s" % fnum]
631             files.append(file)
632             fnum = fnum + 1
633         return files
635     def stripRepoPath(self, path, prefixes):
636         if self.keepRepoPath:
637             prefixes = [re.sub("^(//[^/]+/).*", r'\1', prefixes[0])]
639         for p in prefixes:
640             if path.startswith(p):
641                 path = path[len(p):]
643         return path
645     def splitFilesIntoBranches(self, commit):
646         branches = {}
647         fnum = 0
648         while commit.has_key("depotFile%s" % fnum):
649             path =  commit["depotFile%s" % fnum]
650             found = [p for p in self.depotPaths
651                      if path.startswith (p)]
652             if not found:
653                 fnum = fnum + 1
654                 continue
656             file = {}
657             file["path"] = path
658             file["rev"] = commit["rev%s" % fnum]
659             file["action"] = commit["action%s" % fnum]
660             file["type"] = commit["type%s" % fnum]
661             fnum = fnum + 1
663             relPath = self.stripRepoPath(path, self.depotPaths)
665             for branch in self.knownBranches.keys():
667                 # add a trailing slash so that a commit into qt/4.2foo doesn't end up in qt/4.2
668                 if relPath.startswith(branch + "/"):
669                     if branch not in branches:
670                         branches[branch] = []
671                     branches[branch].append(file)
673         return branches
675     ## Should move this out, doesn't use SELF.
676     def readP4Files(self, files):
677         specs = [(f['path'] + "#" + f['rev'], f)  for f in files]
679         data = read_pipe('p4 print %s' % ' '.join(['"%s"' % spec
680                                                    for (spec, info) in specs]))
682         idx = 0
683         for j in range(0, len(specs)):
684             filespec, info = specs[j]
686             assert idx < len(data)
687             if data[idx:idx + len(filespec)] != filespec:
688                 assert False
689             idx = data.find ('\n', idx)
690             assert idx > 0
691             idx += 1
693             start = idx
695             end = -1
696             if j < len(specs)-1:
697                 next_spec, next_info = specs[j+1]
698                 end = data.find(next_spec, start)
700                 assert end >= 0
701             else:
702                 end = len(data)
704             info['data'] = data[start:end]
705             idx = end
706         assert idx == len(data)
708     def commit(self, details, files, branch, branchPrefixes, parent = ""):
709         epoch = details["time"]
710         author = details["user"]
712         if self.verbose:
713             print "commit into %s" % branch
715         self.gitStream.write("commit %s\n" % branch)
716 #        gitStream.write("mark :%s\n" % details["change"])
717         self.committedChanges.add(int(details["change"]))
718         committer = ""
719         if author not in self.users:
720             self.getUserMapFromPerforceServer()
721         if author in self.users:
722             committer = "%s %s %s" % (self.users[author], epoch, self.tz)
723         else:
724             committer = "%s <a@b> %s %s" % (author, epoch, self.tz)
726         self.gitStream.write("committer %s\n" % committer)
728         self.gitStream.write("data <<EOT\n")
729         self.gitStream.write(details["desc"])
730         self.gitStream.write("\n[git-p4: depot-paths = \"%s\": change = %s: "
731                              "options = %s]\n"
732                              % (','.join (branchPrefixes), details["change"],
733                                 details['options']
734                                 ))
735         self.gitStream.write("EOT\n\n")
737         if len(parent) > 0:
738             if self.verbose:
739                 print "parent %s" % parent
740             self.gitStream.write("from %s\n" % parent)
743         new_files = []
744         for f in files:
745             if [p for p in branchPrefixes if f['path'].startswith(p)]:
746                 new_files.append (f)
747             else:
748                 sys.stderr.write("Ignoring file outside of prefix: %s\n" % path)
749         files = new_files
751         self.readP4Files(files)
752         for file in files:
753             if file["type"] == "apple":
754                 print "\nfile %s is a strange apple file that forks. Ignoring!" % file['path']
755                 continue
757             relPath = self.stripRepoPath(file['path'], branchPrefixes)
758             if file["action"] == "delete":
759                 self.gitStream.write("D %s\n" % relPath)
760             else:
761                 mode = 644
762                 if file["type"].startswith("x"):
763                     mode = 755
765                 data = file['data']
767                 if self.isWindows and file["type"].endswith("text"):
768                     data = data.replace("\r\n", "\n")
770                 self.gitStream.write("M %s inline %s\n" % (mode, relPath))
771                 self.gitStream.write("data %s\n" % len(data))
772                 self.gitStream.write(data)
773                 self.gitStream.write("\n")
775         self.gitStream.write("\n")
777         change = int(details["change"])
779         if self.labels.has_key(change):
780             label = self.labels[change]
781             labelDetails = label[0]
782             labelRevisions = label[1]
783             if self.verbose:
784                 print "Change %s is labelled %s" % (change, labelDetails)
786             files = p4CmdList("files " + ' '.join (["%s...@%s" % (p, change)
787                                                     for p in branchPrefixes]))
789             if len(files) == len(labelRevisions):
791                 cleanedFiles = {}
792                 for info in files:
793                     if info["action"] == "delete":
794                         continue
795                     cleanedFiles[info["depotFile"]] = info["rev"]
797                 if cleanedFiles == labelRevisions:
798                     self.gitStream.write("tag tag_%s\n" % labelDetails["label"])
799                     self.gitStream.write("from %s\n" % branch)
801                     owner = labelDetails["Owner"]
802                     tagger = ""
803                     if author in self.users:
804                         tagger = "%s %s %s" % (self.users[owner], epoch, self.tz)
805                     else:
806                         tagger = "%s <a@b> %s %s" % (owner, epoch, self.tz)
807                     self.gitStream.write("tagger %s\n" % tagger)
808                     self.gitStream.write("data <<EOT\n")
809                     self.gitStream.write(labelDetails["Description"])
810                     self.gitStream.write("EOT\n\n")
812                 else:
813                     if not self.silent:
814                         print ("Tag %s does not match with change %s: files do not match."
815                                % (labelDetails["label"], change))
817             else:
818                 if not self.silent:
819                     print ("Tag %s does not match with change %s: file count is different."
820                            % (labelDetails["label"], change))
822     def getUserCacheFilename(self):
823         return os.environ["HOME"] + "/.gitp4-usercache.txt"
825     def getUserMapFromPerforceServer(self):
826         if self.userMapFromPerforceServer:
827             return
828         self.users = {}
830         for output in p4CmdList("users"):
831             if not output.has_key("User"):
832                 continue
833             self.users[output["User"]] = output["FullName"] + " <" + output["Email"] + ">"
836         s = ''
837         for (key, val) in self.users.items():
838             s += "%s\t%s\n" % (key, val)
840         open(self.getUserCacheFilename(), "wb").write(s)
841         self.userMapFromPerforceServer = True
843     def loadUserMapFromCache(self):
844         self.users = {}
845         self.userMapFromPerforceServer = False
846         try:
847             cache = open(self.getUserCacheFilename(), "rb")
848             lines = cache.readlines()
849             cache.close()
850             for line in lines:
851                 entry = line.strip().split("\t")
852                 self.users[entry[0]] = entry[1]
853         except IOError:
854             self.getUserMapFromPerforceServer()
856     def getLabels(self):
857         self.labels = {}
859         l = p4CmdList("labels %s..." % ' '.join (self.depotPaths))
860         if len(l) > 0 and not self.silent:
861             print "Finding files belonging to labels in %s" % `self.depotPath`
863         for output in l:
864             label = output["label"]
865             revisions = {}
866             newestChange = 0
867             if self.verbose:
868                 print "Querying files for label %s" % label
869             for file in p4CmdList("files "
870                                   +  ' '.join (["%s...@%s" % (p, label)
871                                                 for p in self.depotPaths])):
872                 revisions[file["depotFile"]] = file["rev"]
873                 change = int(file["change"])
874                 if change > newestChange:
875                     newestChange = change
877             self.labels[newestChange] = [output, revisions]
879         if self.verbose:
880             print "Label changes: %s" % self.labels.keys()
882     def getBranchMapping(self):
884         ## FIXME - what's a P4 projectName ?
885         self.projectName = self.depotPath[self.depotPath.strip().rfind("/") + 1:]
887         for info in p4CmdList("branches"):
888             details = p4Cmd("branch -o %s" % info["branch"])
889             viewIdx = 0
890             while details.has_key("View%s" % viewIdx):
891                 paths = details["View%s" % viewIdx].split(" ")
892                 viewIdx = viewIdx + 1
893                 # require standard //depot/foo/... //depot/bar/... mapping
894                 if len(paths) != 2 or not paths[0].endswith("/...") or not paths[1].endswith("/..."):
895                     continue
896                 source = paths[0]
897                 destination = paths[1]
898                 if source.startswith(self.depotPath) and destination.startswith(self.depotPath):
899                     source = source[len(self.depotPath):-4]
900                     destination = destination[len(self.depotPath):-4]
901                     if destination not in self.knownBranches:
902                         self.knownBranches[destination] = source
903                     if source not in self.knownBranches:
904                         self.knownBranches[source] = source
906     def listExistingP4GitBranches(self):
907         self.p4BranchesInGit = []
909         cmdline = "git rev-parse --symbolic "
910         if self.importIntoRemotes:
911             cmdline += " --remotes"
912         else:
913             cmdline += " --branches"
915         for line in read_pipe_lines(cmdline):
916             line = line.strip()
917             if self.importIntoRemotes and ((not line.startswith("p4/")) or line == "p4/HEAD"):
918                 continue
920             if self.importIntoRemotes:
921                 # strip off p4
922                 branch = re.sub ("^p4/", "", line)
924             self.p4BranchesInGit.append(branch)
925             self.initialParents[self.refPrefix + branch] = parseRevision(line)
927     def createOrUpdateBranchesFromOrigin(self):
928         if not self.silent:
929             print "Creating/updating branch(es) in %s based on origin branch(es)" % self.refPrefix
931         for line in read_pipe_lines("git rev-parse --symbolic --remotes"):
932             line = line.strip()
933             if (not line.startswith("origin/")) or line.endswith("HEAD\n"):
934                 continue
936             headName = line[len("origin/"):]
937             remoteHead = self.refPrefix + headName
938             originHead = "origin/" + headName
940             original = extractSettingsGitLog(extractLogMessageFromGitCommit(originHead))
941             if (not original.has_key('depot-paths')
942                 or not original.has_key('change')):
943                 continue
945             update = False
946             if not gitBranchExists(remoteHead):
947                 if self.verbose:
948                     print "creating %s" % remoteHead
949                 update = True
950             else:
951                 settings =  extractSettingsGitLog(extractLogMessageFromGitCommit(remoteHead))
952                 if settings.has_key('change') > 0:
953                     if settings['depot-paths'] == original['depot-paths']:
954                         originP4Change = int(original['change'])
955                         p4Change = int(settings['change'])
956                         if originP4Change > p4Change:
957                             print ("%s (%s) is newer than %s (%s). "
958                                    "Updating p4 branch from origin."
959                                    % (originHead, originP4Change,
960                                       remoteHead, p4Change))
961                             update = True
962                     else:
963                         print ("Ignoring: %s was imported from %s while "
964                                "%s was imported from %s"
965                                % (originHead, ','.join(original['depot-paths']),
966                                   remoteHead, ','.join(settings['depot-paths'])))
968             if update:
969                 system("git update-ref %s %s" % (remoteHead, originHead))
971     def updateOptionDict(self, d):
972         option_keys = {}
973         if self.keepRepoPath:
974             option_keys['keepRepoPath'] = 1
976         d["options"] = ' '.join(sorted(option_keys.keys()))
978     def readOptions(self, d):
979         self.keepRepoPath = (d.has_key('options')
980                              and ('keepRepoPath' in d['options']))
982     def run(self, args):
983         self.depotPaths = []
984         self.changeRange = ""
985         self.initialParent = ""
986         self.previousDepotPaths = []
988         # map from branch depot path to parent branch
989         self.knownBranches = {}
990         self.initialParents = {}
991         self.hasOrigin = gitBranchExists("origin")
993         if self.importIntoRemotes:
994             self.refPrefix = "refs/remotes/p4/"
995         else:
996             self.refPrefix = "refs/heads/"
998         if self.syncWithOrigin and self.hasOrigin:
999             if not self.silent:
1000                 print "Syncing with origin first by calling git fetch origin"
1001             system("git fetch origin")
1003         if len(self.branch) == 0:
1004             self.branch = self.refPrefix + "master"
1005             if gitBranchExists("refs/heads/p4") and self.importIntoRemotes:
1006                 system("git update-ref %s refs/heads/p4" % self.branch)
1007                 system("git branch -D p4");
1008             # create it /after/ importing, when master exists
1009             if not gitBranchExists(self.refPrefix + "HEAD") and self.importIntoRemotes:
1010                 system("git symbolic-ref %sHEAD %s" % (self.refPrefix, self.branch))
1012         # TODO: should always look at previous commits,
1013         # merge with previous imports, if possible.
1014         if args == []:
1015             if self.hasOrigin:
1016                 self.createOrUpdateBranchesFromOrigin()
1017             self.listExistingP4GitBranches()
1019             if len(self.p4BranchesInGit) > 1:
1020                 if not self.silent:
1021                     print "Importing from/into multiple branches"
1022                 self.detectBranches = True
1024             if self.verbose:
1025                 print "branches: %s" % self.p4BranchesInGit
1027             p4Change = 0
1028             for branch in self.p4BranchesInGit:
1029                 logMsg =  extractLogMessageFromGitCommit(self.refPrefix + branch)
1031                 settings = extractSettingsGitLog(logMsg)
1033                 if self.verbose:
1034                     print "path %s change %s" % (','.join(depotPaths), change)
1036                 self.readOptions(settings)
1037                 if (settings.has_key('depot-paths')
1038                     and settings.has_key ('change')):
1039                     change = int(settings['change']) + 1
1040                     p4Change = max(p4Change, change)
1042                     depotPaths = sorted(settings['depot-paths'])
1043                     if self.previousDepotPaths == []:
1044                         self.previousDepotPaths = depotPaths
1045                     else:
1046                         paths = []
1047                         for (prev, cur) in zip(self.previousDepotPaths, depotPaths):
1048                             for i in range(0, max(len(cur), len(prev))):
1049                                 if cur[i] <> prev[i]:
1050                                     break
1052                             paths.append (cur[:i])
1054                         self.previousDepotPaths = paths
1056             if p4Change > 0:
1057                 self.depotPaths = sorted(self.previousDepotPaths)
1058                 self.changeRange = "@%s,#head" % p4Change
1059                 self.initialParent = parseRevision(self.branch)
1060                 if not self.silent and not self.detectBranches:
1061                     print "Performing incremental import into %s git branch" % self.branch
1063         if not self.branch.startswith("refs/"):
1064             self.branch = "refs/heads/" + self.branch
1066         if len(args) == 0 and self.depotPaths:
1067             if not self.silent:
1068                 print "Depot paths: %s" % ' '.join(self.depotPaths)
1069         else:
1070             if self.depotPaths and self.depotPaths != args:
1071                 print ("previous import used depot path %s and now %s was specified. "
1072                        "This doesn't work!" % (' '.join (self.depotPaths),
1073                                                ' '.join (args)))
1074                 sys.exit(1)
1076             self.depotPaths = sorted(args)
1078         self.revision = ""
1079         self.users = {}
1081         newPaths = []
1082         for p in self.depotPaths:
1083             if p.find("@") != -1:
1084                 atIdx = p.index("@")
1085                 self.changeRange = p[atIdx:]
1086                 if self.changeRange == "@all":
1087                     self.changeRange = ""
1088                 elif ',' not in self.changeRange:
1089                     self.revision = self.changeRange
1090                     self.changeRange = ""
1091                 p = p[0:atIdx]
1092             elif p.find("#") != -1:
1093                 hashIdx = p.index("#")
1094                 self.revision = p[hashIdx:]
1095                 p = p[0:hashIdx]
1096             elif self.previousDepotPaths == []:
1097                 self.revision = "#head"
1099             p = re.sub ("\.\.\.$", "", p)
1100             if not p.endswith("/"):
1101                 p += "/"
1103             newPaths.append(p)
1105         self.depotPaths = newPaths
1108         self.loadUserMapFromCache()
1109         self.labels = {}
1110         if self.detectLabels:
1111             self.getLabels();
1113         if self.detectBranches:
1114             self.getBranchMapping();
1115             if self.verbose:
1116                 print "p4-git branches: %s" % self.p4BranchesInGit
1117                 print "initial parents: %s" % self.initialParents
1118             for b in self.p4BranchesInGit:
1119                 if b != "master":
1121                     ## FIXME
1122                     b = b[len(self.projectName):]
1123                 self.createdBranches.add(b)
1125         self.tz = "%+03d%02d" % (- time.timezone / 3600, ((- time.timezone % 3600) / 60))
1127         importProcess = subprocess.Popen(["git", "fast-import"],
1128                                          stdin=subprocess.PIPE, stdout=subprocess.PIPE,
1129                                          stderr=subprocess.PIPE);
1130         self.gitOutput = importProcess.stdout
1131         self.gitStream = importProcess.stdin
1132         self.gitError = importProcess.stderr
1134         if len(self.revision) > 0:
1135             print "Doing initial import of %s from revision %s" % (' '.join(self.depotPaths), self.revision)
1137             details = { "user" : "git perforce import user", "time" : int(time.time()) }
1138             details["desc"] = ("Initial import of %s from the state at revision %s"
1139                                % (' '.join(self.depotPaths), self.revision))
1140             details["change"] = self.revision
1141             newestRevision = 0
1143             fileCnt = 0
1144             for info in p4CmdList("files "
1145                                   +  ' '.join(["%s...%s"
1146                                                % (p, self.revision)
1147                                                for p in self.depotPaths])):
1148                 change = int(info["change"])
1149                 if change > newestRevision:
1150                     newestRevision = change
1152                 if info["action"] == "delete":
1153                     # don't increase the file cnt, otherwise details["depotFile123"] will have gaps!
1154                     #fileCnt = fileCnt + 1
1155                     continue
1157                 for prop in [ "depotFile", "rev", "action", "type" ]:
1158                     details["%s%s" % (prop, fileCnt)] = info[prop]
1160                 fileCnt = fileCnt + 1
1162             details["change"] = newestRevision
1163             self.updateOptionDict(details)
1164             try:
1165                 self.commit(details, self.extractFilesFromCommit(details), self.branch, self.depotPaths)
1166             except IOError:
1167                 print "IO error with git fast-import. Is your git version recent enough?"
1168                 print self.gitError.read()
1170         else:
1171             changes = []
1173             if len(self.changesFile) > 0:
1174                 output = open(self.changesFile).readlines()
1175                 changeSet = Set()
1176                 for line in output:
1177                     changeSet.add(int(line))
1179                 for change in changeSet:
1180                     changes.append(change)
1182                 changes.sort()
1183             else:
1184                 if self.verbose:
1185                     print "Getting p4 changes for %s...%s" % (`self.depotPaths`,
1186                                                               self.changeRange)
1187                 assert self.depotPaths
1188                 output = read_pipe_lines("p4 changes " + ' '.join (["%s...%s" % (p, self.changeRange)
1189                                                                     for p in self.depotPaths]))
1191                 for line in output:
1192                     changeNum = line.split(" ")[1]
1193                     changes.append(changeNum)
1195                 changes.reverse()
1197                 if len(self.maxChanges) > 0:
1198                     changes = changes[0:min(int(self.maxChanges), len(changes))]
1200             if len(changes) == 0:
1201                 if not self.silent:
1202                     print "No changes to import!"
1203                 return True
1205             self.updatedBranches = set()
1207             cnt = 1
1208             for change in changes:
1209                 description = p4Cmd("describe %s" % change)
1210                 self.updateOptionDict(description)
1212                 if not self.silent:
1213                     sys.stdout.write("\rImporting revision %s (%s%%)" % (change, cnt * 100 / len(changes)))
1214                     sys.stdout.flush()
1215                 cnt = cnt + 1
1217                 try:
1218                     if self.detectBranches:
1219                         branches = self.splitFilesIntoBranches(description)
1220                         for branch in branches.keys():
1221                             ## HACK  --hwn
1222                             branchPrefix = self.depotPaths[0] + branch + "/"
1224                             parent = ""
1226                             filesForCommit = branches[branch]
1228                             if self.verbose:
1229                                 print "branch is %s" % branch
1231                             self.updatedBranches.add(branch)
1233                             if branch not in self.createdBranches:
1234                                 self.createdBranches.add(branch)
1235                                 parent = self.knownBranches[branch]
1236                                 if parent == branch:
1237                                     parent = ""
1238                                 elif self.verbose:
1239                                     print "parent determined through known branches: %s" % parent
1241                             # main branch? use master
1242                             if branch == "main":
1243                                 branch = "master"
1244                             else:
1246                                 ## FIXME
1247                                 branch = self.projectName + branch
1249                             if parent == "main":
1250                                 parent = "master"
1251                             elif len(parent) > 0:
1252                                 ## FIXME
1253                                 parent = self.projectName + parent
1255                             branch = self.refPrefix + branch
1256                             if len(parent) > 0:
1257                                 parent = self.refPrefix + parent
1259                             if self.verbose:
1260                                 print "looking for initial parent for %s; current parent is %s" % (branch, parent)
1262                             if len(parent) == 0 and branch in self.initialParents:
1263                                 parent = self.initialParents[branch]
1264                                 del self.initialParents[branch]
1266                             self.commit(description, filesForCommit, branch, branchPrefix, parent)
1267                     else:
1268                         files = self.extractFilesFromCommit(description)
1269                         self.commit(description, files, self.branch, self.depotPaths,
1270                                     self.initialParent)
1271                         self.initialParent = ""
1272                 except IOError:
1273                     print self.gitError.read()
1274                     sys.exit(1)
1276             if not self.silent:
1277                 print ""
1278                 if len(self.updatedBranches) > 0:
1279                     sys.stdout.write("Updated branches: ")
1280                     for b in self.updatedBranches:
1281                         sys.stdout.write("%s " % b)
1282                     sys.stdout.write("\n")
1285         self.gitStream.close()
1286         if importProcess.wait() != 0:
1287             die("fast-import failed: %s" % self.gitError.read())
1288         self.gitOutput.close()
1289         self.gitError.close()
1291         return True
1293 class P4Rebase(Command):
1294     def __init__(self):
1295         Command.__init__(self)
1296         self.options = [ ]
1297         self.description = ("Fetches the latest revision from perforce and "
1298                             + "rebases the current work (branch) against it")
1300     def run(self, args):
1301         sync = P4Sync()
1302         sync.run([])
1303         print "Rebasing the current branch"
1304         oldHead = read_pipe("git rev-parse HEAD").strip()
1305         system("git rebase p4")
1306         system("git diff-tree --stat --summary -M %s HEAD" % oldHead)
1307         return True
1309 class P4Clone(P4Sync):
1310     def __init__(self):
1311         P4Sync.__init__(self)
1312         self.description = "Creates a new git repository and imports from Perforce into it"
1313         self.usage = "usage: %prog [options] //depot/path[@revRange]"
1314         self.options.append(
1315             optparse.make_option("--destination", dest="cloneDestination",
1316                                  action='store', default=None,
1317                                  help="where to leave result of the clone"))
1318         self.cloneDestination = None
1319         self.needsGit = False
1321     def defaultDestination(self, args):
1322         ## TODO: use common prefix of args?
1323         depotPath = args[0]
1324         depotDir = re.sub("(@[^@]*)$", "", depotPath)
1325         depotDir = re.sub("(#[^#]*)$", "", depotDir)
1326         depotDir = re.sub(r"\.\.\.$,", "", depotDir)
1327         depotDir = re.sub(r"/$", "", depotDir)
1328         return os.path.split(depotDir)[1]
1330     def run(self, args):
1331         if len(args) < 1:
1332             return False
1334         if self.keepRepoPath and not self.cloneDestination:
1335             sys.stderr.write("Must specify destination for --keep-path\n")
1336             sys.exit(1)
1338         depotPaths = args
1339         for p in depotPaths:
1340             if not p.startswith("//"):
1341                 return False
1343         if not self.cloneDestination:
1344             self.cloneDestination = self.defaultDestination()
1346         print "Importing from %s into %s" % (`depotPaths`, self.cloneDestination)
1347         os.makedirs(self.cloneDestination)
1348         os.chdir(self.cloneDestination)
1349         system("git init")
1350         self.gitdir = os.getcwd() + "/.git"
1351         if not P4Sync.run(self, depotPaths):
1352             return False
1353         if self.branch != "master":
1354             if gitBranchExists("refs/remotes/p4/master"):
1355                 system("git branch master refs/remotes/p4/master")
1356                 system("git checkout -f")
1357             else:
1358                 print "Could not detect main branch. No checkout/master branch created."
1359         return True
1361 class HelpFormatter(optparse.IndentedHelpFormatter):
1362     def __init__(self):
1363         optparse.IndentedHelpFormatter.__init__(self)
1365     def format_description(self, description):
1366         if description:
1367             return description + "\n"
1368         else:
1369             return ""
1371 def printUsage(commands):
1372     print "usage: %s <command> [options]" % sys.argv[0]
1373     print ""
1374     print "valid commands: %s" % ", ".join(commands)
1375     print ""
1376     print "Try %s <command> --help for command specific help." % sys.argv[0]
1377     print ""
1379 commands = {
1380     "debug" : P4Debug,
1381     "submit" : P4Submit,
1382     "sync" : P4Sync,
1383     "rebase" : P4Rebase,
1384     "clone" : P4Clone,
1385     "rollback" : P4RollBack
1389 def main():
1390     if len(sys.argv[1:]) == 0:
1391         printUsage(commands.keys())
1392         sys.exit(2)
1394     cmd = ""
1395     cmdName = sys.argv[1]
1396     try:
1397         klass = commands[cmdName]
1398         cmd = klass()
1399     except KeyError:
1400         print "unknown command %s" % cmdName
1401         print ""
1402         printUsage(commands.keys())
1403         sys.exit(2)
1405     options = cmd.options
1406     cmd.gitdir = os.environ.get("GIT_DIR", None)
1408     args = sys.argv[2:]
1410     if len(options) > 0:
1411         options.append(optparse.make_option("--git-dir", dest="gitdir"))
1413         parser = optparse.OptionParser(cmd.usage.replace("%prog", "%prog " + cmdName),
1414                                        options,
1415                                        description = cmd.description,
1416                                        formatter = HelpFormatter())
1418         (cmd, args) = parser.parse_args(sys.argv[2:], cmd);
1419     global verbose
1420     verbose = cmd.verbose
1421     if cmd.needsGit:
1422         if cmd.gitdir == None:
1423             cmd.gitdir = os.path.abspath(".git")
1424             if not isValidGitDir(cmd.gitdir):
1425                 cmd.gitdir = read_pipe("git rev-parse --git-dir").strip()
1426                 if os.path.exists(cmd.gitdir):
1427                     cdup = read_pipe("git rev-parse --show-cdup").strip()
1428                     if len(cdup) > 0:
1429                         os.chdir(cdup);
1431         if not isValidGitDir(cmd.gitdir):
1432             if isValidGitDir(cmd.gitdir + "/.git"):
1433                 cmd.gitdir += "/.git"
1434             else:
1435                 die("fatal: cannot locate git repository at %s" % cmd.gitdir)
1437         os.environ["GIT_DIR"] = cmd.gitdir
1439     if not cmd.run(args):
1440         parser.print_help()
1443 if __name__ == '__main__':
1444     main()