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