Andrew's git / gitweb.git / contrib/fast-import/git-p4
?
contrib / fast-import / git-p4on commit Fix the timezone formatting. Now qgit also displays (parses) it correctly. (f291b4e)
   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
  11import optparse, sys, os, marshal, popen2, shelve
  12import tempfile, getopt, sha, os.path, time
  13from sets import Set;
  14
  15gitdir = os.environ.get("GIT_DIR", "")
  16
  17def 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
  32def p4Cmd(cmd):
  33    list = p4CmdList(cmd)
  34    result = {}
  35    for entry in list:
  36        result.update(entry)
  37    return result;
  38
  39def 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
  55def die(msg):
  56    sys.stderr.write(msg + "\n")
  57    sys.exit(1)
  58
  59def currentGitBranch():
  60    return os.popen("git name-rev HEAD").read().split(" ")[1][:-1]
  61
  62def 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
  67def system(cmd):
  68    if os.system(cmd) != 0:
  69        die("command failed: %s" % cmd)
  70
  71def 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
  83def 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
 102def gitBranchExists(branch):
 103    if os.system("git rev-parse %s 2>/dev/null >/dev/null" % branch) == 0:
 104        return True
 105    return False
 106
 107class Command:
 108    def __init__(self):
 109        self.usage = "usage: %prog [options]"
 110        self.needsGit = True
 111
 112class 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
 125class 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
 163class 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        oldWorkingDirectory = os.getcwd()
 356        os.chdir(clientPath)
 357        response = raw_input("Do you want to sync %s with p4 sync? (y/n) " % clientPath)
 358        if response == "y" or response == "yes":
 359            system("p4 sync ...")
 360
 361        if len(self.origin) == 0:
 362            if gitBranchExists("p4"):
 363                self.origin = "p4"
 364            else:
 365                self.origin = "origin"
 366
 367        if self.reset:
 368            self.firstTime = True
 369
 370        if len(self.substFile) > 0:
 371            for line in open(self.substFile, "r").readlines():
 372                tokens = line[:-1].split("=")
 373                self.logSubstitutions[tokens[0]] = tokens[1]
 374
 375        self.check()
 376        self.configFile = gitdir + "/p4-git-sync.cfg"
 377        self.config = shelve.open(self.configFile, writeback=True)
 378
 379        if self.firstTime:
 380            self.start()
 381
 382        commits = self.config.get("commits", [])
 383
 384        while len(commits) > 0:
 385            self.firstTime = False
 386            commit = commits[0]
 387            commits = commits[1:]
 388            self.config["commits"] = commits
 389            self.apply(commit)
 390            if not self.interactive:
 391                break
 392
 393        self.config.close()
 394
 395        if len(commits) == 0:
 396            if self.firstTime:
 397                print "No changes found to apply between %s and current HEAD" % self.origin
 398            else:
 399                print "All changes applied!"
 400                if not self.applyAsPatch:
 401                    print "Deleting temporary p4-sync branch and going back to %s" % self.master
 402                    system("git checkout %s" % self.master)
 403                    system("git branch -D p4-sync")
 404                    print "Cleaning out your perforce checkout by doing p4 edit ... ; p4 revert ..."
 405                    system("p4 edit ... >/dev/null")
 406                    system("p4 revert ... >/dev/null")
 407                response = raw_input("Do you want to sync from Perforce now using git-p4 rebase (y/n)? ")
 408                if response == "y" or response == "yes":
 409                    os.chdir(oldWorkingDirectory)
 410                    rebase = P4Rebase()
 411                    rebase.run([])
 412            os.remove(self.configFile)
 413
 414        return True
 415
 416class P4Sync(Command):
 417    def __init__(self):
 418        Command.__init__(self)
 419        self.options = [
 420                optparse.make_option("--branch", dest="branch"),
 421                optparse.make_option("--detect-branches", dest="detectBranches", action="store_true"),
 422                optparse.make_option("--changesfile", dest="changesFile"),
 423                optparse.make_option("--silent", dest="silent", action="store_true"),
 424                optparse.make_option("--known-branches", dest="knownBranches"),
 425                optparse.make_option("--data-cache", dest="dataCache", action="store_true"),
 426                optparse.make_option("--command-cache", dest="commandCache", action="store_true"),
 427                optparse.make_option("--detect-labels", dest="detectLabels", action="store_true")
 428        ]
 429        self.description = """Imports from Perforce into a git repository.\n
 430    example:
 431    //depot/my/project/ -- to import the current head
 432    //depot/my/project/@all -- to import everything
 433    //depot/my/project/@1,6 -- to import only from revision 1 to 6
 434
 435    (a ... is not needed in the path p4 specification, it's added implicitly)"""
 436
 437        self.usage += " //depot/path[@revRange]"
 438
 439        self.dataCache = False
 440        self.commandCache = False
 441        self.silent = False
 442        self.knownBranches = Set()
 443        self.createdBranches = Set()
 444        self.committedChanges = Set()
 445        self.branch = ""
 446        self.detectBranches = False
 447        self.detectLabels = False
 448        self.changesFile = ""
 449        self.tagLastChange = True
 450
 451    def p4File(self, depotPath):
 452        return os.popen("p4 print -q \"%s\"" % depotPath, "rb").read()
 453
 454    def extractFilesFromCommit(self, commit):
 455        files = []
 456        fnum = 0
 457        while commit.has_key("depotFile%s" % fnum):
 458            path =  commit["depotFile%s" % fnum]
 459            if not path.startswith(self.globalPrefix):
 460    #            if not self.silent:
 461    #                print "\nchanged files: ignoring path %s outside of %s in change %s" % (path, self.globalPrefix, change)
 462                fnum = fnum + 1
 463                continue
 464
 465            file = {}
 466            file["path"] = path
 467            file["rev"] = commit["rev%s" % fnum]
 468            file["action"] = commit["action%s" % fnum]
 469            file["type"] = commit["type%s" % fnum]
 470            files.append(file)
 471            fnum = fnum + 1
 472        return files
 473
 474    def isSubPathOf(self, first, second):
 475        if not first.startswith(second):
 476            return False
 477        if first == second:
 478            return True
 479        return first[len(second)] == "/"
 480
 481    def branchesForCommit(self, files):
 482        branches = Set()
 483
 484        for file in files:
 485            relativePath = file["path"][len(self.globalPrefix):]
 486            # strip off the filename
 487            relativePath = relativePath[0:relativePath.rfind("/")]
 488
 489    #        if len(branches) == 0:
 490    #            branches.add(relativePath)
 491    #            knownBranches.add(relativePath)
 492    #            continue
 493
 494            ###### this needs more testing :)
 495            knownBranch = False
 496            for branch in branches:
 497                if relativePath == branch:
 498                    knownBranch = True
 499                    break
 500    #            if relativePath.startswith(branch):
 501                if self.isSubPathOf(relativePath, branch):
 502                    knownBranch = True
 503                    break
 504    #            if branch.startswith(relativePath):
 505                if self.isSubPathOf(branch, relativePath):
 506                    branches.remove(branch)
 507                    break
 508
 509            if knownBranch:
 510                continue
 511
 512            for branch in self.knownBranches:
 513                #if relativePath.startswith(branch):
 514                if self.isSubPathOf(relativePath, branch):
 515                    if len(branches) == 0:
 516                        relativePath = branch
 517                    else:
 518                        knownBranch = True
 519                    break
 520
 521            if knownBranch:
 522                continue
 523
 524            branches.add(relativePath)
 525            self.knownBranches.add(relativePath)
 526
 527        return branches
 528
 529    def findBranchParent(self, branchPrefix, files):
 530        for file in files:
 531            path = file["path"]
 532            if not path.startswith(branchPrefix):
 533                continue
 534            action = file["action"]
 535            if action != "integrate" and action != "branch":
 536                continue
 537            rev = file["rev"]
 538            depotPath = path + "#" + rev
 539
 540            log = p4CmdList("filelog \"%s\"" % depotPath)
 541            if len(log) != 1:
 542                print "eek! I got confused by the filelog of %s" % depotPath
 543                sys.exit(1);
 544
 545            log = log[0]
 546            if log["action0"] != action:
 547                print "eek! wrong action in filelog for %s : found %s, expected %s" % (depotPath, log["action0"], action)
 548                sys.exit(1);
 549
 550            branchAction = log["how0,0"]
 551    #        if branchAction == "branch into" or branchAction == "ignored":
 552    #            continue # ignore for branching
 553
 554            if not branchAction.endswith(" from"):
 555                continue # ignore for branching
 556    #            print "eek! file %s was not branched from but instead: %s" % (depotPath, branchAction)
 557    #            sys.exit(1);
 558
 559            source = log["file0,0"]
 560            if source.startswith(branchPrefix):
 561                continue
 562
 563            lastSourceRev = log["erev0,0"]
 564
 565            sourceLog = p4CmdList("filelog -m 1 \"%s%s\"" % (source, lastSourceRev))
 566            if len(sourceLog) != 1:
 567                print "eek! I got confused by the source filelog of %s%s" % (source, lastSourceRev)
 568                sys.exit(1);
 569            sourceLog = sourceLog[0]
 570
 571            relPath = source[len(self.globalPrefix):]
 572            # strip off the filename
 573            relPath = relPath[0:relPath.rfind("/")]
 574
 575            for branch in self.knownBranches:
 576                if self.isSubPathOf(relPath, branch):
 577    #                print "determined parent branch branch %s due to change in file %s" % (branch, source)
 578                    return branch
 579    #            else:
 580    #                print "%s is not a subpath of branch %s" % (relPath, branch)
 581
 582        return ""
 583
 584    def commit(self, details, files, branch, branchPrefix, parent = "", merged = ""):
 585        epoch = details["time"]
 586        author = details["user"]
 587
 588        self.gitStream.write("commit %s\n" % branch)
 589    #    gitStream.write("mark :%s\n" % details["change"])
 590        self.committedChanges.add(int(details["change"]))
 591        committer = ""
 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            self.gitStream.write("from %s\n" % parent)
 606
 607        if len(merged) > 0:
 608            self.gitStream.write("merge %s\n" % merged)
 609
 610        for file in files:
 611            path = file["path"]
 612            if not path.startswith(branchPrefix):
 613    #            if not silent:
 614    #                print "\nchanged files: ignoring path %s outside of branch prefix %s in change %s" % (path, branchPrefix, details["change"])
 615                continue
 616            rev = file["rev"]
 617            depotPath = path + "#" + rev
 618            relPath = path[len(branchPrefix):]
 619            action = file["action"]
 620
 621            if file["type"] == "apple":
 622                print "\nfile %s is a strange apple file that forks. Ignoring!" % path
 623                continue
 624
 625            if action == "delete":
 626                self.gitStream.write("D %s\n" % relPath)
 627            else:
 628                mode = 644
 629                if file["type"].startswith("x"):
 630                    mode = 755
 631
 632                data = self.p4File(depotPath)
 633
 634                self.gitStream.write("M %s inline %s\n" % (mode, relPath))
 635                self.gitStream.write("data %s\n" % len(data))
 636                self.gitStream.write(data)
 637                self.gitStream.write("\n")
 638
 639        self.gitStream.write("\n")
 640
 641        change = int(details["change"])
 642
 643        self.lastChange = change
 644
 645        if change in self.labels:
 646            label = self.labels[change]
 647            labelDetails = label[0]
 648            labelRevisions = label[1]
 649
 650            files = p4CmdList("files %s...@%s" % (branchPrefix, change))
 651
 652            if len(files) == len(labelRevisions):
 653
 654                cleanedFiles = {}
 655                for info in files:
 656                    if info["action"] == "delete":
 657                        continue
 658                    cleanedFiles[info["depotFile"]] = info["rev"]
 659
 660                if cleanedFiles == labelRevisions:
 661                    self.gitStream.write("tag tag_%s\n" % labelDetails["label"])
 662                    self.gitStream.write("from %s\n" % branch)
 663
 664                    owner = labelDetails["Owner"]
 665                    tagger = ""
 666                    if author in self.users:
 667                        tagger = "%s %s %s" % (self.users[owner], epoch, self.tz)
 668                    else:
 669                        tagger = "%s <a@b> %s %s" % (owner, epoch, self.tz)
 670                    self.gitStream.write("tagger %s\n" % tagger)
 671                    self.gitStream.write("data <<EOT\n")
 672                    self.gitStream.write(labelDetails["Description"])
 673                    self.gitStream.write("EOT\n\n")
 674
 675                else:
 676                    if not self.silent:
 677                        print "Tag %s does not match with change %s: files do not match." % (labelDetails["label"], change)
 678
 679            else:
 680                if not self.silent:
 681                    print "Tag %s does not match with change %s: file count is different." % (labelDetails["label"], change)
 682
 683    def extractFilesInCommitToBranch(self, files, branchPrefix):
 684        newFiles = []
 685
 686        for file in files:
 687            path = file["path"]
 688            if path.startswith(branchPrefix):
 689                newFiles.append(file)
 690
 691        return newFiles
 692
 693    def findBranchSourceHeuristic(self, files, branch, branchPrefix):
 694        for file in files:
 695            action = file["action"]
 696            if action != "integrate" and action != "branch":
 697                continue
 698            path = file["path"]
 699            rev = file["rev"]
 700            depotPath = path + "#" + rev
 701
 702            log = p4CmdList("filelog \"%s\"" % depotPath)
 703            if len(log) != 1:
 704                print "eek! I got confused by the filelog of %s" % depotPath
 705                sys.exit(1);
 706
 707            log = log[0]
 708            if log["action0"] != action:
 709                print "eek! wrong action in filelog for %s : found %s, expected %s" % (depotPath, log["action0"], action)
 710                sys.exit(1);
 711
 712            branchAction = log["how0,0"]
 713
 714            if not branchAction.endswith(" from"):
 715                continue # ignore for branching
 716    #            print "eek! file %s was not branched from but instead: %s" % (depotPath, branchAction)
 717    #            sys.exit(1);
 718
 719            source = log["file0,0"]
 720            if source.startswith(branchPrefix):
 721                continue
 722
 723            lastSourceRev = log["erev0,0"]
 724
 725            sourceLog = p4CmdList("filelog -m 1 \"%s%s\"" % (source, lastSourceRev))
 726            if len(sourceLog) != 1:
 727                print "eek! I got confused by the source filelog of %s%s" % (source, lastSourceRev)
 728                sys.exit(1);
 729            sourceLog = sourceLog[0]
 730
 731            relPath = source[len(self.globalPrefix):]
 732            # strip off the filename
 733            relPath = relPath[0:relPath.rfind("/")]
 734
 735            for candidate in self.knownBranches:
 736                if self.isSubPathOf(relPath, candidate) and candidate != branch:
 737                    return candidate
 738
 739        return ""
 740
 741    def changeIsBranchMerge(self, sourceBranch, destinationBranch, change):
 742        sourceFiles = {}
 743        for file in p4CmdList("files %s...@%s" % (self.globalPrefix + sourceBranch + "/", change)):
 744            if file["action"] == "delete":
 745                continue
 746            sourceFiles[file["depotFile"]] = file
 747
 748        destinationFiles = {}
 749        for file in p4CmdList("files %s...@%s" % (self.globalPrefix + destinationBranch + "/", change)):
 750            destinationFiles[file["depotFile"]] = file
 751
 752        for fileName in sourceFiles.keys():
 753            integrations = []
 754            deleted = False
 755            integrationCount = 0
 756            for integration in p4CmdList("integrated \"%s\"" % fileName):
 757                toFile = integration["fromFile"] # yes, it's true, it's fromFile
 758                if not toFile in destinationFiles:
 759                    continue
 760                destFile = destinationFiles[toFile]
 761                if destFile["action"] == "delete":
 762    #                print "file %s has been deleted in %s" % (fileName, toFile)
 763                    deleted = True
 764                    break
 765                integrationCount += 1
 766                if integration["how"] == "branch from":
 767                    continue
 768
 769                if int(integration["change"]) == change:
 770                    integrations.append(integration)
 771                    continue
 772                if int(integration["change"]) > change:
 773                    continue
 774
 775                destRev = int(destFile["rev"])
 776
 777                startRev = integration["startFromRev"][1:]
 778                if startRev == "none":
 779                    startRev = 0
 780                else:
 781                    startRev = int(startRev)
 782
 783                endRev = integration["endFromRev"][1:]
 784                if endRev == "none":
 785                    endRev = 0
 786                else:
 787                    endRev = int(endRev)
 788
 789                initialBranch = (destRev == 1 and integration["how"] != "branch into")
 790                inRange = (destRev >= startRev and destRev <= endRev)
 791                newer = (destRev > startRev and destRev > endRev)
 792
 793                if initialBranch or inRange or newer:
 794                    integrations.append(integration)
 795
 796            if deleted:
 797                continue
 798
 799            if len(integrations) == 0 and integrationCount > 1:
 800                print "file %s was not integrated from %s into %s" % (fileName, sourceBranch, destinationBranch)
 801                return False
 802
 803        return True
 804
 805    def getUserMap(self):
 806        self.users = {}
 807
 808        for output in p4CmdList("users"):
 809            if not output.has_key("User"):
 810                continue
 811            self.users[output["User"]] = output["FullName"] + " <" + output["Email"] + ">"
 812
 813    def getLabels(self):
 814        self.labels = {}
 815
 816        l = p4CmdList("labels %s..." % self.globalPrefix)
 817        if len(l) > 0 and not self.silent:
 818            print "Finding files belonging to labels in %s" % self.globalPrefix
 819
 820        for output in l:
 821            label = output["label"]
 822            revisions = {}
 823            newestChange = 0
 824            for file in p4CmdList("files //...@%s" % label):
 825                revisions[file["depotFile"]] = file["rev"]
 826                change = int(file["change"])
 827                if change > newestChange:
 828                    newestChange = change
 829
 830            self.labels[newestChange] = [output, revisions]
 831
 832    def run(self, args):
 833        self.globalPrefix = ""
 834        self.changeRange = ""
 835        self.initialParent = ""
 836
 837        if len(self.branch) == 0:
 838            self.branch = "p4"
 839
 840        if len(args) == 0:
 841            if not gitBranchExists(self.branch) and gitBranchExists("origin"):
 842                if not self.silent:
 843                    print "Creating %s branch in git repository based on origin" % self.branch
 844                system("git branch %s origin" % self.branch)
 845
 846            [self.previousDepotPath, p4Change] = extractDepotPathAndChangeFromGitLog(extractLogMessageFromGitCommit(self.branch))
 847            if len(self.previousDepotPath) > 0 and len(p4Change) > 0:
 848                p4Change = int(p4Change) + 1
 849                self.globalPrefix = self.previousDepotPath
 850                self.changeRange = "@%s,#head" % p4Change
 851                self.initialParent = self.branch
 852                self.tagLastChange = False
 853                if not self.silent:
 854                    print "Performing incremental import into %s git branch" % self.branch
 855
 856        self.branch = "refs/heads/" + self.branch
 857
 858        if len(self.globalPrefix) == 0:
 859            self.globalPrefix = self.previousDepotPath = os.popen("git repo-config --get p4.depotpath").read()
 860
 861        if len(self.globalPrefix) != 0:
 862            self.globalPrefix = self.globalPrefix[:-1]
 863
 864        if len(args) == 0 and len(self.globalPrefix) != 0:
 865            if not self.silent:
 866                print "Depot path: %s" % self.globalPrefix
 867        elif len(args) != 1:
 868            return False
 869        else:
 870            if len(self.globalPrefix) != 0 and self.globalPrefix != args[0]:
 871                print "previous import used depot path %s and now %s was specified. this doesn't work!" % (self.globalPrefix, args[0])
 872                sys.exit(1)
 873            self.globalPrefix = args[0]
 874
 875        self.revision = ""
 876        self.users = {}
 877        self.lastChange = 0
 878        self.initialTag = ""
 879
 880        if self.globalPrefix.find("@") != -1:
 881            atIdx = self.globalPrefix.index("@")
 882            self.changeRange = self.globalPrefix[atIdx:]
 883            if self.changeRange == "@all":
 884                self.changeRange = ""
 885            elif self.changeRange.find(",") == -1:
 886                self.revision = self.changeRange
 887                self.changeRange = ""
 888            self.globalPrefix = self.globalPrefix[0:atIdx]
 889        elif self.globalPrefix.find("#") != -1:
 890            hashIdx = self.globalPrefix.index("#")
 891            self.revision = self.globalPrefix[hashIdx:]
 892            self.globalPrefix = self.globalPrefix[0:hashIdx]
 893        elif len(self.previousDepotPath) == 0:
 894            self.revision = "#head"
 895
 896        if self.globalPrefix.endswith("..."):
 897            self.globalPrefix = self.globalPrefix[:-3]
 898
 899        if not self.globalPrefix.endswith("/"):
 900            self.globalPrefix += "/"
 901
 902        self.getUserMap()
 903        self.labels = {}
 904        if self.detectLabels:
 905            self.getLabels();
 906
 907        if len(self.changeRange) == 0:
 908            try:
 909                sout, sin, serr = popen2.popen3("git name-rev --tags `git rev-parse %s`" % self.branch)
 910                output = sout.read()
 911                if output.endswith("\n"):
 912                    output = output[:-1]
 913                tagIdx = output.index(" tags/p4/")
 914                caretIdx = output.find("^")
 915                endPos = len(output)
 916                if caretIdx != -1:
 917                    endPos = caretIdx
 918                self.rev = int(output[tagIdx + 9 : endPos]) + 1
 919                self.changeRange = "@%s,#head" % self.rev
 920                self.initialParent = os.popen("git rev-parse %s" % self.branch).read()[:-1]
 921                self.initialTag = "p4/%s" % (int(self.rev) - 1)
 922            except:
 923                pass
 924
 925        self.tz = "%+03d%02d" % (- time.timezone / 3600, ((- time.timezone % 3600) / 60))
 926
 927        self.gitOutput, self.gitStream, self.gitError = popen2.popen3("git fast-import")
 928
 929        if len(self.revision) > 0:
 930            print "Doing initial import of %s from revision %s" % (self.globalPrefix, self.revision)
 931
 932            details = { "user" : "git perforce import user", "time" : int(time.time()) }
 933            details["desc"] = "Initial import of %s from the state at revision %s" % (self.globalPrefix, self.revision)
 934            details["change"] = self.revision
 935            newestRevision = 0
 936
 937            fileCnt = 0
 938            for info in p4CmdList("files %s...%s" % (self.globalPrefix, self.revision)):
 939                change = int(info["change"])
 940                if change > newestRevision:
 941                    newestRevision = change
 942
 943                if info["action"] == "delete":
 944                    # don't increase the file cnt, otherwise details["depotFile123"] will have gaps!
 945                    #fileCnt = fileCnt + 1
 946                    continue
 947
 948                for prop in [ "depotFile", "rev", "action", "type" ]:
 949                    details["%s%s" % (prop, fileCnt)] = info[prop]
 950
 951                fileCnt = fileCnt + 1
 952
 953            details["change"] = newestRevision
 954
 955            try:
 956                self.commit(details, self.extractFilesFromCommit(details), self.branch, self.globalPrefix)
 957            except IOError:
 958                print "IO error with git fast-import. Is your git version recent enough?"
 959                print self.gitError.read()
 960
 961        else:
 962            changes = []
 963
 964            if len(self.changesFile) > 0:
 965                output = open(self.changesFile).readlines()
 966                changeSet = Set()
 967                for line in output:
 968                    changeSet.add(int(line))
 969
 970                for change in changeSet:
 971                    changes.append(change)
 972
 973                changes.sort()
 974            else:
 975                output = os.popen("p4 changes %s...%s" % (self.globalPrefix, self.changeRange)).readlines()
 976
 977                for line in output:
 978                    changeNum = line.split(" ")[1]
 979                    changes.append(changeNum)
 980
 981                changes.reverse()
 982
 983            if len(changes) == 0:
 984                if not self.silent:
 985                    print "no changes to import!"
 986                return True
 987
 988            cnt = 1
 989            for change in changes:
 990                description = p4Cmd("describe %s" % change)
 991
 992                if not self.silent:
 993                    sys.stdout.write("\rimporting revision %s (%s%%)" % (change, cnt * 100 / len(changes)))
 994                    sys.stdout.flush()
 995                cnt = cnt + 1
 996
 997                try:
 998                    files = self.extractFilesFromCommit(description)
 999                    if self.detectBranches:
1000                        for branch in self.branchesForCommit(files):
1001                            self.knownBranches.add(branch)
1002                            branchPrefix = self.globalPrefix + branch + "/"
1003
1004                            filesForCommit = self.extractFilesInCommitToBranch(files, branchPrefix)
1005
1006                            merged = ""
1007                            parent = ""
1008                            ########### remove cnt!!!
1009                            if branch not in self.createdBranches and cnt > 2:
1010                                self.createdBranches.add(branch)
1011                                parent = self.findBranchParent(branchPrefix, files)
1012                                if parent == branch:
1013                                    parent = ""
1014            #                    elif len(parent) > 0:
1015            #                        print "%s branched off of %s" % (branch, parent)
1016
1017                            if len(parent) == 0:
1018                                merged = self.findBranchSourceHeuristic(filesForCommit, branch, branchPrefix)
1019                                if len(merged) > 0:
1020                                    print "change %s could be a merge from %s into %s" % (description["change"], merged, branch)
1021                                    if not self.changeIsBranchMerge(merged, branch, int(description["change"])):
1022                                        merged = ""
1023
1024                            branch = "refs/heads/" + branch
1025                            if len(parent) > 0:
1026                                parent = "refs/heads/" + parent
1027                            if len(merged) > 0:
1028                                merged = "refs/heads/" + merged
1029                            self.commit(description, files, branch, branchPrefix, parent, merged)
1030                    else:
1031                        self.commit(description, files, self.branch, self.globalPrefix, self.initialParent)
1032                        self.initialParent = ""
1033                except IOError:
1034                    print self.gitError.read()
1035                    sys.exit(1)
1036
1037        if not self.silent:
1038            print ""
1039
1040        if self.tagLastChange:
1041            self.gitStream.write("reset refs/tags/p4/%s\n" % self.lastChange)
1042            self.gitStream.write("from %s\n\n" % self.branch);
1043
1044
1045        self.gitStream.close()
1046        self.gitOutput.close()
1047        self.gitError.close()
1048
1049        os.popen("git repo-config p4.depotpath %s" % self.globalPrefix).read()
1050        if len(self.initialTag) > 0:
1051            os.popen("git tag -d %s" % self.initialTag).read()
1052
1053        return True
1054
1055class P4Rebase(Command):
1056    def __init__(self):
1057        Command.__init__(self)
1058        self.options = [ ]
1059        self.description = "Fetches the latest revision from perforce and rebases the current work (branch) against it"
1060
1061    def run(self, args):
1062        sync = P4Sync()
1063        sync.run([])
1064        print "Rebasing the current branch"
1065        oldHead = os.popen("git rev-parse HEAD").read()[:-1]
1066        system("git rebase p4")
1067        system("git diff-tree --stat --summary -M %s HEAD" % oldHead)
1068        return True
1069
1070class P4Clone(P4Sync):
1071    def __init__(self):
1072        P4Sync.__init__(self)
1073        self.description = "Creates a new git repository and imports from Perforce into it"
1074        self.usage = "usage: %prog [options] //depot/path[@revRange] [directory]"
1075        self.needsGit = False
1076        self.tagLastChange = False
1077
1078    def run(self, args):
1079        if len(args) < 1:
1080            return False
1081        depotPath = args[0]
1082        dir = ""
1083        if len(args) == 2:
1084            dir = args[1]
1085        elif len(args) > 2:
1086            return False
1087
1088        if not depotPath.startswith("//"):
1089            return False
1090
1091        if len(dir) == 0:
1092            dir = depotPath
1093            atPos = dir.rfind("@")
1094            if atPos != -1:
1095                dir = dir[0:atPos]
1096            hashPos = dir.rfind("#")
1097            if hashPos != -1:
1098                dir = dir[0:hashPos]
1099
1100            if dir.endswith("..."):
1101                dir = dir[:-3]
1102
1103            if dir.endswith("/"):
1104               dir = dir[:-1]
1105
1106            slashPos = dir.rfind("/")
1107            if slashPos != -1:
1108                dir = dir[slashPos + 1:]
1109
1110        print "Importing from %s into %s" % (depotPath, dir)
1111        os.makedirs(dir)
1112        os.chdir(dir)
1113        system("git init")
1114        if not P4Sync.run(self, [depotPath]):
1115            return False
1116        os.wait()
1117        if self.branch != "master":
1118            system("git branch master p4")
1119            system("git checkout -f")
1120        return True
1121
1122class HelpFormatter(optparse.IndentedHelpFormatter):
1123    def __init__(self):
1124        optparse.IndentedHelpFormatter.__init__(self)
1125
1126    def format_description(self, description):
1127        if description:
1128            return description + "\n"
1129        else:
1130            return ""
1131
1132def printUsage(commands):
1133    print "usage: %s <command> [options]" % sys.argv[0]
1134    print ""
1135    print "valid commands: %s" % ", ".join(commands)
1136    print ""
1137    print "Try %s <command> --help for command specific help." % sys.argv[0]
1138    print ""
1139
1140commands = {
1141    "debug" : P4Debug(),
1142    "clean-tags" : P4CleanTags(),
1143    "submit" : P4Submit(),
1144    "sync" : P4Sync(),
1145    "rebase" : P4Rebase(),
1146    "clone" : P4Clone()
1147}
1148
1149if len(sys.argv[1:]) == 0:
1150    printUsage(commands.keys())
1151    sys.exit(2)
1152
1153cmd = ""
1154cmdName = sys.argv[1]
1155try:
1156    cmd = commands[cmdName]
1157except KeyError:
1158    print "unknown command %s" % cmdName
1159    print ""
1160    printUsage(commands.keys())
1161    sys.exit(2)
1162
1163options = cmd.options
1164cmd.gitdir = gitdir
1165
1166args = sys.argv[2:]
1167
1168if len(options) > 0:
1169    options.append(optparse.make_option("--git-dir", dest="gitdir"))
1170
1171    parser = optparse.OptionParser(cmd.usage.replace("%prog", "%prog " + cmdName),
1172                                   options,
1173                                   description = cmd.description,
1174                                   formatter = HelpFormatter())
1175
1176    (cmd, args) = parser.parse_args(sys.argv[2:], cmd);
1177
1178if cmd.needsGit:
1179    gitdir = cmd.gitdir
1180    if len(gitdir) == 0:
1181        gitdir = ".git"
1182        if not isValidGitDir(gitdir):
1183            cdup = os.popen("git rev-parse --show-cdup").read()[:-1]
1184            if isValidGitDir(cdup + "/" + gitdir):
1185                os.chdir(cdup)
1186
1187    if not isValidGitDir(gitdir):
1188        if isValidGitDir(gitdir + "/.git"):
1189            gitdir += "/.git"
1190        else:
1191            die("fatal: cannot locate git repository at %s" % gitdir)
1192
1193    os.environ["GIT_DIR"] = gitdir
1194
1195if not cmd.run(args):
1196    parser.print_help()
1197