Andrew's git - gitweb.git/blob

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