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