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