Andrew's git - gitweb.git/blob - contrib/fast-import/git-p4

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