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