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("--known-branches", dest="knownBranches"),
 418                 optparse.make_option("--data-cache", dest="dataCache", action="store_true"),
 419                 optparse.make_option("--command-cache", dest="commandCache", action="store_true"),
 420                 optparse.make_option("--detect-labels", dest="detectLabels", action="store_true"),
 421                 optparse.make_option("--with-origin", dest="syncWithOrigin", action="store_true")
 422         ]
 423         self.description = """Imports from Perforce into a git repository.\n
 424     example:
 425     //depot/my/project/ -- to import the current head
 426     //depot/my/project/@all -- to import everything
 427     //depot/my/project/@1,6 -- to import only from revision 1 to 6
 428
 429     (a ... is not needed in the path p4 specification, it's added implicitly)"""
 430
 431         self.usage += " //depot/path[@revRange]"
 432
 433         self.dataCache = False
 434         self.commandCache = False
 435         self.silent = False
 436         self.knownBranches = Set()
 437         self.createdBranches = Set()
 438         self.committedChanges = Set()
 439         self.branch = ""
 440         self.detectBranches = False
 441         self.detectLabels = False
 442         self.changesFile = ""
 443         self.syncWithOrigin = False
 444
 445     def p4File(self, depotPath):
 446         return os.popen("p4 print -q \"%s\"" % depotPath, "rb").read()
 447
 448     def extractFilesFromCommit(self, commit):
 449         files = []
 450         fnum = 0
 451         while commit.has_key("depotFile%s" % fnum):
 452             path =  commit["depotFile%s" % fnum]
 453             if not path.startswith(self.depotPath):
 454     #            if not self.silent:
 455     #                print "\nchanged files: ignoring path %s outside of %s in change %s" % (path, self.depotPath, change)
 456                 fnum = fnum + 1
 457                 continue
 458
 459             file = {}
 460             file["path"] = path
 461             file["rev"] = commit["rev%s" % fnum]
 462             file["action"] = commit["action%s" % fnum]
 463             file["type"] = commit["type%s" % fnum]
 464             files.append(file)
 465             fnum = fnum + 1
 466         return files
 467
 468     def isSubPathOf(self, first, second):
 469         if not first.startswith(second):
 470             return False
 471         if first == second:
 472             return True
 473         return first[len(second)] == "/"
 474
 475     def branchesForCommit(self, files):
 476         branches = Set()
 477
 478         for file in files:
 479             relativePath = file["path"][len(self.depotPath):]
 480             # strip off the filename
 481             relativePath = relativePath[0:relativePath.rfind("/")]
 482
 483     #        if len(branches) == 0:
 484     #            branches.add(relativePath)
 485     #            knownBranches.add(relativePath)
 486     #            continue
 487
 488             ###### this needs more testing :)
 489             knownBranch = False
 490             for branch in branches:
 491                 if relativePath == branch:
 492                     knownBranch = True
 493                     break
 494     #            if relativePath.startswith(branch):
 495                 if self.isSubPathOf(relativePath, branch):
 496                     knownBranch = True
 497                     break
 498     #            if branch.startswith(relativePath):
 499                 if self.isSubPathOf(branch, relativePath):
 500                     branches.remove(branch)
 501                     break
 502
 503             if knownBranch:
 504                 continue
 505
 506             for branch in self.knownBranches:
 507                 #if relativePath.startswith(branch):
 508                 if self.isSubPathOf(relativePath, branch):
 509                     if len(branches) == 0:
 510                         relativePath = branch
 511                     else:
 512                         knownBranch = True
 513                     break
 514
 515             if knownBranch:
 516                 continue
 517
 518             branches.add(relativePath)
 519             self.knownBranches.add(relativePath)
 520
 521         return branches
 522
 523     def findBranchParent(self, branchPrefix, files):
 524         for file in files:
 525             path = file["path"]
 526             if not path.startswith(branchPrefix):
 527                 continue
 528             action = file["action"]
 529             if action != "integrate" and action != "branch":
 530                 continue
 531             rev = file["rev"]
 532             depotPath = path + "#" + rev
 533
 534             log = p4CmdList("filelog \"%s\"" % depotPath)
 535             if len(log) != 1:
 536                 print "eek! I got confused by the filelog of %s" % depotPath
 537                 sys.exit(1);
 538
 539             log = log[0]
 540             if log["action0"] != action:
 541                 print "eek! wrong action in filelog for %s : found %s, expected %s" % (depotPath, log["action0"], action)
 542                 sys.exit(1);
 543
 544             branchAction = log["how0,0"]
 545     #        if branchAction == "branch into" or branchAction == "ignored":
 546     #            continue # ignore for branching
 547
 548             if not branchAction.endswith(" from"):
 549                 continue # ignore for branching
 550     #            print "eek! file %s was not branched from but instead: %s" % (depotPath, branchAction)
 551     #            sys.exit(1);
 552
 553             source = log["file0,0"]
 554             if source.startswith(branchPrefix):
 555                 continue
 556
 557             lastSourceRev = log["erev0,0"]
 558
 559             sourceLog = p4CmdList("filelog -m 1 \"%s%s\"" % (source, lastSourceRev))
 560             if len(sourceLog) != 1:
 561                 print "eek! I got confused by the source filelog of %s%s" % (source, lastSourceRev)
 562                 sys.exit(1);
 563             sourceLog = sourceLog[0]
 564
 565             relPath = source[len(self.depotPath):]
 566             # strip off the filename
 567             relPath = relPath[0:relPath.rfind("/")]
 568
 569             for branch in self.knownBranches:
 570                 if self.isSubPathOf(relPath, branch):
 571     #                print "determined parent branch branch %s due to change in file %s" % (branch, source)
 572                     return branch
 573     #            else:
 574     #                print "%s is not a subpath of branch %s" % (relPath, branch)
 575
 576         return ""
 577
 578     def commit(self, details, files, branch, branchPrefix, parent = "", merged = ""):
 579         epoch = details["time"]
 580         author = details["user"]
 581
 582         self.gitStream.write("commit %s\n" % branch)
 583     #    gitStream.write("mark :%s\n" % details["change"])
 584         self.committedChanges.add(int(details["change"]))
 585         committer = ""
 586         if author in self.users:
 587             committer = "%s %s %s" % (self.users[author], epoch, self.tz)
 588         else:
 589             committer = "%s <a@b> %s %s" % (author, epoch, self.tz)
 590
 591         self.gitStream.write("committer %s\n" % committer)
 592
 593         self.gitStream.write("data <<EOT\n")
 594         self.gitStream.write(details["desc"])
 595         self.gitStream.write("\n[git-p4: depot-path = \"%s\": change = %s]\n" % (branchPrefix, details["change"]))
 596         self.gitStream.write("EOT\n\n")
 597
 598         if len(parent) > 0:
 599             self.gitStream.write("from %s\n" % parent)
 600
 601         if len(merged) > 0:
 602             self.gitStream.write("merge %s\n" % merged)
 603
 604         for file in files:
 605             path = file["path"]
 606             if not path.startswith(branchPrefix):
 607     #            if not silent:
 608     #                print "\nchanged files: ignoring path %s outside of branch prefix %s in change %s" % (path, branchPrefix, details["change"])
 609                 continue
 610             rev = file["rev"]
 611             depotPath = path + "#" + rev
 612             relPath = path[len(branchPrefix):]
 613             action = file["action"]
 614
 615             if file["type"] == "apple":
 616                 print "\nfile %s is a strange apple file that forks. Ignoring!" % path
 617                 continue
 618
 619             if action == "delete":
 620                 self.gitStream.write("D %s\n" % relPath)
 621             else:
 622                 mode = 644
 623                 if file["type"].startswith("x"):
 624                     mode = 755
 625
 626                 data = self.p4File(depotPath)
 627
 628                 self.gitStream.write("M %s inline %s\n" % (mode, relPath))
 629                 self.gitStream.write("data %s\n" % len(data))
 630                 self.gitStream.write(data)
 631                 self.gitStream.write("\n")
 632
 633         self.gitStream.write("\n")
 634
 635         change = int(details["change"])
 636
 637         self.lastChange = change
 638
 639         if change in self.labels:
 640             label = self.labels[change]
 641             labelDetails = label[0]
 642             labelRevisions = label[1]
 643
 644             files = p4CmdList("files %s...@%s" % (branchPrefix, change))
 645
 646             if len(files) == len(labelRevisions):
 647
 648                 cleanedFiles = {}
 649                 for info in files:
 650                     if info["action"] == "delete":
 651                         continue
 652                     cleanedFiles[info["depotFile"]] = info["rev"]
 653
 654                 if cleanedFiles == labelRevisions:
 655                     self.gitStream.write("tag tag_%s\n" % labelDetails["label"])
 656                     self.gitStream.write("from %s\n" % branch)
 657
 658                     owner = labelDetails["Owner"]
 659                     tagger = ""
 660                     if author in self.users:
 661                         tagger = "%s %s %s" % (self.users[owner], epoch, self.tz)
 662                     else:
 663                         tagger = "%s <a@b> %s %s" % (owner, epoch, self.tz)
 664                     self.gitStream.write("tagger %s\n" % tagger)
 665                     self.gitStream.write("data <<EOT\n")
 666                     self.gitStream.write(labelDetails["Description"])
 667                     self.gitStream.write("EOT\n\n")
 668
 669                 else:
 670                     if not self.silent:
 671                         print "Tag %s does not match with change %s: files do not match." % (labelDetails["label"], change)
 672
 673             else:
 674                 if not self.silent:
 675                     print "Tag %s does not match with change %s: file count is different." % (labelDetails["label"], change)
 676
 677     def extractFilesInCommitToBranch(self, files, branchPrefix):
 678         newFiles = []
 679
 680         for file in files:
 681             path = file["path"]
 682             if path.startswith(branchPrefix):
 683                 newFiles.append(file)
 684
 685         return newFiles
 686
 687     def findBranchSourceHeuristic(self, files, branch, branchPrefix):
 688         for file in files:
 689             action = file["action"]
 690             if action != "integrate" and action != "branch":
 691                 continue
 692             path = file["path"]
 693             rev = file["rev"]
 694             depotPath = path + "#" + rev
 695
 696             log = p4CmdList("filelog \"%s\"" % depotPath)
 697             if len(log) != 1:
 698                 print "eek! I got confused by the filelog of %s" % depotPath
 699                 sys.exit(1);
 700
 701             log = log[0]
 702             if log["action0"] != action:
 703                 print "eek! wrong action in filelog for %s : found %s, expected %s" % (depotPath, log["action0"], action)
 704                 sys.exit(1);
 705
 706             branchAction = log["how0,0"]
 707
 708             if not branchAction.endswith(" from"):
 709                 continue # ignore for branching
 710     #            print "eek! file %s was not branched from but instead: %s" % (depotPath, branchAction)
 711     #            sys.exit(1);
 712
 713             source = log["file0,0"]
 714             if source.startswith(branchPrefix):
 715                 continue
 716
 717             lastSourceRev = log["erev0,0"]
 718
 719             sourceLog = p4CmdList("filelog -m 1 \"%s%s\"" % (source, lastSourceRev))
 720             if len(sourceLog) != 1:
 721                 print "eek! I got confused by the source filelog of %s%s" % (source, lastSourceRev)
 722                 sys.exit(1);
 723             sourceLog = sourceLog[0]
 724
 725             relPath = source[len(self.depotPath):]
 726             # strip off the filename
 727             relPath = relPath[0:relPath.rfind("/")]
 728
 729             for candidate in self.knownBranches:
 730                 if self.isSubPathOf(relPath, candidate) and candidate != branch:
 731                     return candidate
 732
 733         return ""
 734
 735     def changeIsBranchMerge(self, sourceBranch, destinationBranch, change):
 736         sourceFiles = {}
 737         for file in p4CmdList("files %s...@%s" % (self.depotPath + sourceBranch + "/", change)):
 738             if file["action"] == "delete":
 739                 continue
 740             sourceFiles[file["depotFile"]] = file
 741
 742         destinationFiles = {}
 743         for file in p4CmdList("files %s...@%s" % (self.depotPath + destinationBranch + "/", change)):
 744             destinationFiles[file["depotFile"]] = file
 745
 746         for fileName in sourceFiles.keys():
 747             integrations = []
 748             deleted = False
 749             integrationCount = 0
 750             for integration in p4CmdList("integrated \"%s\"" % fileName):
 751                 toFile = integration["fromFile"] # yes, it's true, it's fromFile
 752                 if not toFile in destinationFiles:
 753                     continue
 754                 destFile = destinationFiles[toFile]
 755                 if destFile["action"] == "delete":
 756     #                print "file %s has been deleted in %s" % (fileName, toFile)
 757                     deleted = True
 758                     break
 759                 integrationCount += 1
 760                 if integration["how"] == "branch from":
 761                     continue
 762
 763                 if int(integration["change"]) == change:
 764                     integrations.append(integration)
 765                     continue
 766                 if int(integration["change"]) > change:
 767                     continue
 768
 769                 destRev = int(destFile["rev"])
 770
 771                 startRev = integration["startFromRev"][1:]
 772                 if startRev == "none":
 773                     startRev = 0
 774                 else:
 775                     startRev = int(startRev)
 776
 777                 endRev = integration["endFromRev"][1:]
 778                 if endRev == "none":
 779                     endRev = 0
 780                 else:
 781                     endRev = int(endRev)
 782
 783                 initialBranch = (destRev == 1 and integration["how"] != "branch into")
 784                 inRange = (destRev >= startRev and destRev <= endRev)
 785                 newer = (destRev > startRev and destRev > endRev)
 786
 787                 if initialBranch or inRange or newer:
 788                     integrations.append(integration)
 789
 790             if deleted:
 791                 continue
 792
 793             if len(integrations) == 0 and integrationCount > 1:
 794                 print "file %s was not integrated from %s into %s" % (fileName, sourceBranch, destinationBranch)
 795                 return False
 796
 797         return True
 798
 799     def getUserMap(self):
 800         self.users = {}
 801
 802         for output in p4CmdList("users"):
 803             if not output.has_key("User"):
 804                 continue
 805             self.users[output["User"]] = output["FullName"] + " <" + output["Email"] + ">"
 806
 807     def getLabels(self):
 808         self.labels = {}
 809
 810         l = p4CmdList("labels %s..." % self.depotPath)
 811         if len(l) > 0 and not self.silent:
 812             print "Finding files belonging to labels in %s" % self.depotPath
 813
 814         for output in l:
 815             label = output["label"]
 816             revisions = {}
 817             newestChange = 0
 818             for file in p4CmdList("files //...@%s" % label):
 819                 revisions[file["depotFile"]] = file["rev"]
 820                 change = int(file["change"])
 821                 if change > newestChange:
 822                     newestChange = change
 823
 824             self.labels[newestChange] = [output, revisions]
 825
 826     def run(self, args):
 827         self.depotPath = ""
 828         self.changeRange = ""
 829         self.initialParent = ""
 830         self.previousDepotPath = ""
 831         # importing into default remotes/p4/* layout?
 832         defaultImport = False
 833
 834         if self.syncWithOrigin and gitBranchExists("origin") and gitBranchExists("refs/remotes/p4/master"):
 835             print "Syncing with origin first as requested by calling git fetch origin"
 836             system("git fetch origin")
 837             [originPreviousDepotPath, originP4Change] = extractDepotPathAndChangeFromGitLog(extractLogMessageFromGitCommit("origin"))
 838             [p4PreviousDepotPath, p4Change] = extractDepotPathAndChangeFromGitLog(extractLogMessageFromGitCommit("p4"))
 839             if len(originPreviousDepotPath) > 0 and len(originP4Change) > 0 and len(p4Change) > 0:
 840                 if originPreviousDepotPath == p4PreviousDepotPath:
 841                     originP4Change = int(originP4Change)
 842                     p4Change = int(p4Change)
 843                     if originP4Change > p4Change:
 844                         print "origin (%s) is newer than p4 (%s). Updating p4 branch from origin." % (originP4Change, p4Change)
 845                         system("git update-ref refs/remotes/p4/master origin");
 846                 else:
 847                     print "Cannot sync with origin. It was imported from %s while remotes/p4 was imported from %s" % (originPreviousDepotPath, p4PreviousDepotPath)
 848
 849         if len(self.branch) == 0:
 850             self.branch = "refs/remotes/p4/master"
 851             if gitBranchExists("refs/heads/p4"):
 852                 system("git update-ref %s refs/heads/p4" % self.branch)
 853                 system("git symbolic-ref refs/remotes/p4/HEAD refs/remotes/p4/master")
 854                 system("git branch -D p4");
 855             else:
 856                 defaultImport = True
 857
 858         if len(args) == 0:
 859             if not gitBranchExists(self.branch) and gitBranchExists("origin"):
 860                 if not self.silent:
 861                     print "Creating %s branch in git repository based on origin" % self.branch
 862                 branch = self.branch
 863                 if not branch.startswith("refs"):
 864                     branch = "refs/heads/" + branch
 865                 system("git update-ref %s origin" % branch)
 866                 if defaultImport:
 867                     system("git symbolic-ref refs/remotes/p4/HEAD %s" % branch)
 868
 869             [self.previousDepotPath, p4Change] = extractDepotPathAndChangeFromGitLog(extractLogMessageFromGitCommit(self.branch))
 870             if len(self.previousDepotPath) > 0 and len(p4Change) > 0:
 871                 p4Change = int(p4Change) + 1
 872                 self.depotPath = self.previousDepotPath
 873                 self.changeRange = "@%s,#head" % p4Change
 874                 self.initialParent = parseRevision(self.branch)
 875                 if not self.silent:
 876                     print "Performing incremental import into %s git branch" % self.branch
 877
 878         if not self.branch.startswith("refs/"):
 879             self.branch = "refs/heads/" + self.branch
 880
 881         if len(self.depotPath) != 0:
 882             self.depotPath = self.depotPath[:-1]
 883
 884         if len(args) == 0 and len(self.depotPath) != 0:
 885             if not self.silent:
 886                 print "Depot path: %s" % self.depotPath
 887         elif len(args) != 1:
 888             return False
 889         else:
 890             if len(self.depotPath) != 0 and self.depotPath != args[0]:
 891                 print "previous import used depot path %s and now %s was specified. this doesn't work!" % (self.depotPath, args[0])
 892                 sys.exit(1)
 893             self.depotPath = args[0]
 894
 895         self.revision = ""
 896         self.users = {}
 897         self.lastChange = 0
 898
 899         if self.depotPath.find("@") != -1:
 900             atIdx = self.depotPath.index("@")
 901             self.changeRange = self.depotPath[atIdx:]
 902             if self.changeRange == "@all":
 903                 self.changeRange = ""
 904             elif self.changeRange.find(",") == -1:
 905                 self.revision = self.changeRange
 906                 self.changeRange = ""
 907             self.depotPath = self.depotPath[0:atIdx]
 908         elif self.depotPath.find("#") != -1:
 909             hashIdx = self.depotPath.index("#")
 910             self.revision = self.depotPath[hashIdx:]
 911             self.depotPath = self.depotPath[0:hashIdx]
 912         elif len(self.previousDepotPath) == 0:
 913             self.revision = "#head"
 914
 915         if self.depotPath.endswith("..."):
 916             self.depotPath = self.depotPath[:-3]
 917
 918         if not self.depotPath.endswith("/"):
 919             self.depotPath += "/"
 920
 921         self.getUserMap()
 922         self.labels = {}
 923         if self.detectLabels:
 924             self.getLabels();
 925
 926         self.tz = "%+03d%02d" % (- time.timezone / 3600, ((- time.timezone % 3600) / 60))
 927
 928         importProcess = subprocess.Popen(["git", "fast-import"], stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE);
 929         self.gitOutput = importProcess.stdout
 930         self.gitStream = importProcess.stdin
 931         self.gitError = importProcess.stderr
 932
 933         if len(self.revision) > 0:
 934             print "Doing initial import of %s from revision %s" % (self.depotPath, self.revision)
 935
 936             details = { "user" : "git perforce import user", "time" : int(time.time()) }
 937             details["desc"] = "Initial import of %s from the state at revision %s" % (self.depotPath, self.revision)
 938             details["change"] = self.revision
 939             newestRevision = 0
 940
 941             fileCnt = 0
 942             for info in p4CmdList("files %s...%s" % (self.depotPath, self.revision)):
 943                 change = int(info["change"])
 944                 if change > newestRevision:
 945                     newestRevision = change
 946
 947                 if info["action"] == "delete":
 948                     # don't increase the file cnt, otherwise details["depotFile123"] will have gaps!
 949                     #fileCnt = fileCnt + 1
 950                     continue
 951
 952                 for prop in [ "depotFile", "rev", "action", "type" ]:
 953                     details["%s%s" % (prop, fileCnt)] = info[prop]
 954
 955                 fileCnt = fileCnt + 1
 956
 957             details["change"] = newestRevision
 958
 959             try:
 960                 self.commit(details, self.extractFilesFromCommit(details), self.branch, self.depotPath)
 961             except IOError:
 962                 print "IO error with git fast-import. Is your git version recent enough?"
 963                 print self.gitError.read()
 964
 965         else:
 966             changes = []
 967
 968             if len(self.changesFile) > 0:
 969                 output = open(self.changesFile).readlines()
 970                 changeSet = Set()
 971                 for line in output:
 972                     changeSet.add(int(line))
 973
 974                 for change in changeSet:
 975                     changes.append(change)
 976
 977                 changes.sort()
 978             else:
 979                 output = mypopen("p4 changes %s...%s" % (self.depotPath, self.changeRange)).readlines()
 980
 981                 for line in output:
 982                     changeNum = line.split(" ")[1]
 983                     changes.append(changeNum)
 984
 985                 changes.reverse()
 986
 987             if len(changes) == 0:
 988                 if not self.silent:
 989                     print "no changes to import!"
 990                 return True
 991
 992             cnt = 1
 993             for change in changes:
 994                 description = p4Cmd("describe %s" % change)
 995
 996                 if not self.silent:
 997                     sys.stdout.write("\rimporting revision %s (%s%%)" % (change, cnt * 100 / len(changes)))
 998                     sys.stdout.flush()
 999                 cnt = cnt + 1
1000
1001                 try:
1002                     files = self.extractFilesFromCommit(description)
1003                     if self.detectBranches:
1004                         for branch in self.branchesForCommit(files):
1005                             self.knownBranches.add(branch)
1006                             branchPrefix = self.depotPath + branch + "/"
1007
1008                             filesForCommit = self.extractFilesInCommitToBranch(files, branchPrefix)
1009
1010                             merged = ""
1011                             parent = ""
1012                             ########### remove cnt!!!
1013                             if branch not in self.createdBranches and cnt > 2:
1014                                 self.createdBranches.add(branch)
1015                                 parent = self.findBranchParent(branchPrefix, files)
1016                                 if parent == branch:
1017                                     parent = ""
1018             #                    elif len(parent) > 0:
1019             #                        print "%s branched off of %s" % (branch, parent)
1020
1021                             if len(parent) == 0:
1022                                 merged = self.findBranchSourceHeuristic(filesForCommit, branch, branchPrefix)
1023                                 if len(merged) > 0:
1024                                     print "change %s could be a merge from %s into %s" % (description["change"], merged, branch)
1025                                     if not self.changeIsBranchMerge(merged, branch, int(description["change"])):
1026                                         merged = ""
1027
1028                             branch = "refs/heads/" + branch
1029                             if len(parent) > 0:
1030                                 parent = "refs/heads/" + parent
1031                             if len(merged) > 0:
1032                                 merged = "refs/heads/" + merged
1033                             self.commit(description, files, branch, branchPrefix, parent, merged)
1034                     else:
1035                         self.commit(description, files, self.branch, self.depotPath, self.initialParent)
1036                         self.initialParent = ""
1037                 except IOError:
1038                     print self.gitError.read()
1039                     sys.exit(1)
1040
1041         if not self.silent:
1042             print ""
1043
1044
1045         self.gitStream.close()
1046         self.gitOutput.close()
1047         self.gitError.close()
1048         importProcess.wait()
1049
1050         return True
1051
1052 class P4Rebase(Command):
1053     def __init__(self):
1054         Command.__init__(self)
1055         self.options = [ optparse.make_option("--with-origin", dest="syncWithOrigin", action="store_true") ]
1056         self.description = "Fetches the latest revision from perforce and rebases the current work (branch) against it"
1057         self.syncWithOrigin = False
1058
1059     def run(self, args):
1060         sync = P4Sync()
1061         sync.syncWithOrigin = self.syncWithOrigin
1062         sync.run([])
1063         print "Rebasing the current branch"
1064         oldHead = mypopen("git rev-parse HEAD").read()[:-1]
1065         system("git rebase p4")
1066         system("git diff-tree --stat --summary -M %s HEAD" % oldHead)
1067         return True
1068
1069 class P4Clone(P4Sync):
1070     def __init__(self):
1071         P4Sync.__init__(self)
1072         self.description = "Creates a new git repository and imports from Perforce into it"
1073         self.usage = "usage: %prog [options] //depot/path[@revRange] [directory]"
1074         self.needsGit = False
1075
1076     def run(self, args):
1077         if len(args) < 1:
1078             return False
1079         depotPath = args[0]
1080         dir = ""
1081         if len(args) == 2:
1082             dir = args[1]
1083         elif len(args) > 2:
1084             return False
1085
1086         if not depotPath.startswith("//"):
1087             return False
1088
1089         if len(dir) == 0:
1090             dir = depotPath
1091             atPos = dir.rfind("@")
1092             if atPos != -1:
1093                 dir = dir[0:atPos]
1094             hashPos = dir.rfind("#")
1095             if hashPos != -1:
1096                 dir = dir[0:hashPos]
1097
1098             if dir.endswith("..."):
1099                 dir = dir[:-3]
1100
1101             if dir.endswith("/"):
1102                dir = dir[:-1]
1103
1104             slashPos = dir.rfind("/")
1105             if slashPos != -1:
1106                 dir = dir[slashPos + 1:]
1107
1108         print "Importing from %s into %s" % (depotPath, dir)
1109         os.makedirs(dir)
1110         os.chdir(dir)
1111         system("git init")
1112         if not P4Sync.run(self, [depotPath]):
1113             return False
1114         if self.branch != "master":
1115             system("git branch master p4")
1116             system("git checkout -f")
1117         return True
1118
1119 class HelpFormatter(optparse.IndentedHelpFormatter):
1120     def __init__(self):
1121         optparse.IndentedHelpFormatter.__init__(self)
1122
1123     def format_description(self, description):
1124         if description:
1125             return description + "\n"
1126         else:
1127             return ""
1128
1129 def printUsage(commands):
1130     print "usage: %s <command> [options]" % sys.argv[0]
1131     print ""
1132     print "valid commands: %s" % ", ".join(commands)
1133     print ""
1134     print "Try %s <command> --help for command specific help." % sys.argv[0]
1135     print ""
1136
1137 commands = {
1138     "debug" : P4Debug(),
1139     "submit" : P4Submit(),
1140     "sync" : P4Sync(),
1141     "rebase" : P4Rebase(),
1142     "clone" : P4Clone()
1143 }
1144
1145 if len(sys.argv[1:]) == 0:
1146     printUsage(commands.keys())
1147     sys.exit(2)
1148
1149 cmd = ""
1150 cmdName = sys.argv[1]
1151 try:
1152     cmd = commands[cmdName]
1153 except KeyError:
1154     print "unknown command %s" % cmdName
1155     print ""
1156     printUsage(commands.keys())
1157     sys.exit(2)
1158
1159 options = cmd.options
1160 cmd.gitdir = gitdir
1161
1162 args = sys.argv[2:]
1163
1164 if len(options) > 0:
1165     options.append(optparse.make_option("--git-dir", dest="gitdir"))
1166
1167     parser = optparse.OptionParser(cmd.usage.replace("%prog", "%prog " + cmdName),
1168                                    options,
1169                                    description = cmd.description,
1170                                    formatter = HelpFormatter())
1171
1172     (cmd, args) = parser.parse_args(sys.argv[2:], cmd);
1173
1174 if cmd.needsGit:
1175     gitdir = cmd.gitdir
1176     if len(gitdir) == 0:
1177         gitdir = ".git"
1178         if not isValidGitDir(gitdir):
1179             gitdir = mypopen("git rev-parse --git-dir").read()[:-1]
1180             if os.path.exists(gitdir):
1181                 cdup = mypopen("git rev-parse --show-cdup").read()[:-1];
1182                 if len(cdup) > 0:
1183                     os.chdir(cdup);
1184
1185     if not isValidGitDir(gitdir):
1186         if isValidGitDir(gitdir + "/.git"):
1187             gitdir += "/.git"
1188         else:
1189             die("fatal: cannot locate git repository at %s" % gitdir)
1190
1191     os.environ["GIT_DIR"] = gitdir
1192
1193 if not cmd.run(args):
1194     parser.print_help()
1195