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
  11 import optparse, sys, os, marshal, popen2, subprocess, shelve
  12 import tempfile, getopt, sha, os.path, time, platform
  13 from sets import Set;
  14
  15 gitdir = os.environ.get("GIT_DIR", "")
  16
  17 def mypopen(command):
  18     return os.popen(command, "rb");
  19
  20 def 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
  35 def p4Cmd(cmd):
  36     list = p4CmdList(cmd)
  37     result = {}
  38     for entry in list:
  39         result.update(entry)
  40     return result;
  41
  42 def 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
  58 def die(msg):
  59     sys.stderr.write(msg + "\n")
  60     sys.exit(1)
  61
  62 def currentGitBranch():
  63     return mypopen("git name-rev HEAD").read().split(" ")[1][:-1]
  64
  65 def 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
  70 def parseRevision(ref):
  71     return mypopen("git rev-parse %s" % ref).read()[:-1]
  72
  73 def system(cmd):
  74     if os.system(cmd) != 0:
  75         die("command failed: %s" % cmd)
  76
  77 def 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
  89 def 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
 108 def gitBranchExists(branch):
 109     proc = subprocess.Popen(["git", "rev-parse", branch], stderr=subprocess.PIPE, stdout=subprocess.PIPE);
 110     return proc.wait() == 0;
 111
 112 class Command:
 113     def __init__(self):
 114         self.usage = "usage: %prog [options]"
 115         self.needsGit = True
 116
 117 class 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
 130 class 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
 409 class 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 branchesForCommit(self, files):
 465         branches = Set()
 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                     branches.add(branch)
 473
 474         return branches
 475
 476     def commit(self, details, files, branch, branchPrefix, parent = ""):
 477         epoch = details["time"]
 478         author = details["user"]
 479
 480         if self.verbose:
 481             print "commit into %s" % branch
 482
 483         self.gitStream.write("commit %s\n" % branch)
 484     #    gitStream.write("mark :%s\n" % details["change"])
 485         self.committedChanges.add(int(details["change"]))
 486         committer = ""
 487         if author in self.users:
 488             committer = "%s %s %s" % (self.users[author], epoch, self.tz)
 489         else:
 490             committer = "%s <a@b> %s %s" % (author, epoch, self.tz)
 491
 492         self.gitStream.write("committer %s\n" % committer)
 493
 494         self.gitStream.write("data <<EOT\n")
 495         self.gitStream.write(details["desc"])
 496         self.gitStream.write("\n[git-p4: depot-path = \"%s\": change = %s]\n" % (branchPrefix, details["change"]))
 497         self.gitStream.write("EOT\n\n")
 498
 499         if len(parent) > 0:
 500             if self.verbose:
 501                 print "parent %s" % parent
 502             self.gitStream.write("from %s\n" % parent)
 503
 504         for file in files:
 505             path = file["path"]
 506             if not path.startswith(branchPrefix):
 507     #            if not silent:
 508     #                print "\nchanged files: ignoring path %s outside of branch prefix %s in change %s" % (path, branchPrefix, details["change"])
 509                 continue
 510             rev = file["rev"]
 511             depotPath = path + "#" + rev
 512             relPath = path[len(branchPrefix):]
 513             action = file["action"]
 514
 515             if file["type"] == "apple":
 516                 print "\nfile %s is a strange apple file that forks. Ignoring!" % path
 517                 continue
 518
 519             if action == "delete":
 520                 self.gitStream.write("D %s\n" % relPath)
 521             else:
 522                 mode = 644
 523                 if file["type"].startswith("x"):
 524                     mode = 755
 525
 526                 data = self.p4File(depotPath)
 527
 528                 self.gitStream.write("M %s inline %s\n" % (mode, relPath))
 529                 self.gitStream.write("data %s\n" % len(data))
 530                 self.gitStream.write(data)
 531                 self.gitStream.write("\n")
 532
 533         self.gitStream.write("\n")
 534
 535         change = int(details["change"])
 536
 537         self.lastChange = change
 538
 539         if change in self.labels:
 540             label = self.labels[change]
 541             labelDetails = label[0]
 542             labelRevisions = label[1]
 543
 544             files = p4CmdList("files %s...@%s" % (branchPrefix, change))
 545
 546             if len(files) == len(labelRevisions):
 547
 548                 cleanedFiles = {}
 549                 for info in files:
 550                     if info["action"] == "delete":
 551                         continue
 552                     cleanedFiles[info["depotFile"]] = info["rev"]
 553
 554                 if cleanedFiles == labelRevisions:
 555                     self.gitStream.write("tag tag_%s\n" % labelDetails["label"])
 556                     self.gitStream.write("from %s\n" % branch)
 557
 558                     owner = labelDetails["Owner"]
 559                     tagger = ""
 560                     if author in self.users:
 561                         tagger = "%s %s %s" % (self.users[owner], epoch, self.tz)
 562                     else:
 563                         tagger = "%s <a@b> %s %s" % (owner, epoch, self.tz)
 564                     self.gitStream.write("tagger %s\n" % tagger)
 565                     self.gitStream.write("data <<EOT\n")
 566                     self.gitStream.write(labelDetails["Description"])
 567                     self.gitStream.write("EOT\n\n")
 568
 569                 else:
 570                     if not self.silent:
 571                         print "Tag %s does not match with change %s: files do not match." % (labelDetails["label"], change)
 572
 573             else:
 574                 if not self.silent:
 575                     print "Tag %s does not match with change %s: file count is different." % (labelDetails["label"], change)
 576
 577     def extractFilesInCommitToBranch(self, files, branchPrefix):
 578         newFiles = []
 579
 580         for file in files:
 581             path = file["path"]
 582             if path.startswith(branchPrefix):
 583                 newFiles.append(file)
 584
 585         return newFiles
 586
 587     def getUserMap(self):
 588         self.users = {}
 589
 590         for output in p4CmdList("users"):
 591             if not output.has_key("User"):
 592                 continue
 593             self.users[output["User"]] = output["FullName"] + " <" + output["Email"] + ">"
 594
 595     def getLabels(self):
 596         self.labels = {}
 597
 598         l = p4CmdList("labels %s..." % self.depotPath)
 599         if len(l) > 0 and not self.silent:
 600             print "Finding files belonging to labels in %s" % self.depotPath
 601
 602         for output in l:
 603             label = output["label"]
 604             revisions = {}
 605             newestChange = 0
 606             for file in p4CmdList("files //...@%s" % label):
 607                 revisions[file["depotFile"]] = file["rev"]
 608                 change = int(file["change"])
 609                 if change > newestChange:
 610                     newestChange = change
 611
 612             self.labels[newestChange] = [output, revisions]
 613
 614     def getBranchMapping(self):
 615         self.projectName = self.depotPath[self.depotPath[:-1].rfind("/") + 1:]
 616
 617         for info in p4CmdList("branches"):
 618             details = p4Cmd("branch -o %s" % info["branch"])
 619             viewIdx = 0
 620             while details.has_key("View%s" % viewIdx):
 621                 paths = details["View%s" % viewIdx].split(" ")
 622                 viewIdx = viewIdx + 1
 623                 # require standard //depot/foo/... //depot/bar/... mapping
 624                 if len(paths) != 2 or not paths[0].endswith("/...") or not paths[1].endswith("/..."):
 625                     continue
 626                 source = paths[0]
 627                 destination = paths[1]
 628                 if source.startswith(self.depotPath) and destination.startswith(self.depotPath):
 629                     source = source[len(self.depotPath):-4]
 630                     destination = destination[len(self.depotPath):-4]
 631                     if destination not in self.knownBranches:
 632                         self.knownBranches[destination] = source
 633                     if source not in self.knownBranches:
 634                         self.knownBranches[source] = source
 635
 636     def listExistingP4GitBranches(self):
 637         self.p4BranchesInGit = []
 638
 639         for line in mypopen("git rev-parse --symbolic --remotes").readlines():
 640             if line.startswith("p4/") and line != "p4/HEAD\n":
 641                 branch = line[3:-1]
 642                 self.p4BranchesInGit.append(branch)
 643                 self.initialParents["refs/remotes/p4/" + branch] = parseRevision(line[:-1])
 644
 645     def run(self, args):
 646         self.depotPath = ""
 647         self.changeRange = ""
 648         self.initialParent = ""
 649         self.previousDepotPath = ""
 650         # map from branch depot path to parent branch
 651         self.knownBranches = {}
 652         self.initialParents = {}
 653
 654         self.listExistingP4GitBranches()
 655
 656         if self.syncWithOrigin and gitBranchExists("origin") and gitBranchExists("refs/remotes/p4/master") and not self.detectBranches:
 657             ### needs to be ported to multi branch import
 658
 659             print "Syncing with origin first as requested by calling git fetch origin"
 660             system("git fetch origin")
 661             [originPreviousDepotPath, originP4Change] = extractDepotPathAndChangeFromGitLog(extractLogMessageFromGitCommit("origin"))
 662             [p4PreviousDepotPath, p4Change] = extractDepotPathAndChangeFromGitLog(extractLogMessageFromGitCommit("p4"))
 663             if len(originPreviousDepotPath) > 0 and len(originP4Change) > 0 and len(p4Change) > 0:
 664                 if originPreviousDepotPath == p4PreviousDepotPath:
 665                     originP4Change = int(originP4Change)
 666                     p4Change = int(p4Change)
 667                     if originP4Change > p4Change:
 668                         print "origin (%s) is newer than p4 (%s). Updating p4 branch from origin." % (originP4Change, p4Change)
 669                         system("git update-ref refs/remotes/p4/master origin");
 670                 else:
 671                     print "Cannot sync with origin. It was imported from %s while remotes/p4 was imported from %s" % (originPreviousDepotPath, p4PreviousDepotPath)
 672
 673         if len(self.branch) == 0:
 674             self.branch = "refs/remotes/p4/master"
 675             if gitBranchExists("refs/heads/p4"):
 676                 system("git update-ref %s refs/heads/p4" % self.branch)
 677                 system("git branch -D p4");
 678             if not gitBranchExists("refs/remotes/p4/HEAD"):
 679                 system("git symbolic-ref refs/remotes/p4/HEAD %s" % self.branch)
 680
 681         if len(args) == 0:
 682             if not gitBranchExists(self.branch) and gitBranchExists("origin") and not self.detectBranches:
 683                 ### needs to be ported to multi branch import
 684                 if not self.silent:
 685                     print "Creating %s branch in git repository based on origin" % self.branch
 686                 branch = self.branch
 687                 if not branch.startswith("refs"):
 688                     branch = "refs/heads/" + branch
 689                 system("git update-ref %s origin" % branch)
 690
 691             if self.verbose:
 692                 print "branches: %s" % self.p4BranchesInGit
 693
 694             p4Change = 0
 695             for branch in self.p4BranchesInGit:
 696                 depotPath, change = extractDepotPathAndChangeFromGitLog(extractLogMessageFromGitCommit("refs/remotes/p4/" + branch))
 697
 698                 if self.verbose:
 699                     print "path %s change %s" % (depotPath, change)
 700
 701                 if len(depotPath) > 0 and len(change) > 0:
 702                     change = int(change) + 1
 703                     p4Change = max(p4Change, change)
 704
 705                     if len(self.previousDepotPath) == 0:
 706                         self.previousDepotPath = depotPath
 707                     else:
 708                         i = 0
 709                         l = min(len(self.previousDepotPath), len(depotPath))
 710                         while i < l and self.previousDepotPath[i] == depotPath[i]:
 711                             i = i + 1
 712                         self.previousDepotPath = self.previousDepotPath[:i]
 713
 714             if p4Change > 0:
 715                 self.depotPath = self.previousDepotPath
 716                 #self.changeRange = "@%s,#head" % p4Change
 717                 self.changeRange = "@%s,%s" % (p4Change, p4Change + 10)
 718                 self.initialParent = parseRevision(self.branch)
 719                 if not self.silent:
 720                     print "Performing incremental import into %s git branch" % self.branch
 721
 722         if not self.branch.startswith("refs/"):
 723             self.branch = "refs/heads/" + self.branch
 724
 725         if len(self.depotPath) != 0:
 726             self.depotPath = self.depotPath[:-1]
 727
 728         if len(args) == 0 and len(self.depotPath) != 0:
 729             if not self.silent:
 730                 print "Depot path: %s" % self.depotPath
 731         elif len(args) != 1:
 732             return False
 733         else:
 734             if len(self.depotPath) != 0 and self.depotPath != args[0]:
 735                 print "previous import used depot path %s and now %s was specified. this doesn't work!" % (self.depotPath, args[0])
 736                 sys.exit(1)
 737             self.depotPath = args[0]
 738
 739         self.revision = ""
 740         self.users = {}
 741         self.lastChange = 0
 742
 743         if self.depotPath.find("@") != -1:
 744             atIdx = self.depotPath.index("@")
 745             self.changeRange = self.depotPath[atIdx:]
 746             if self.changeRange == "@all":
 747                 self.changeRange = ""
 748             elif self.changeRange.find(",") == -1:
 749                 self.revision = self.changeRange
 750                 self.changeRange = ""
 751             self.depotPath = self.depotPath[0:atIdx]
 752         elif self.depotPath.find("#") != -1:
 753             hashIdx = self.depotPath.index("#")
 754             self.revision = self.depotPath[hashIdx:]
 755             self.depotPath = self.depotPath[0:hashIdx]
 756         elif len(self.previousDepotPath) == 0:
 757             self.revision = "#head"
 758
 759         if self.depotPath.endswith("..."):
 760             self.depotPath = self.depotPath[:-3]
 761
 762         if not self.depotPath.endswith("/"):
 763             self.depotPath += "/"
 764
 765         self.getUserMap()
 766         self.labels = {}
 767         if self.detectLabels:
 768             self.getLabels();
 769
 770         if self.detectBranches:
 771             self.getBranchMapping();
 772             if self.verbose:
 773                 print "p4-git branches: %s" % self.p4BranchesInGit
 774                 print "initial parents: %s" % self.initialParents
 775             for b in self.p4BranchesInGit:
 776                 if b != "master":
 777                     b = b[len(self.projectName):]
 778                 self.createdBranches.add(b)
 779
 780         self.tz = "%+03d%02d" % (- time.timezone / 3600, ((- time.timezone % 3600) / 60))
 781
 782         importProcess = subprocess.Popen(["git", "fast-import"], stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE);
 783         self.gitOutput = importProcess.stdout
 784         self.gitStream = importProcess.stdin
 785         self.gitError = importProcess.stderr
 786
 787         if len(self.revision) > 0:
 788             print "Doing initial import of %s from revision %s" % (self.depotPath, self.revision)
 789
 790             details = { "user" : "git perforce import user", "time" : int(time.time()) }
 791             details["desc"] = "Initial import of %s from the state at revision %s" % (self.depotPath, self.revision)
 792             details["change"] = self.revision
 793             newestRevision = 0
 794
 795             fileCnt = 0
 796             for info in p4CmdList("files %s...%s" % (self.depotPath, self.revision)):
 797                 change = int(info["change"])
 798                 if change > newestRevision:
 799                     newestRevision = change
 800
 801                 if info["action"] == "delete":
 802                     # don't increase the file cnt, otherwise details["depotFile123"] will have gaps!
 803                     #fileCnt = fileCnt + 1
 804                     continue
 805
 806                 for prop in [ "depotFile", "rev", "action", "type" ]:
 807                     details["%s%s" % (prop, fileCnt)] = info[prop]
 808
 809                 fileCnt = fileCnt + 1
 810
 811             details["change"] = newestRevision
 812
 813             try:
 814                 self.commit(details, self.extractFilesFromCommit(details), self.branch, self.depotPath)
 815             except IOError:
 816                 print "IO error with git fast-import. Is your git version recent enough?"
 817                 print self.gitError.read()
 818
 819         else:
 820             changes = []
 821
 822             if len(self.changesFile) > 0:
 823                 output = open(self.changesFile).readlines()
 824                 changeSet = Set()
 825                 for line in output:
 826                     changeSet.add(int(line))
 827
 828                 for change in changeSet:
 829                     changes.append(change)
 830
 831                 changes.sort()
 832             else:
 833                 if self.verbose:
 834                     print "Getting p4 changes for %s...%s" % (self.depotPath, self.changeRange)
 835                 output = mypopen("p4 changes %s...%s" % (self.depotPath, self.changeRange)).readlines()
 836
 837                 for line in output:
 838                     changeNum = line.split(" ")[1]
 839                     changes.append(changeNum)
 840
 841                 changes.reverse()
 842
 843             if len(changes) == 0:
 844                 if not self.silent:
 845                     print "no changes to import!"
 846                 return True
 847
 848             cnt = 1
 849             for change in changes:
 850                 description = p4Cmd("describe %s" % change)
 851
 852                 if not self.silent:
 853                     sys.stdout.write("\rimporting revision %s (%s%%)" % (change, cnt * 100 / len(changes)))
 854                     sys.stdout.flush()
 855                 cnt = cnt + 1
 856
 857                 try:
 858                     files = self.extractFilesFromCommit(description)
 859                     if self.detectBranches:
 860                         for branch in self.branchesForCommit(files):
 861                             branchPrefix = self.depotPath + branch + "/"
 862
 863                             parent = ""
 864
 865                             filesForCommit = self.extractFilesInCommitToBranch(files, branch)
 866
 867                             if self.verbose:
 868                                 print "branch is %s" % branch
 869
 870                             if branch not in self.createdBranches:
 871                                 self.createdBranches.add(branch)
 872                                 parent = self.knownBranches[branch]
 873                                 if parent == branch:
 874                                     parent = ""
 875                                 elif self.verbose:
 876                                     print "parent determined through known branches: %s" % parent
 877
 878                             # main branch? use master
 879                             if branch == "main":
 880                                 branch = "master"
 881                             else:
 882                                 branch = self.projectName + branch
 883
 884                             if parent == "main":
 885                                 parent = "master"
 886                             elif len(parent) > 0:
 887                                 parent = self.projectName + parent
 888
 889                             branch = "refs/remotes/p4/" + branch
 890                             if len(parent) > 0:
 891                                 parent = "refs/remotes/p4/" + parent
 892
 893                             if self.verbose:
 894                                 print "looking for initial parent for %s; current parent is %s" % (branch, parent)
 895
 896                             if len(parent) == 0 and branch in self.initialParents:
 897                                 parent = self.initialParents[branch]
 898                                 del self.initialParents[branch]
 899
 900                             self.commit(description, files, branch, branchPrefix, parent)
 901                     else:
 902                         self.commit(description, files, self.branch, self.depotPath, self.initialParent)
 903                         self.initialParent = ""
 904                 except IOError:
 905                     print self.gitError.read()
 906                     sys.exit(1)
 907
 908         if not self.silent:
 909             print ""
 910
 911
 912         self.gitStream.close()
 913         if importProcess.wait() != 0:
 914             die("fast-import failed: %s" % self.gitError.read())
 915         self.gitOutput.close()
 916         self.gitError.close()
 917
 918         return True
 919
 920 class P4Rebase(Command):
 921     def __init__(self):
 922         Command.__init__(self)
 923         self.options = [ optparse.make_option("--with-origin", dest="syncWithOrigin", action="store_true") ]
 924         self.description = "Fetches the latest revision from perforce and rebases the current work (branch) against it"
 925         self.syncWithOrigin = False
 926
 927     def run(self, args):
 928         sync = P4Sync()
 929         sync.syncWithOrigin = self.syncWithOrigin
 930         sync.run([])
 931         print "Rebasing the current branch"
 932         oldHead = mypopen("git rev-parse HEAD").read()[:-1]
 933         system("git rebase p4")
 934         system("git diff-tree --stat --summary -M %s HEAD" % oldHead)
 935         return True
 936
 937 class P4Clone(P4Sync):
 938     def __init__(self):
 939         P4Sync.__init__(self)
 940         self.description = "Creates a new git repository and imports from Perforce into it"
 941         self.usage = "usage: %prog [options] //depot/path[@revRange] [directory]"
 942         self.needsGit = False
 943
 944     def run(self, args):
 945         if len(args) < 1:
 946             return False
 947         depotPath = args[0]
 948         dir = ""
 949         if len(args) == 2:
 950             dir = args[1]
 951         elif len(args) > 2:
 952             return False
 953
 954         if not depotPath.startswith("//"):
 955             return False
 956
 957         if len(dir) == 0:
 958             dir = depotPath
 959             atPos = dir.rfind("@")
 960             if atPos != -1:
 961                 dir = dir[0:atPos]
 962             hashPos = dir.rfind("#")
 963             if hashPos != -1:
 964                 dir = dir[0:hashPos]
 965
 966             if dir.endswith("..."):
 967                 dir = dir[:-3]
 968
 969             if dir.endswith("/"):
 970                dir = dir[:-1]
 971
 972             slashPos = dir.rfind("/")
 973             if slashPos != -1:
 974                 dir = dir[slashPos + 1:]
 975
 976         print "Importing from %s into %s" % (depotPath, dir)
 977         os.makedirs(dir)
 978         os.chdir(dir)
 979         system("git init")
 980         if not P4Sync.run(self, [depotPath]):
 981             return False
 982         if self.branch != "master":
 983             if gitBranchExists("refs/remotes/p4/master"):
 984                 system("git branch master refs/remotes/p4/master")
 985                 system("git checkout -f")
 986             else:
 987                 print "Could not detect main branch. No checkout/master branch created."
 988         return True
 989
 990 class HelpFormatter(optparse.IndentedHelpFormatter):
 991     def __init__(self):
 992         optparse.IndentedHelpFormatter.__init__(self)
 993
 994     def format_description(self, description):
 995         if description:
 996             return description + "\n"
 997         else:
 998             return ""
 999
1000 def printUsage(commands):
1001     print "usage: %s <command> [options]" % sys.argv[0]
1002     print ""
1003     print "valid commands: %s" % ", ".join(commands)
1004     print ""
1005     print "Try %s <command> --help for command specific help." % sys.argv[0]
1006     print ""
1007
1008 commands = {
1009     "debug" : P4Debug(),
1010     "submit" : P4Submit(),
1011     "sync" : P4Sync(),
1012     "rebase" : P4Rebase(),
1013     "clone" : P4Clone()
1014 }
1015
1016 if len(sys.argv[1:]) == 0:
1017     printUsage(commands.keys())
1018     sys.exit(2)
1019
1020 cmd = ""
1021 cmdName = sys.argv[1]
1022 try:
1023     cmd = commands[cmdName]
1024 except KeyError:
1025     print "unknown command %s" % cmdName
1026     print ""
1027     printUsage(commands.keys())
1028     sys.exit(2)
1029
1030 options = cmd.options
1031 cmd.gitdir = gitdir
1032
1033 args = sys.argv[2:]
1034
1035 if len(options) > 0:
1036     options.append(optparse.make_option("--git-dir", dest="gitdir"))
1037
1038     parser = optparse.OptionParser(cmd.usage.replace("%prog", "%prog " + cmdName),
1039                                    options,
1040                                    description = cmd.description,
1041                                    formatter = HelpFormatter())
1042
1043     (cmd, args) = parser.parse_args(sys.argv[2:], cmd);
1044
1045 if cmd.needsGit:
1046     gitdir = cmd.gitdir
1047     if len(gitdir) == 0:
1048         gitdir = ".git"
1049         if not isValidGitDir(gitdir):
1050             gitdir = mypopen("git rev-parse --git-dir").read()[:-1]
1051             if os.path.exists(gitdir):
1052                 cdup = mypopen("git rev-parse --show-cdup").read()[:-1];
1053                 if len(cdup) > 0:
1054                     os.chdir(cdup);
1055
1056     if not isValidGitDir(gitdir):
1057         if isValidGitDir(gitdir + "/.git"):
1058             gitdir += "/.git"
1059         else:
1060             die("fatal: cannot locate git repository at %s" % gitdir)
1061
1062     os.environ["GIT_DIR"] = gitdir
1063
1064 if not cmd.run(args):
1065     parser.print_help()
1066