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