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