Code

d1989e613434a1c2a245a2508892518ba481ea00
[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                 if end < 0:
701                     print spec, next_spec
703                 assert end >= 0
704             else:
705                 end = len(data)
707             info['data'] = data[start:end]
708             idx = end
709         assert idx == len(data)
711     def commit(self, details, files, branch, branchPrefixes, parent = ""):
712         epoch = details["time"]
713         author = details["user"]
715         if self.verbose:
716             print "commit into %s" % branch
718         # start with reading files; if that fails, we should not
719         # create a commit.
720         new_files = []
721         for f in files:
722             if [p for p in branchPrefixes if f['path'].startswith(p)]:
723                 new_files.append (f)
724             else:
725                 sys.stderr.write("Ignoring file outside of prefix: %s\n" % path)
726         files = new_files
727         self.readP4Files(files)
732         self.gitStream.write("commit %s\n" % branch)
733 #        gitStream.write("mark :%s\n" % details["change"])
734         self.committedChanges.add(int(details["change"]))
735         committer = ""
736         if author not in self.users:
737             self.getUserMapFromPerforceServer()
738         if author in self.users:
739             committer = "%s %s %s" % (self.users[author], epoch, self.tz)
740         else:
741             committer = "%s <a@b> %s %s" % (author, epoch, self.tz)
743         self.gitStream.write("committer %s\n" % committer)
745         self.gitStream.write("data <<EOT\n")
746         self.gitStream.write(details["desc"])
747         self.gitStream.write("\n[git-p4: depot-paths = \"%s\": change = %s: "
748                              "options = %s]\n"
749                              % (','.join (branchPrefixes), details["change"],
750                                 details['options']
751                                 ))
752         self.gitStream.write("EOT\n\n")
754         if len(parent) > 0:
755             if self.verbose:
756                 print "parent %s" % parent
757             self.gitStream.write("from %s\n" % parent)
759         for file in files:
760             if file["type"] == "apple":
761                 print "\nfile %s is a strange apple file that forks. Ignoring!" % file['path']
762                 continue
764             relPath = self.stripRepoPath(file['path'], branchPrefixes)
765             if file["action"] == "delete":
766                 self.gitStream.write("D %s\n" % relPath)
767             else:
768                 mode = 644
769                 if file["type"].startswith("x"):
770                     mode = 755
772                 data = file['data']
774                 if self.isWindows and file["type"].endswith("text"):
775                     data = data.replace("\r\n", "\n")
777                 self.gitStream.write("M %s inline %s\n" % (mode, relPath))
778                 self.gitStream.write("data %s\n" % len(data))
779                 self.gitStream.write(data)
780                 self.gitStream.write("\n")
782         self.gitStream.write("\n")
784         change = int(details["change"])
786         if self.labels.has_key(change):
787             label = self.labels[change]
788             labelDetails = label[0]
789             labelRevisions = label[1]
790             if self.verbose:
791                 print "Change %s is labelled %s" % (change, labelDetails)
793             files = p4CmdList("files " + ' '.join (["%s...@%s" % (p, change)
794                                                     for p in branchPrefixes]))
796             if len(files) == len(labelRevisions):
798                 cleanedFiles = {}
799                 for info in files:
800                     if info["action"] == "delete":
801                         continue
802                     cleanedFiles[info["depotFile"]] = info["rev"]
804                 if cleanedFiles == labelRevisions:
805                     self.gitStream.write("tag tag_%s\n" % labelDetails["label"])
806                     self.gitStream.write("from %s\n" % branch)
808                     owner = labelDetails["Owner"]
809                     tagger = ""
810                     if author in self.users:
811                         tagger = "%s %s %s" % (self.users[owner], epoch, self.tz)
812                     else:
813                         tagger = "%s <a@b> %s %s" % (owner, epoch, self.tz)
814                     self.gitStream.write("tagger %s\n" % tagger)
815                     self.gitStream.write("data <<EOT\n")
816                     self.gitStream.write(labelDetails["Description"])
817                     self.gitStream.write("EOT\n\n")
819                 else:
820                     if not self.silent:
821                         print ("Tag %s does not match with change %s: files do not match."
822                                % (labelDetails["label"], change))
824             else:
825                 if not self.silent:
826                     print ("Tag %s does not match with change %s: file count is different."
827                            % (labelDetails["label"], change))
829     def getUserCacheFilename(self):
830         return os.environ["HOME"] + "/.gitp4-usercache.txt"
832     def getUserMapFromPerforceServer(self):
833         if self.userMapFromPerforceServer:
834             return
835         self.users = {}
837         for output in p4CmdList("users"):
838             if not output.has_key("User"):
839                 continue
840             self.users[output["User"]] = output["FullName"] + " <" + output["Email"] + ">"
843         s = ''
844         for (key, val) in self.users.items():
845             s += "%s\t%s\n" % (key, val)
847         open(self.getUserCacheFilename(), "wb").write(s)
848         self.userMapFromPerforceServer = True
850     def loadUserMapFromCache(self):
851         self.users = {}
852         self.userMapFromPerforceServer = False
853         try:
854             cache = open(self.getUserCacheFilename(), "rb")
855             lines = cache.readlines()
856             cache.close()
857             for line in lines:
858                 entry = line.strip().split("\t")
859                 self.users[entry[0]] = entry[1]
860         except IOError:
861             self.getUserMapFromPerforceServer()
863     def getLabels(self):
864         self.labels = {}
866         l = p4CmdList("labels %s..." % ' '.join (self.depotPaths))
867         if len(l) > 0 and not self.silent:
868             print "Finding files belonging to labels in %s" % `self.depotPath`
870         for output in l:
871             label = output["label"]
872             revisions = {}
873             newestChange = 0
874             if self.verbose:
875                 print "Querying files for label %s" % label
876             for file in p4CmdList("files "
877                                   +  ' '.join (["%s...@%s" % (p, label)
878                                                 for p in self.depotPaths])):
879                 revisions[file["depotFile"]] = file["rev"]
880                 change = int(file["change"])
881                 if change > newestChange:
882                     newestChange = change
884             self.labels[newestChange] = [output, revisions]
886         if self.verbose:
887             print "Label changes: %s" % self.labels.keys()
889     def getBranchMapping(self):
891         ## FIXME - what's a P4 projectName ?
892         self.projectName = self.depotPath[self.depotPath.strip().rfind("/") + 1:]
894         for info in p4CmdList("branches"):
895             details = p4Cmd("branch -o %s" % info["branch"])
896             viewIdx = 0
897             while details.has_key("View%s" % viewIdx):
898                 paths = details["View%s" % viewIdx].split(" ")
899                 viewIdx = viewIdx + 1
900                 # require standard //depot/foo/... //depot/bar/... mapping
901                 if len(paths) != 2 or not paths[0].endswith("/...") or not paths[1].endswith("/..."):
902                     continue
903                 source = paths[0]
904                 destination = paths[1]
905                 if source.startswith(self.depotPath) and destination.startswith(self.depotPath):
906                     source = source[len(self.depotPath):-4]
907                     destination = destination[len(self.depotPath):-4]
908                     if destination not in self.knownBranches:
909                         self.knownBranches[destination] = source
910                     if source not in self.knownBranches:
911                         self.knownBranches[source] = source
913     def listExistingP4GitBranches(self):
914         self.p4BranchesInGit = []
916         cmdline = "git rev-parse --symbolic "
917         if self.importIntoRemotes:
918             cmdline += " --remotes"
919         else:
920             cmdline += " --branches"
922         for line in read_pipe_lines(cmdline):
923             line = line.strip()
924             if self.importIntoRemotes and ((not line.startswith("p4/")) or line == "p4/HEAD"):
925                 continue
927             if self.importIntoRemotes:
928                 # strip off p4
929                 branch = re.sub ("^p4/", "", line)
931             self.p4BranchesInGit.append(branch)
932             self.initialParents[self.refPrefix + branch] = parseRevision(line)
934     def createOrUpdateBranchesFromOrigin(self):
935         if not self.silent:
936             print "Creating/updating branch(es) in %s based on origin branch(es)" % self.refPrefix
938         for line in read_pipe_lines("git rev-parse --symbolic --remotes"):
939             line = line.strip()
940             if (not line.startswith("origin/")) or line.endswith("HEAD\n"):
941                 continue
943             headName = line[len("origin/"):]
944             remoteHead = self.refPrefix + headName
945             originHead = "origin/" + headName
947             original = extractSettingsGitLog(extractLogMessageFromGitCommit(originHead))
948             if (not original.has_key('depot-paths')
949                 or not original.has_key('change')):
950                 continue
952             update = False
953             if not gitBranchExists(remoteHead):
954                 if self.verbose:
955                     print "creating %s" % remoteHead
956                 update = True
957             else:
958                 settings =  extractSettingsGitLog(extractLogMessageFromGitCommit(remoteHead))
959                 if settings.has_key('change') > 0:
960                     if settings['depot-paths'] == original['depot-paths']:
961                         originP4Change = int(original['change'])
962                         p4Change = int(settings['change'])
963                         if originP4Change > p4Change:
964                             print ("%s (%s) is newer than %s (%s). "
965                                    "Updating p4 branch from origin."
966                                    % (originHead, originP4Change,
967                                       remoteHead, p4Change))
968                             update = True
969                     else:
970                         print ("Ignoring: %s was imported from %s while "
971                                "%s was imported from %s"
972                                % (originHead, ','.join(original['depot-paths']),
973                                   remoteHead, ','.join(settings['depot-paths'])))
975             if update:
976                 system("git update-ref %s %s" % (remoteHead, originHead))
978     def updateOptionDict(self, d):
979         option_keys = {}
980         if self.keepRepoPath:
981             option_keys['keepRepoPath'] = 1
983         d["options"] = ' '.join(sorted(option_keys.keys()))
985     def readOptions(self, d):
986         self.keepRepoPath = (d.has_key('options')
987                              and ('keepRepoPath' in d['options']))
989     def run(self, args):
990         self.depotPaths = []
991         self.changeRange = ""
992         self.initialParent = ""
993         self.previousDepotPaths = []
995         # map from branch depot path to parent branch
996         self.knownBranches = {}
997         self.initialParents = {}
998         self.hasOrigin = gitBranchExists("origin")
1000         if self.importIntoRemotes:
1001             self.refPrefix = "refs/remotes/p4/"
1002         else:
1003             self.refPrefix = "refs/heads/"
1005         if self.syncWithOrigin and self.hasOrigin:
1006             if not self.silent:
1007                 print "Syncing with origin first by calling git fetch origin"
1008             system("git fetch origin")
1010         if len(self.branch) == 0:
1011             self.branch = self.refPrefix + "master"
1012             if gitBranchExists("refs/heads/p4") and self.importIntoRemotes:
1013                 system("git update-ref %s refs/heads/p4" % self.branch)
1014                 system("git branch -D p4");
1015             # create it /after/ importing, when master exists
1016             if not gitBranchExists(self.refPrefix + "HEAD") and self.importIntoRemotes:
1017                 system("git symbolic-ref %sHEAD %s" % (self.refPrefix, self.branch))
1019         # TODO: should always look at previous commits,
1020         # merge with previous imports, if possible.
1021         if args == []:
1022             if self.hasOrigin:
1023                 self.createOrUpdateBranchesFromOrigin()
1024             self.listExistingP4GitBranches()
1026             if len(self.p4BranchesInGit) > 1:
1027                 if not self.silent:
1028                     print "Importing from/into multiple branches"
1029                 self.detectBranches = True
1031             if self.verbose:
1032                 print "branches: %s" % self.p4BranchesInGit
1034             p4Change = 0
1035             for branch in self.p4BranchesInGit:
1036                 logMsg =  extractLogMessageFromGitCommit(self.refPrefix + branch)
1038                 settings = extractSettingsGitLog(logMsg)
1040                 self.readOptions(settings)
1041                 if (settings.has_key('depot-paths')
1042                     and settings.has_key ('change')):
1043                     change = int(settings['change']) + 1
1044                     p4Change = max(p4Change, change)
1046                     depotPaths = sorted(settings['depot-paths'])
1047                     if self.previousDepotPaths == []:
1048                         self.previousDepotPaths = depotPaths
1049                     else:
1050                         paths = []
1051                         for (prev, cur) in zip(self.previousDepotPaths, depotPaths):
1052                             for i in range(0, max(len(cur), len(prev))):
1053                                 if cur[i] <> prev[i]:
1054                                     break
1056                             paths.append (cur[:i])
1058                         self.previousDepotPaths = paths
1060             if p4Change > 0:
1061                 self.depotPaths = sorted(self.previousDepotPaths)
1062                 self.changeRange = "@%s,#head" % p4Change
1063                 self.initialParent = parseRevision(self.branch)
1064                 if not self.silent and not self.detectBranches:
1065                     print "Performing incremental import into %s git branch" % self.branch
1067         if not self.branch.startswith("refs/"):
1068             self.branch = "refs/heads/" + self.branch
1070         if len(args) == 0 and self.depotPaths:
1071             if not self.silent:
1072                 print "Depot paths: %s" % ' '.join(self.depotPaths)
1073         else:
1074             if self.depotPaths and self.depotPaths != args:
1075                 print ("previous import used depot path %s and now %s was specified. "
1076                        "This doesn't work!" % (' '.join (self.depotPaths),
1077                                                ' '.join (args)))
1078                 sys.exit(1)
1080             self.depotPaths = sorted(args)
1082         self.revision = ""
1083         self.users = {}
1085         newPaths = []
1086         for p in self.depotPaths:
1087             if p.find("@") != -1:
1088                 atIdx = p.index("@")
1089                 self.changeRange = p[atIdx:]
1090                 if self.changeRange == "@all":
1091                     self.changeRange = ""
1092                 elif ',' not in self.changeRange:
1093                     self.revision = self.changeRange
1094                     self.changeRange = ""
1095                 p = p[0:atIdx]
1096             elif p.find("#") != -1:
1097                 hashIdx = p.index("#")
1098                 self.revision = p[hashIdx:]
1099                 p = p[0:hashIdx]
1100             elif self.previousDepotPaths == []:
1101                 self.revision = "#head"
1103             p = re.sub ("\.\.\.$", "", p)
1104             if not p.endswith("/"):
1105                 p += "/"
1107             newPaths.append(p)
1109         self.depotPaths = newPaths
1112         self.loadUserMapFromCache()
1113         self.labels = {}
1114         if self.detectLabels:
1115             self.getLabels();
1117         if self.detectBranches:
1118             self.getBranchMapping();
1119             if self.verbose:
1120                 print "p4-git branches: %s" % self.p4BranchesInGit
1121                 print "initial parents: %s" % self.initialParents
1122             for b in self.p4BranchesInGit:
1123                 if b != "master":
1125                     ## FIXME
1126                     b = b[len(self.projectName):]
1127                 self.createdBranches.add(b)
1129         self.tz = "%+03d%02d" % (- time.timezone / 3600, ((- time.timezone % 3600) / 60))
1131         importProcess = subprocess.Popen(["git", "fast-import"],
1132                                          stdin=subprocess.PIPE, stdout=subprocess.PIPE,
1133                                          stderr=subprocess.PIPE);
1134         self.gitOutput = importProcess.stdout
1135         self.gitStream = importProcess.stdin
1136         self.gitError = importProcess.stderr
1138         if len(self.revision) > 0:
1139             print "Doing initial import of %s from revision %s" % (' '.join(self.depotPaths), self.revision)
1141             details = { "user" : "git perforce import user", "time" : int(time.time()) }
1142             details["desc"] = ("Initial import of %s from the state at revision %s"
1143                                % (' '.join(self.depotPaths), self.revision))
1144             details["change"] = self.revision
1145             newestRevision = 0
1147             fileCnt = 0
1148             for info in p4CmdList("files "
1149                                   +  ' '.join(["%s...%s"
1150                                                % (p, self.revision)
1151                                                for p in self.depotPaths])):
1153                 if not info.has_key("change"):
1154                     print info
1155                 change = int(info["change"])
1156                 if change > newestRevision:
1157                     newestRevision = change
1159                 if info["action"] == "delete":
1160                     # don't increase the file cnt, otherwise details["depotFile123"] will have gaps!
1161                     #fileCnt = fileCnt + 1
1162                     continue
1164                 for prop in ["depotFile", "rev", "action", "type" ]:
1165                     details["%s%s" % (prop, fileCnt)] = info[prop]
1167                 fileCnt = fileCnt + 1
1169             details["change"] = newestRevision
1170             self.updateOptionDict(details)
1171             try:
1172                 self.commit(details, self.extractFilesFromCommit(details), self.branch, self.depotPaths)
1173             except IOError:
1174                 print "IO error with git fast-import. Is your git version recent enough?"
1175                 print self.gitError.read()
1177         else:
1178             changes = []
1180             if len(self.changesFile) > 0:
1181                 output = open(self.changesFile).readlines()
1182                 changeSet = Set()
1183                 for line in output:
1184                     changeSet.add(int(line))
1186                 for change in changeSet:
1187                     changes.append(change)
1189                 changes.sort()
1190             else:
1191                 if self.verbose:
1192                     print "Getting p4 changes for %s...%s" % (`self.depotPaths`,
1193                                                               self.changeRange)
1194                 assert self.depotPaths
1195                 output = read_pipe_lines("p4 changes " + ' '.join (["%s...%s" % (p, self.changeRange)
1196                                                                     for p in self.depotPaths]))
1198                 for line in output:
1199                     changeNum = line.split(" ")[1]
1200                     changes.append(changeNum)
1202                 changes.reverse()
1204                 if len(self.maxChanges) > 0:
1205                     changes = changes[0:min(int(self.maxChanges), len(changes))]
1207             if len(changes) == 0:
1208                 if not self.silent:
1209                     print "No changes to import!"
1210                 return True
1212             self.updatedBranches = set()
1214             cnt = 1
1215             for change in changes:
1216                 description = p4Cmd("describe %s" % change)
1217                 self.updateOptionDict(description)
1219                 if not self.silent:
1220                     sys.stdout.write("\rImporting revision %s (%s%%)" % (change, cnt * 100 / len(changes)))
1221                     sys.stdout.flush()
1222                 cnt = cnt + 1
1224                 try:
1225                     if self.detectBranches:
1226                         branches = self.splitFilesIntoBranches(description)
1227                         for branch in branches.keys():
1228                             ## HACK  --hwn
1229                             branchPrefix = self.depotPaths[0] + branch + "/"
1231                             parent = ""
1233                             filesForCommit = branches[branch]
1235                             if self.verbose:
1236                                 print "branch is %s" % branch
1238                             self.updatedBranches.add(branch)
1240                             if branch not in self.createdBranches:
1241                                 self.createdBranches.add(branch)
1242                                 parent = self.knownBranches[branch]
1243                                 if parent == branch:
1244                                     parent = ""
1245                                 elif self.verbose:
1246                                     print "parent determined through known branches: %s" % parent
1248                             # main branch? use master
1249                             if branch == "main":
1250                                 branch = "master"
1251                             else:
1253                                 ## FIXME
1254                                 branch = self.projectName + branch
1256                             if parent == "main":
1257                                 parent = "master"
1258                             elif len(parent) > 0:
1259                                 ## FIXME
1260                                 parent = self.projectName + parent
1262                             branch = self.refPrefix + branch
1263                             if len(parent) > 0:
1264                                 parent = self.refPrefix + parent
1266                             if self.verbose:
1267                                 print "looking for initial parent for %s; current parent is %s" % (branch, parent)
1269                             if len(parent) == 0 and branch in self.initialParents:
1270                                 parent = self.initialParents[branch]
1271                                 del self.initialParents[branch]
1273                             self.commit(description, filesForCommit, branch, branchPrefix, parent)
1274                     else:
1275                         files = self.extractFilesFromCommit(description)
1276                         self.commit(description, files, self.branch, self.depotPaths,
1277                                     self.initialParent)
1278                         self.initialParent = ""
1279                 except IOError:
1280                     print self.gitError.read()
1281                     sys.exit(1)
1283             if not self.silent:
1284                 print ""
1285                 if len(self.updatedBranches) > 0:
1286                     sys.stdout.write("Updated branches: ")
1287                     for b in self.updatedBranches:
1288                         sys.stdout.write("%s " % b)
1289                     sys.stdout.write("\n")
1292         self.gitStream.close()
1293         if importProcess.wait() != 0:
1294             die("fast-import failed: %s" % self.gitError.read())
1295         self.gitOutput.close()
1296         self.gitError.close()
1298         return True
1300 class P4Rebase(Command):
1301     def __init__(self):
1302         Command.__init__(self)
1303         self.options = [ ]
1304         self.description = ("Fetches the latest revision from perforce and "
1305                             + "rebases the current work (branch) against it")
1307     def run(self, args):
1308         sync = P4Sync()
1309         sync.run([])
1310         print "Rebasing the current branch"
1311         oldHead = read_pipe("git rev-parse HEAD").strip()
1312         system("git rebase p4")
1313         system("git diff-tree --stat --summary -M %s HEAD" % oldHead)
1314         return True
1316 class P4Clone(P4Sync):
1317     def __init__(self):
1318         P4Sync.__init__(self)
1319         self.description = "Creates a new git repository and imports from Perforce into it"
1320         self.usage = "usage: %prog [options] //depot/path[@revRange]"
1321         self.options.append(
1322             optparse.make_option("--destination", dest="cloneDestination",
1323                                  action='store', default=None,
1324                                  help="where to leave result of the clone"))
1325         self.cloneDestination = None
1326         self.needsGit = False
1328     def defaultDestination(self, args):
1329         ## TODO: use common prefix of args?
1330         depotPath = args[0]
1331         depotDir = re.sub("(@[^@]*)$", "", depotPath)
1332         depotDir = re.sub("(#[^#]*)$", "", depotDir)
1333         depotDir = re.sub(r"\.\.\.$,", "", depotDir)
1334         depotDir = re.sub(r"/$", "", depotDir)
1335         return os.path.split(depotDir)[1]
1337     def run(self, args):
1338         if len(args) < 1:
1339             return False
1341         if self.keepRepoPath and not self.cloneDestination:
1342             sys.stderr.write("Must specify destination for --keep-path\n")
1343             sys.exit(1)
1345         depotPaths = args
1346         for p in depotPaths:
1347             if not p.startswith("//"):
1348                 return False
1350         if not self.cloneDestination:
1351             self.cloneDestination = self.defaultDestination()
1353         print "Importing from %s into %s" % (`depotPaths`, self.cloneDestination)
1354         os.makedirs(self.cloneDestination)
1355         os.chdir(self.cloneDestination)
1356         system("git init")
1357         self.gitdir = os.getcwd() + "/.git"
1358         if not P4Sync.run(self, depotPaths):
1359             return False
1360         if self.branch != "master":
1361             if gitBranchExists("refs/remotes/p4/master"):
1362                 system("git branch master refs/remotes/p4/master")
1363                 system("git checkout -f")
1364             else:
1365                 print "Could not detect main branch. No checkout/master branch created."
1366         return True
1368 class HelpFormatter(optparse.IndentedHelpFormatter):
1369     def __init__(self):
1370         optparse.IndentedHelpFormatter.__init__(self)
1372     def format_description(self, description):
1373         if description:
1374             return description + "\n"
1375         else:
1376             return ""
1378 def printUsage(commands):
1379     print "usage: %s <command> [options]" % sys.argv[0]
1380     print ""
1381     print "valid commands: %s" % ", ".join(commands)
1382     print ""
1383     print "Try %s <command> --help for command specific help." % sys.argv[0]
1384     print ""
1386 commands = {
1387     "debug" : P4Debug,
1388     "submit" : P4Submit,
1389     "sync" : P4Sync,
1390     "rebase" : P4Rebase,
1391     "clone" : P4Clone,
1392     "rollback" : P4RollBack
1396 def main():
1397     if len(sys.argv[1:]) == 0:
1398         printUsage(commands.keys())
1399         sys.exit(2)
1401     cmd = ""
1402     cmdName = sys.argv[1]
1403     try:
1404         klass = commands[cmdName]
1405         cmd = klass()
1406     except KeyError:
1407         print "unknown command %s" % cmdName
1408         print ""
1409         printUsage(commands.keys())
1410         sys.exit(2)
1412     options = cmd.options
1413     cmd.gitdir = os.environ.get("GIT_DIR", None)
1415     args = sys.argv[2:]
1417     if len(options) > 0:
1418         options.append(optparse.make_option("--git-dir", dest="gitdir"))
1420         parser = optparse.OptionParser(cmd.usage.replace("%prog", "%prog " + cmdName),
1421                                        options,
1422                                        description = cmd.description,
1423                                        formatter = HelpFormatter())
1425         (cmd, args) = parser.parse_args(sys.argv[2:], cmd);
1426     global verbose
1427     verbose = cmd.verbose
1428     if cmd.needsGit:
1429         if cmd.gitdir == None:
1430             cmd.gitdir = os.path.abspath(".git")
1431             if not isValidGitDir(cmd.gitdir):
1432                 cmd.gitdir = read_pipe("git rev-parse --git-dir").strip()
1433                 if os.path.exists(cmd.gitdir):
1434                     cdup = read_pipe("git rev-parse --show-cdup").strip()
1435                     if len(cdup) > 0:
1436                         os.chdir(cdup);
1438         if not isValidGitDir(cmd.gitdir):
1439             if isValidGitDir(cmd.gitdir + "/.git"):
1440                 cmd.gitdir += "/.git"
1441             else:
1442                 die("fatal: cannot locate git repository at %s" % cmd.gitdir)
1444         os.environ["GIT_DIR"] = cmd.gitdir
1446     if not cmd.run(args):
1447         parser.print_help()
1450 if __name__ == '__main__':
1451     main()