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