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 <simon@lst.de>
   6 # Copyright: 2007 Simon Hausmann <simon@lst.de>
   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 import re
  14
  15 from sets import Set;
  16
  17 verbose = False
  18
  19 def die(msg):
  20     if verbose:
  21         raise Exception(msg)
  22     else:
  23         sys.stderr.write(msg + "\n")
  24         sys.exit(1)
  25
  26 def write_pipe(c, str):
  27     if verbose:
  28         sys.stderr.write('Writing pipe: %s\n' % c)
  29
  30     pipe = os.popen(c, 'w')
  31     val = pipe.write(str)
  32     if pipe.close():
  33         die('Command failed: %s' % c)
  34
  35     return val
  36
  37 def read_pipe(c, ignore_error=False):
  38     if verbose:
  39         sys.stderr.write('Reading pipe: %s\n' % c)
  40
  41     pipe = os.popen(c, 'rb')
  42     val = pipe.read()
  43     if pipe.close() and not ignore_error:
  44         die('Command failed: %s' % c)
  45
  46     return val
  47
  48
  49 def read_pipe_lines(c):
  50     if verbose:
  51         sys.stderr.write('Reading pipe: %s\n' % c)
  52     ## todo: check return status
  53     pipe = os.popen(c, 'rb')
  54     val = pipe.readlines()
  55     if pipe.close():
  56         die('Command failed: %s' % c)
  57
  58     return val
  59
  60 def system(cmd):
  61     if verbose:
  62         sys.stderr.write("executing %s\n" % cmd)
  63     if os.system(cmd) != 0:
  64         die("command failed: %s" % cmd)
  65
  66 def p4CmdList(cmd):
  67     cmd = "p4 -G %s" % cmd
  68     if verbose:
  69         sys.stderr.write("Opening pipe: %s\n" % cmd)
  70     pipe = os.popen(cmd, "rb")
  71
  72     result = []
  73     try:
  74         while True:
  75             entry = marshal.load(pipe)
  76             result.append(entry)
  77     except EOFError:
  78         pass
  79     exitCode = pipe.close()
  80     if exitCode != None:
  81         entry = {}
  82         entry["p4ExitCode"] = exitCode
  83         result.append(entry)
  84
  85     return result
  86
  87 def p4Cmd(cmd):
  88     list = p4CmdList(cmd)
  89     result = {}
  90     for entry in list:
  91         result.update(entry)
  92     return result;
  93
  94 def p4Where(depotPath):
  95     if not depotPath.endswith("/"):
  96         depotPath += "/"
  97     output = p4Cmd("where %s..." % depotPath)
  98     if output["code"] == "error":
  99         return ""
 100     clientPath = ""
 101     if "path" in output:
 102         clientPath = output.get("path")
 103     elif "data" in output:
 104         data = output.get("data")
 105         lastSpace = data.rfind(" ")
 106         clientPath = data[lastSpace + 1:]
 107
 108     if clientPath.endswith("..."):
 109         clientPath = clientPath[:-3]
 110     return clientPath
 111
 112 def currentGitBranch():
 113     return read_pipe("git name-rev HEAD").split(" ")[1].strip()
 114
 115 def isValidGitDir(path):
 116     if (os.path.exists(path + "/HEAD")
 117         and os.path.exists(path + "/refs") and os.path.exists(path + "/objects")):
 118         return True;
 119     return False
 120
 121 def parseRevision(ref):
 122     return read_pipe("git rev-parse %s" % ref).strip()
 123
 124 def extractLogMessageFromGitCommit(commit):
 125     logMessage = ""
 126
 127     ## fixme: title is first line of commit, not 1st paragraph.
 128     foundTitle = False
 129     for log in read_pipe_lines("git cat-file commit %s" % commit):
 130        if not foundTitle:
 131            if len(log) == 1:
 132                foundTitle = True
 133            continue
 134
 135        logMessage += log
 136     return logMessage
 137
 138 def extractSettingsGitLog(log):
 139     values = {}
 140     for line in log.split("\n"):
 141         line = line.strip()
 142         m = re.search (r"^ *\[git-p4: (.*)\]$", line)
 143         if not m:
 144             continue
 145
 146         assignments = m.group(1).split (':')
 147         for a in assignments:
 148             vals = a.split ('=')
 149             key = vals[0].strip()
 150             val = ('='.join (vals[1:])).strip()
 151             if val.endswith ('\"') and val.startswith('"'):
 152                 val = val[1:-1]
 153
 154             values[key] = val
 155
 156     paths = values.get("depot-paths")
 157     if not paths:
 158         paths = values.get("depot-path")
 159     if paths:
 160         values['depot-paths'] = paths.split(',')
 161     return values
 162
 163 def gitBranchExists(branch):
 164     proc = subprocess.Popen(["git", "rev-parse", branch],
 165                             stderr=subprocess.PIPE, stdout=subprocess.PIPE);
 166     return proc.wait() == 0;
 167
 168 def gitConfig(key):
 169     return read_pipe("git config %s" % key, ignore_error=True).strip()
 170
 171 class Command:
 172     def __init__(self):
 173         self.usage = "usage: %prog [options]"
 174         self.needsGit = True
 175
 176 class P4Debug(Command):
 177     def __init__(self):
 178         Command.__init__(self)
 179         self.options = [
 180             optparse.make_option("--verbose", dest="verbose", action="store_true",
 181                                  default=False),
 182             ]
 183         self.description = "A tool to debug the output of p4 -G."
 184         self.needsGit = False
 185         self.verbose = False
 186
 187     def run(self, args):
 188         j = 0
 189         for output in p4CmdList(" ".join(args)):
 190             print 'Element: %d' % j
 191             j += 1
 192             print output
 193         return True
 194
 195 class P4RollBack(Command):
 196     def __init__(self):
 197         Command.__init__(self)
 198         self.options = [
 199             optparse.make_option("--verbose", dest="verbose", action="store_true"),
 200             optparse.make_option("--local", dest="rollbackLocalBranches", action="store_true")
 201         ]
 202         self.description = "A tool to debug the multi-branch import. Don't use :)"
 203         self.verbose = False
 204         self.rollbackLocalBranches = False
 205
 206     def run(self, args):
 207         if len(args) != 1:
 208             return False
 209         maxChange = int(args[0])
 210
 211         if "p4ExitCode" in p4Cmd("changes -m 1"):
 212             die("Problems executing p4");
 213
 214         if self.rollbackLocalBranches:
 215             refPrefix = "refs/heads/"
 216             lines = read_pipe_lines("git rev-parse --symbolic --branches")
 217         else:
 218             refPrefix = "refs/remotes/"
 219             lines = read_pipe_lines("git rev-parse --symbolic --remotes")
 220
 221         for line in lines:
 222             if self.rollbackLocalBranches or (line.startswith("p4/") and line != "p4/HEAD\n"):
 223                 line = line.strip()
 224                 ref = refPrefix + line
 225                 log = extractLogMessageFromGitCommit(ref)
 226                 settings = extractSettingsGitLog(log)
 227
 228                 depotPaths = settings['depot-paths']
 229                 change = settings['change']
 230
 231                 changed = False
 232
 233                 if len(p4Cmd("changes -m 1 "  + ' '.join (['%s...@%s' % (p, maxChange)
 234                                                            for p in depotPaths]))) == 0:
 235                     print "Branch %s did not exist at change %s, deleting." % (ref, maxChange)
 236                     system("git update-ref -d %s `git rev-parse %s`" % (ref, ref))
 237                     continue
 238
 239                 while change and int(change) > maxChange:
 240                     changed = True
 241                     if self.verbose:
 242                         print "%s is at %s ; rewinding towards %s" % (ref, change, maxChange)
 243                     system("git update-ref %s \"%s^\"" % (ref, ref))
 244                     log = extractLogMessageFromGitCommit(ref)
 245                     settings =  extractSettingsGitLog(log)
 246
 247
 248                     depotPaths = settings['depot-paths']
 249                     change = settings['change']
 250
 251                 if changed:
 252                     print "%s rewound to %s" % (ref, change)
 253
 254         return True
 255
 256 class P4Submit(Command):
 257     def __init__(self):
 258         Command.__init__(self)
 259         self.options = [
 260                 optparse.make_option("--continue", action="store_false", dest="firstTime"),
 261                 optparse.make_option("--verbose", dest="verbose", action="store_true"),
 262                 optparse.make_option("--origin", dest="origin"),
 263                 optparse.make_option("--reset", action="store_true", dest="reset"),
 264                 optparse.make_option("--log-substitutions", dest="substFile"),
 265                 optparse.make_option("--dry-run", action="store_true"),
 266                 optparse.make_option("--direct", dest="directSubmit", action="store_true"),
 267                 optparse.make_option("--trust-me-like-a-fool", dest="trustMeLikeAFool", action="store_true"),
 268         ]
 269         self.description = "Submit changes from git to the perforce depot."
 270         self.usage += " [name of git branch to submit into perforce depot]"
 271         self.firstTime = True
 272         self.reset = False
 273         self.interactive = True
 274         self.dryRun = False
 275         self.substFile = ""
 276         self.firstTime = True
 277         self.origin = ""
 278         self.directSubmit = False
 279         self.trustMeLikeAFool = False
 280         self.verbose = False
 281         self.isWindows = (platform.system() == "Windows")
 282
 283         self.logSubstitutions = {}
 284         self.logSubstitutions["<enter description here>"] = "%log%"
 285         self.logSubstitutions["\tDetails:"] = "\tDetails:  %log%"
 286
 287     def check(self):
 288         if len(p4CmdList("opened ...")) > 0:
 289             die("You have files opened with perforce! Close them before starting the sync.")
 290
 291     def start(self):
 292         if len(self.config) > 0 and not self.reset:
 293             die("Cannot start sync. Previous sync config found at %s\n"
 294                 "If you want to start submitting again from scratch "
 295                 "maybe you want to call git-p4 submit --reset" % self.configFile)
 296
 297         commits = []
 298         if self.directSubmit:
 299             commits.append("0")
 300         else:
 301             for line in read_pipe_lines("git rev-list --no-merges %s..%s" % (self.origin, self.master)):
 302                 commits.append(line.strip())
 303             commits.reverse()
 304
 305         self.config["commits"] = commits
 306
 307     def prepareLogMessage(self, template, message):
 308         result = ""
 309
 310         for line in template.split("\n"):
 311             if line.startswith("#"):
 312                 result += line + "\n"
 313                 continue
 314
 315             substituted = False
 316             for key in self.logSubstitutions.keys():
 317                 if line.find(key) != -1:
 318                     value = self.logSubstitutions[key]
 319                     value = value.replace("%log%", message)
 320                     if value != "@remove@":
 321                         result += line.replace(key, value) + "\n"
 322                     substituted = True
 323                     break
 324
 325             if not substituted:
 326                 result += line + "\n"
 327
 328         return result
 329
 330     def applyCommit(self, id):
 331         if self.directSubmit:
 332             print "Applying local change in working directory/index"
 333             diff = self.diffStatus
 334         else:
 335             print "Applying %s" % (read_pipe("git log --max-count=1 --pretty=oneline %s" % id))
 336             diff = read_pipe_lines("git diff-tree -r --name-status \"%s^\" \"%s\"" % (id, id))
 337         filesToAdd = set()
 338         filesToDelete = set()
 339         editedFiles = set()
 340         for line in diff:
 341             modifier = line[0]
 342             path = line[1:].strip()
 343             if modifier == "M":
 344                 system("p4 edit \"%s\"" % path)
 345                 editedFiles.add(path)
 346             elif modifier == "A":
 347                 filesToAdd.add(path)
 348                 if path in filesToDelete:
 349                     filesToDelete.remove(path)
 350             elif modifier == "D":
 351                 filesToDelete.add(path)
 352                 if path in filesToAdd:
 353                     filesToAdd.remove(path)
 354             else:
 355                 die("unknown modifier %s for %s" % (modifier, path))
 356
 357         if self.directSubmit:
 358             diffcmd = "cat \"%s\"" % self.diffFile
 359         else:
 360             diffcmd = "git format-patch -k --stdout \"%s^\"..\"%s\"" % (id, id)
 361         patchcmd = diffcmd + " | git apply "
 362         tryPatchCmd = patchcmd + "--check -"
 363         applyPatchCmd = patchcmd + "--check --apply -"
 364
 365         if os.system(tryPatchCmd) != 0:
 366             print "Unfortunately applying the change failed!"
 367             print "What do you want to do?"
 368             response = "x"
 369             while response != "s" and response != "a" and response != "w":
 370                 response = raw_input("[s]kip this patch / [a]pply the patch forcibly "
 371                                      "and with .rej files / [w]rite the patch to a file (patch.txt) ")
 372             if response == "s":
 373                 print "Skipping! Good luck with the next patches..."
 374                 return
 375             elif response == "a":
 376                 os.system(applyPatchCmd)
 377                 if len(filesToAdd) > 0:
 378                     print "You may also want to call p4 add on the following files:"
 379                     print " ".join(filesToAdd)
 380                 if len(filesToDelete):
 381                     print "The following files should be scheduled for deletion with p4 delete:"
 382                     print " ".join(filesToDelete)
 383                 die("Please resolve and submit the conflict manually and "
 384                     + "continue afterwards with git-p4 submit --continue")
 385             elif response == "w":
 386                 system(diffcmd + " > patch.txt")
 387                 print "Patch saved to patch.txt in %s !" % self.clientPath
 388                 die("Please resolve and submit the conflict manually and "
 389                     "continue afterwards with git-p4 submit --continue")
 390
 391         system(applyPatchCmd)
 392
 393         for f in filesToAdd:
 394             system("p4 add %s" % f)
 395         for f in filesToDelete:
 396             system("p4 revert %s" % f)
 397             system("p4 delete %s" % f)
 398
 399         logMessage = ""
 400         if not self.directSubmit:
 401             logMessage = extractLogMessageFromGitCommit(id)
 402             logMessage = logMessage.replace("\n", "\n\t")
 403             if self.isWindows:
 404                 logMessage = logMessage.replace("\n", "\r\n")
 405             logMessage = logMessage.strip()
 406
 407         template = read_pipe("p4 change -o")
 408
 409         if self.interactive:
 410             submitTemplate = self.prepareLogMessage(template, logMessage)
 411             diff = read_pipe("p4 diff -du ...")
 412
 413             for newFile in filesToAdd:
 414                 diff += "==== new file ====\n"
 415                 diff += "--- /dev/null\n"
 416                 diff += "+++ %s\n" % newFile
 417                 f = open(newFile, "r")
 418                 for line in f.readlines():
 419                     diff += "+" + line
 420                 f.close()
 421
 422             separatorLine = "######## everything below this line is just the diff #######"
 423             if platform.system() == "Windows":
 424                 separatorLine += "\r"
 425             separatorLine += "\n"
 426
 427             response = "e"
 428             if self.trustMeLikeAFool:
 429                 response = "y"
 430
 431             firstIteration = True
 432             while response == "e":
 433                 if not firstIteration:
 434                     response = raw_input("Do you want to submit this change? [y]es/[e]dit/[n]o/[s]kip ")
 435                 firstIteration = False
 436                 if response == "e":
 437                     [handle, fileName] = tempfile.mkstemp()
 438                     tmpFile = os.fdopen(handle, "w+")
 439                     tmpFile.write(submitTemplate + separatorLine + diff)
 440                     tmpFile.close()
 441                     defaultEditor = "vi"
 442                     if platform.system() == "Windows":
 443                         defaultEditor = "notepad"
 444                     editor = os.environ.get("EDITOR", defaultEditor);
 445                     system(editor + " " + fileName)
 446                     tmpFile = open(fileName, "rb")
 447                     message = tmpFile.read()
 448                     tmpFile.close()
 449                     os.remove(fileName)
 450                     submitTemplate = message[:message.index(separatorLine)]
 451                     if self.isWindows:
 452                         submitTemplate = submitTemplate.replace("\r\n", "\n")
 453
 454             if response == "y" or response == "yes":
 455                if self.dryRun:
 456                    print submitTemplate
 457                    raw_input("Press return to continue...")
 458                else:
 459                    if self.directSubmit:
 460                        print "Submitting to git first"
 461                        os.chdir(self.oldWorkingDirectory)
 462                        write_pipe("git commit -a -F -", submitTemplate)
 463                        os.chdir(self.clientPath)
 464
 465                    write_pipe("p4 submit -i", submitTemplate)
 466             elif response == "s":
 467                 for f in editedFiles:
 468                     system("p4 revert \"%s\"" % f);
 469                 for f in filesToAdd:
 470                     system("p4 revert \"%s\"" % f);
 471                     system("rm %s" %f)
 472                 for f in filesToDelete:
 473                     system("p4 delete \"%s\"" % f);
 474                 return
 475             else:
 476                 print "Not submitting!"
 477                 self.interactive = False
 478         else:
 479             fileName = "submit.txt"
 480             file = open(fileName, "w+")
 481             file.write(self.prepareLogMessage(template, logMessage))
 482             file.close()
 483             print ("Perforce submit template written as %s. "
 484                    + "Please review/edit and then use p4 submit -i < %s to submit directly!"
 485                    % (fileName, fileName))
 486
 487     def run(self, args):
 488         if len(args) == 0:
 489             self.master = currentGitBranch()
 490             if len(self.master) == 0 or not gitBranchExists("refs/heads/%s" % self.master):
 491                 die("Detecting current git branch failed!")
 492         elif len(args) == 1:
 493             self.master = args[0]
 494         else:
 495             return False
 496
 497         depotPath = ""
 498         parent = 0
 499         while parent < 65535:
 500             commit = "HEAD~%s" % parent
 501             log = extractLogMessageFromGitCommit(commit)
 502             settings = extractSettingsGitLog(log)
 503             if not settings.has_key("depot-paths"):
 504                 parent = parent + 1
 505                 continue
 506
 507             depotPath = settings['depot-paths'][0]
 508
 509             if len(self.origin) == 0:
 510                 names = read_pipe_lines("git name-rev '--refs=refs/remotes/p4/*' '%s'" % commit)
 511                 if len(names) > 0:
 512                     # strip away the beginning of 'HEAD~42 refs/remotes/p4/foo'
 513                     self.origin = names[0].strip()[len(commit) + 1:]
 514
 515             break
 516
 517         if self.verbose:
 518             print "Origin branch is " + self.origin
 519
 520         if len(depotPath) == 0:
 521             print "Internal error: cannot locate perforce depot path from existing branches"
 522             sys.exit(128)
 523
 524         self.clientPath = p4Where(depotPath)
 525
 526         if len(self.clientPath) == 0:
 527             print "Error: Cannot locate perforce checkout of %s in client view" % depotPath
 528             sys.exit(128)
 529
 530         print "Perforce checkout for depot path %s located at %s" % (depotPath, self.clientPath)
 531         self.oldWorkingDirectory = os.getcwd()
 532
 533         if self.directSubmit:
 534             self.diffStatus = read_pipe_lines("git diff -r --name-status HEAD")
 535             if len(self.diffStatus) == 0:
 536                 print "No changes in working directory to submit."
 537                 return True
 538             patch = read_pipe("git diff -p --binary --diff-filter=ACMRTUXB HEAD")
 539             self.diffFile = self.gitdir + "/p4-git-diff"
 540             f = open(self.diffFile, "wb")
 541             f.write(patch)
 542             f.close();
 543
 544         os.chdir(self.clientPath)
 545         response = raw_input("Do you want to sync %s with p4 sync? [y]es/[n]o " % self.clientPath)
 546         if response == "y" or response == "yes":
 547             system("p4 sync ...")
 548
 549         if self.reset:
 550             self.firstTime = True
 551
 552         if len(self.substFile) > 0:
 553             for line in open(self.substFile, "r").readlines():
 554                 tokens = line.strip().split("=")
 555                 self.logSubstitutions[tokens[0]] = tokens[1]
 556
 557         self.check()
 558         self.configFile = self.gitdir + "/p4-git-sync.cfg"
 559         self.config = shelve.open(self.configFile, writeback=True)
 560
 561         if self.firstTime:
 562             self.start()
 563
 564         commits = self.config.get("commits", [])
 565
 566         while len(commits) > 0:
 567             self.firstTime = False
 568             commit = commits[0]
 569             commits = commits[1:]
 570             self.config["commits"] = commits
 571             self.applyCommit(commit)
 572             if not self.interactive:
 573                 break
 574
 575         self.config.close()
 576
 577         if self.directSubmit:
 578             os.remove(self.diffFile)
 579
 580         if len(commits) == 0:
 581             if self.firstTime:
 582                 print "No changes found to apply between %s and current HEAD" % self.origin
 583             else:
 584                 print "All changes applied!"
 585                 os.chdir(self.oldWorkingDirectory)
 586                 response = raw_input("Do you want to sync from Perforce now using git-p4 rebase? [y]es/[n]o ")
 587                 if response == "y" or response == "yes":
 588                     rebase = P4Rebase()
 589                     rebase.run([])
 590             os.remove(self.configFile)
 591
 592         return True
 593
 594 class P4Sync(Command):
 595     def __init__(self):
 596         Command.__init__(self)
 597         self.options = [
 598                 optparse.make_option("--branch", dest="branch"),
 599                 optparse.make_option("--detect-branches", dest="detectBranches", action="store_true"),
 600                 optparse.make_option("--changesfile", dest="changesFile"),
 601                 optparse.make_option("--silent", dest="silent", action="store_true"),
 602                 optparse.make_option("--detect-labels", dest="detectLabels", action="store_true"),
 603                 optparse.make_option("--verbose", dest="verbose", action="store_true"),
 604                 optparse.make_option("--import-local", dest="importIntoRemotes", action="store_false",
 605                                      help="Import into refs/heads/ , not refs/remotes"),
 606                 optparse.make_option("--max-changes", dest="maxChanges"),
 607                 optparse.make_option("--keep-path", dest="keepRepoPath", action='store_true',
 608                                      help="Keep entire BRANCH/DIR/SUBDIR prefix during import")
 609         ]
 610         self.description = """Imports from Perforce into a git repository.\n
 611     example:
 612     //depot/my/project/ -- to import the current head
 613     //depot/my/project/@all -- to import everything
 614     //depot/my/project/@1,6 -- to import only from revision 1 to 6
 615
 616     (a ... is not needed in the path p4 specification, it's added implicitly)"""
 617
 618         self.usage += " //depot/path[@revRange]"
 619         self.silent = False
 620         self.createdBranches = Set()
 621         self.committedChanges = Set()
 622         self.branch = ""
 623         self.detectBranches = False
 624         self.detectLabels = False
 625         self.changesFile = ""
 626         self.syncWithOrigin = True
 627         self.verbose = False
 628         self.importIntoRemotes = True
 629         self.maxChanges = ""
 630         self.isWindows = (platform.system() == "Windows")
 631         self.keepRepoPath = False
 632         self.depotPaths = None
 633
 634         if gitConfig("git-p4.syncFromOrigin") == "false":
 635             self.syncWithOrigin = False
 636
 637     def extractFilesFromCommit(self, commit):
 638         files = []
 639         fnum = 0
 640         while commit.has_key("depotFile%s" % fnum):
 641             path =  commit["depotFile%s" % fnum]
 642
 643             found = [p for p in self.depotPaths
 644                      if path.startswith (p)]
 645             if not found:
 646                 fnum = fnum + 1
 647                 continue
 648
 649             file = {}
 650             file["path"] = path
 651             file["rev"] = commit["rev%s" % fnum]
 652             file["action"] = commit["action%s" % fnum]
 653             file["type"] = commit["type%s" % fnum]
 654             files.append(file)
 655             fnum = fnum + 1
 656         return files
 657
 658     def stripRepoPath(self, path, prefixes):
 659         if self.keepRepoPath:
 660             prefixes = [re.sub("^(//[^/]+/).*", r'\1', prefixes[0])]
 661
 662         for p in prefixes:
 663             if path.startswith(p):
 664                 path = path[len(p):]
 665
 666         return path
 667
 668     def splitFilesIntoBranches(self, commit):
 669         branches = {}
 670         fnum = 0
 671         while commit.has_key("depotFile%s" % fnum):
 672             path =  commit["depotFile%s" % fnum]
 673             found = [p for p in self.depotPaths
 674                      if path.startswith (p)]
 675             if not found:
 676                 fnum = fnum + 1
 677                 continue
 678
 679             file = {}
 680             file["path"] = path
 681             file["rev"] = commit["rev%s" % fnum]
 682             file["action"] = commit["action%s" % fnum]
 683             file["type"] = commit["type%s" % fnum]
 684             fnum = fnum + 1
 685
 686             relPath = self.stripRepoPath(path, self.depotPaths)
 687
 688             for branch in self.knownBranches.keys():
 689
 690                 # add a trailing slash so that a commit into qt/4.2foo doesn't end up in qt/4.2
 691                 if relPath.startswith(branch + "/"):
 692                     if branch not in branches:
 693                         branches[branch] = []
 694                     branches[branch].append(file)
 695
 696         return branches
 697
 698     ## Should move this out, doesn't use SELF.
 699     def readP4Files(self, files):
 700         files = [f for f in files
 701                  if f['action'] != 'delete']
 702
 703         if not files:
 704             return
 705
 706         filedata = p4CmdList('print %s' % ' '.join(['"%s#%s"' % (f['path'],
 707                                                                  f['rev'])
 708                                                     for f in files]))
 709
 710         j = 0;
 711         contents = {}
 712         while j < len(filedata):
 713             stat = filedata[j]
 714             j += 1
 715             text = ''
 716             while j < len(filedata) and filedata[j]['code'] in ('text',
 717                                                                 'binary'):
 718                 text += filedata[j]['data']
 719                 j += 1
 720
 721
 722             if not stat.has_key('depotFile'):
 723                 sys.stderr.write("p4 print fails with: %s\n" % repr(stat))
 724                 continue
 725
 726             contents[stat['depotFile']] = text
 727
 728         for f in files:
 729             assert not f.has_key('data')
 730             f['data'] = contents[f['path']]
 731
 732     def commit(self, details, files, branch, branchPrefixes, parent = ""):
 733         epoch = details["time"]
 734         author = details["user"]
 735
 736         if self.verbose:
 737             print "commit into %s" % branch
 738
 739         # start with reading files; if that fails, we should not
 740         # create a commit.
 741         new_files = []
 742         for f in files:
 743             if [p for p in branchPrefixes if f['path'].startswith(p)]:
 744                 new_files.append (f)
 745             else:
 746                 sys.stderr.write("Ignoring file outside of prefix: %s\n" % path)
 747         files = new_files
 748         self.readP4Files(files)
 749
 750
 751
 752
 753         self.gitStream.write("commit %s\n" % branch)
 754 #        gitStream.write("mark :%s\n" % details["change"])
 755         self.committedChanges.add(int(details["change"]))
 756         committer = ""
 757         if author not in self.users:
 758             self.getUserMapFromPerforceServer()
 759         if author in self.users:
 760             committer = "%s %s %s" % (self.users[author], epoch, self.tz)
 761         else:
 762             committer = "%s <a@b> %s %s" % (author, epoch, self.tz)
 763
 764         self.gitStream.write("committer %s\n" % committer)
 765
 766         self.gitStream.write("data <<EOT\n")
 767         self.gitStream.write(details["desc"])
 768         self.gitStream.write("\n[git-p4: depot-paths = \"%s\": change = %s: "
 769                              "options = %s]\n"
 770                              % (','.join (branchPrefixes), details["change"],
 771                                 details['options']
 772                                 ))
 773         self.gitStream.write("EOT\n\n")
 774
 775         if len(parent) > 0:
 776             if self.verbose:
 777                 print "parent %s" % parent
 778             self.gitStream.write("from %s\n" % parent)
 779
 780         for file in files:
 781             if file["type"] == "apple":
 782                 print "\nfile %s is a strange apple file that forks. Ignoring!" % file['path']
 783                 continue
 784
 785             relPath = self.stripRepoPath(file['path'], branchPrefixes)
 786             if file["action"] == "delete":
 787                 self.gitStream.write("D %s\n" % relPath)
 788             else:
 789                 mode = 644
 790                 if file["type"].startswith("x"):
 791                     mode = 755
 792
 793                 data = file['data']
 794
 795                 if self.isWindows and file["type"].endswith("text"):
 796                     data = data.replace("\r\n", "\n")
 797
 798                 self.gitStream.write("M %d inline %s\n" % (mode, relPath))
 799                 self.gitStream.write("data %s\n" % len(data))
 800                 self.gitStream.write(data)
 801                 self.gitStream.write("\n")
 802
 803         self.gitStream.write("\n")
 804
 805         change = int(details["change"])
 806
 807         if self.labels.has_key(change):
 808             label = self.labels[change]
 809             labelDetails = label[0]
 810             labelRevisions = label[1]
 811             if self.verbose:
 812                 print "Change %s is labelled %s" % (change, labelDetails)
 813
 814             files = p4CmdList("files " + ' '.join (["%s...@%s" % (p, change)
 815                                                     for p in branchPrefixes]))
 816
 817             if len(files) == len(labelRevisions):
 818
 819                 cleanedFiles = {}
 820                 for info in files:
 821                     if info["action"] == "delete":
 822                         continue
 823                     cleanedFiles[info["depotFile"]] = info["rev"]
 824
 825                 if cleanedFiles == labelRevisions:
 826                     self.gitStream.write("tag tag_%s\n" % labelDetails["label"])
 827                     self.gitStream.write("from %s\n" % branch)
 828
 829                     owner = labelDetails["Owner"]
 830                     tagger = ""
 831                     if author in self.users:
 832                         tagger = "%s %s %s" % (self.users[owner], epoch, self.tz)
 833                     else:
 834                         tagger = "%s <a@b> %s %s" % (owner, epoch, self.tz)
 835                     self.gitStream.write("tagger %s\n" % tagger)
 836                     self.gitStream.write("data <<EOT\n")
 837                     self.gitStream.write(labelDetails["Description"])
 838                     self.gitStream.write("EOT\n\n")
 839
 840                 else:
 841                     if not self.silent:
 842                         print ("Tag %s does not match with change %s: files do not match."
 843                                % (labelDetails["label"], change))
 844
 845             else:
 846                 if not self.silent:
 847                     print ("Tag %s does not match with change %s: file count is different."
 848                            % (labelDetails["label"], change))
 849
 850     def getUserCacheFilename(self):
 851         return os.environ["HOME"] + "/.gitp4-usercache.txt"
 852
 853     def getUserMapFromPerforceServer(self):
 854         if self.userMapFromPerforceServer:
 855             return
 856         self.users = {}
 857
 858         for output in p4CmdList("users"):
 859             if not output.has_key("User"):
 860                 continue
 861             self.users[output["User"]] = output["FullName"] + " <" + output["Email"] + ">"
 862
 863
 864         s = ''
 865         for (key, val) in self.users.items():
 866             s += "%s\t%s\n" % (key, val)
 867
 868         open(self.getUserCacheFilename(), "wb").write(s)
 869         self.userMapFromPerforceServer = True
 870
 871     def loadUserMapFromCache(self):
 872         self.users = {}
 873         self.userMapFromPerforceServer = False
 874         try:
 875             cache = open(self.getUserCacheFilename(), "rb")
 876             lines = cache.readlines()
 877             cache.close()
 878             for line in lines:
 879                 entry = line.strip().split("\t")
 880                 self.users[entry[0]] = entry[1]
 881         except IOError:
 882             self.getUserMapFromPerforceServer()
 883
 884     def getLabels(self):
 885         self.labels = {}
 886
 887         l = p4CmdList("labels %s..." % ' '.join (self.depotPaths))
 888         if len(l) > 0 and not self.silent:
 889             print "Finding files belonging to labels in %s" % `self.depotPath`
 890
 891         for output in l:
 892             label = output["label"]
 893             revisions = {}
 894             newestChange = 0
 895             if self.verbose:
 896                 print "Querying files for label %s" % label
 897             for file in p4CmdList("files "
 898                                   +  ' '.join (["%s...@%s" % (p, label)
 899                                                 for p in self.depotPaths])):
 900                 revisions[file["depotFile"]] = file["rev"]
 901                 change = int(file["change"])
 902                 if change > newestChange:
 903                     newestChange = change
 904
 905             self.labels[newestChange] = [output, revisions]
 906
 907         if self.verbose:
 908             print "Label changes: %s" % self.labels.keys()
 909
 910     def guessProjectName(self):
 911         for p in self.depotPaths:
 912             if p.endswith("/"):
 913                 p = p[:-1]
 914             p = p[p.strip().rfind("/") + 1:]
 915             if not p.endswith("/"):
 916                p += "/"
 917             return p
 918
 919     def getBranchMapping(self):
 920         for info in p4CmdList("branches"):
 921             details = p4Cmd("branch -o %s" % info["branch"])
 922             viewIdx = 0
 923             while details.has_key("View%s" % viewIdx):
 924                 paths = details["View%s" % viewIdx].split(" ")
 925                 viewIdx = viewIdx + 1
 926                 # require standard //depot/foo/... //depot/bar/... mapping
 927                 if len(paths) != 2 or not paths[0].endswith("/...") or not paths[1].endswith("/..."):
 928                     continue
 929                 source = paths[0]
 930                 destination = paths[1]
 931                 ## HACK
 932                 if source.startswith(self.depotPaths[0]) and destination.startswith(self.depotPaths[0]):
 933                     source = source[len(self.depotPaths[0]):-4]
 934                     destination = destination[len(self.depotPaths[0]):-4]
 935                     if destination not in self.knownBranches:
 936                         self.knownBranches[destination] = source
 937                     if source not in self.knownBranches:
 938                         self.knownBranches[source] = source
 939
 940     def listExistingP4GitBranches(self):
 941         self.p4BranchesInGit = []
 942
 943         cmdline = "git rev-parse --symbolic "
 944         if self.importIntoRemotes:
 945             cmdline += " --remotes"
 946         else:
 947             cmdline += " --branches"
 948
 949         for line in read_pipe_lines(cmdline):
 950             line = line.strip()
 951
 952             ## only import to p4/
 953             if not line.startswith('p4/') or line == "p4/HEAD":
 954                 continue
 955             branch = line
 956
 957             # strip off p4
 958             branch = re.sub ("^p4/", "", line)
 959
 960             self.p4BranchesInGit.append(branch)
 961             self.initialParents[self.refPrefix + branch] = parseRevision(line)
 962
 963     def createOrUpdateBranchesFromOrigin(self):
 964         if not self.silent:
 965             print ("Creating/updating branch(es) in %s based on origin branch(es)"
 966                    % self.refPrefix)
 967
 968         originPrefix = "origin/p4/"
 969
 970         for line in read_pipe_lines("git rev-parse --symbolic --remotes"):
 971             line = line.strip()
 972             if (not line.startswith(originPrefix)) or line.endswith("HEAD"):
 973                 continue
 974
 975             headName = line[len(originPrefix):]
 976             remoteHead = self.refPrefix + headName
 977             originHead = line
 978
 979             original = extractSettingsGitLog(extractLogMessageFromGitCommit(originHead))
 980             if (not original.has_key('depot-paths')
 981                 or not original.has_key('change')):
 982                 continue
 983
 984             update = False
 985             if not gitBranchExists(remoteHead):
 986                 if self.verbose:
 987                     print "creating %s" % remoteHead
 988                 update = True
 989             else:
 990                 settings = extractSettingsGitLog(extractLogMessageFromGitCommit(remoteHead))
 991                 if settings.has_key('change') > 0:
 992                     if settings['depot-paths'] == original['depot-paths']:
 993                         originP4Change = int(original['change'])
 994                         p4Change = int(settings['change'])
 995                         if originP4Change > p4Change:
 996                             print ("%s (%s) is newer than %s (%s). "
 997                                    "Updating p4 branch from origin."
 998                                    % (originHead, originP4Change,
 999                                       remoteHead, p4Change))
1000                             update = True
1001                     else:
1002                         print ("Ignoring: %s was imported from %s while "
1003                                "%s was imported from %s"
1004                                % (originHead, ','.join(original['depot-paths']),
1005                                   remoteHead, ','.join(settings['depot-paths'])))
1006
1007             if update:
1008                 system("git update-ref %s %s" % (remoteHead, originHead))
1009
1010     def updateOptionDict(self, d):
1011         option_keys = {}
1012         if self.keepRepoPath:
1013             option_keys['keepRepoPath'] = 1
1014
1015         d["options"] = ' '.join(sorted(option_keys.keys()))
1016
1017     def readOptions(self, d):
1018         self.keepRepoPath = (d.has_key('options')
1019                              and ('keepRepoPath' in d['options']))
1020
1021     def run(self, args):
1022         self.depotPaths = []
1023         self.changeRange = ""
1024         self.initialParent = ""
1025         self.previousDepotPaths = []
1026
1027         # map from branch depot path to parent branch
1028         self.knownBranches = {}
1029         self.initialParents = {}
1030         self.hasOrigin = gitBranchExists("origin") or gitBranchExists("origin/p4") or gitBranchExists("origin/p4/master")
1031
1032         if self.importIntoRemotes:
1033             self.refPrefix = "refs/remotes/p4/"
1034         else:
1035             self.refPrefix = "refs/heads/p4/"
1036
1037         if self.syncWithOrigin and self.hasOrigin:
1038             if not self.silent:
1039                 print "Syncing with origin first by calling git fetch origin"
1040             system("git fetch origin")
1041
1042         if len(self.branch) == 0:
1043             self.branch = self.refPrefix + "master"
1044             if gitBranchExists("refs/heads/p4") and self.importIntoRemotes:
1045                 system("git update-ref %s refs/heads/p4" % self.branch)
1046                 system("git branch -D p4");
1047             # create it /after/ importing, when master exists
1048             if not gitBranchExists(self.refPrefix + "HEAD") and self.importIntoRemotes:
1049                 system("git symbolic-ref %sHEAD %s" % (self.refPrefix, self.branch))
1050
1051         # TODO: should always look at previous commits,
1052         # merge with previous imports, if possible.
1053         if args == []:
1054             if self.hasOrigin:
1055                 self.createOrUpdateBranchesFromOrigin()
1056             self.listExistingP4GitBranches()
1057
1058             if len(self.p4BranchesInGit) > 1:
1059                 if not self.silent:
1060                     print "Importing from/into multiple branches"
1061                 self.detectBranches = True
1062
1063             if self.verbose:
1064                 print "branches: %s" % self.p4BranchesInGit
1065
1066             p4Change = 0
1067             for branch in self.p4BranchesInGit:
1068                 logMsg =  extractLogMessageFromGitCommit(self.refPrefix + branch)
1069
1070                 settings = extractSettingsGitLog(logMsg)
1071
1072                 self.readOptions(settings)
1073                 if (settings.has_key('depot-paths')
1074                     and settings.has_key ('change')):
1075                     change = int(settings['change']) + 1
1076                     p4Change = max(p4Change, change)
1077
1078                     depotPaths = sorted(settings['depot-paths'])
1079                     if self.previousDepotPaths == []:
1080                         self.previousDepotPaths = depotPaths
1081                     else:
1082                         paths = []
1083                         for (prev, cur) in zip(self.previousDepotPaths, depotPaths):
1084                             for i in range(0, min(len(cur), len(prev))):
1085                                 if cur[i] <> prev[i]:
1086                                     i = i - 1
1087                                     break
1088
1089                             paths.append (cur[:i + 1])
1090
1091                         self.previousDepotPaths = paths
1092
1093             if p4Change > 0:
1094                 self.depotPaths = sorted(self.previousDepotPaths)
1095                 self.changeRange = "@%s,#head" % p4Change
1096                 if not self.detectBranches:
1097                     self.initialParent = parseRevision(self.branch)
1098                 if not self.silent and not self.detectBranches:
1099                     print "Performing incremental import into %s git branch" % self.branch
1100
1101         if not self.branch.startswith("refs/"):
1102             self.branch = "refs/heads/" + self.branch
1103
1104         if len(args) == 0 and self.depotPaths:
1105             if not self.silent:
1106                 print "Depot paths: %s" % ' '.join(self.depotPaths)
1107         else:
1108             if self.depotPaths and self.depotPaths != args:
1109                 print ("previous import used depot path %s and now %s was specified. "
1110                        "This doesn't work!" % (' '.join (self.depotPaths),
1111                                                ' '.join (args)))
1112                 sys.exit(1)
1113
1114             self.depotPaths = sorted(args)
1115
1116         self.revision = ""
1117         self.users = {}
1118
1119         newPaths = []
1120         for p in self.depotPaths:
1121             if p.find("@") != -1:
1122                 atIdx = p.index("@")
1123                 self.changeRange = p[atIdx:]
1124                 if self.changeRange == "@all":
1125                     self.changeRange = ""
1126                 elif ',' not in self.changeRange:
1127                     self.revision = self.changeRange
1128                     self.changeRange = ""
1129                 p = p[0:atIdx]
1130             elif p.find("#") != -1:
1131                 hashIdx = p.index("#")
1132                 self.revision = p[hashIdx:]
1133                 p = p[0:hashIdx]
1134             elif self.previousDepotPaths == []:
1135                 self.revision = "#head"
1136
1137             p = re.sub ("\.\.\.$", "", p)
1138             if not p.endswith("/"):
1139                 p += "/"
1140
1141             newPaths.append(p)
1142
1143         self.depotPaths = newPaths
1144
1145
1146         self.loadUserMapFromCache()
1147         self.labels = {}
1148         if self.detectLabels:
1149             self.getLabels();
1150
1151         if self.detectBranches:
1152             ## FIXME - what's a P4 projectName ?
1153             self.projectName = self.guessProjectName()
1154
1155             if not self.hasOrigin:
1156                 self.getBranchMapping();
1157             if self.verbose:
1158                 print "p4-git branches: %s" % self.p4BranchesInGit
1159                 print "initial parents: %s" % self.initialParents
1160             for b in self.p4BranchesInGit:
1161                 if b != "master":
1162
1163                     ## FIXME
1164                     b = b[len(self.projectName):]
1165                 self.createdBranches.add(b)
1166
1167         self.tz = "%+03d%02d" % (- time.timezone / 3600, ((- time.timezone % 3600) / 60))
1168
1169         importProcess = subprocess.Popen(["git", "fast-import"],
1170                                          stdin=subprocess.PIPE, stdout=subprocess.PIPE,
1171                                          stderr=subprocess.PIPE);
1172         self.gitOutput = importProcess.stdout
1173         self.gitStream = importProcess.stdin
1174         self.gitError = importProcess.stderr
1175
1176         if self.revision:
1177             print "Doing initial import of %s from revision %s" % (' '.join(self.depotPaths), self.revision)
1178
1179             details = { "user" : "git perforce import user", "time" : int(time.time()) }
1180             details["desc"] = ("Initial import of %s from the state at revision %s"
1181                                % (' '.join(self.depotPaths), self.revision))
1182             details["change"] = self.revision
1183             newestRevision = 0
1184
1185             fileCnt = 0
1186             for info in p4CmdList("files "
1187                                   +  ' '.join(["%s...%s"
1188                                                % (p, self.revision)
1189                                                for p in self.depotPaths])):
1190
1191                 if info['code'] == 'error':
1192                     sys.stderr.write("p4 returned an error: %s\n"
1193                                      % info['data'])
1194                     sys.exit(1)
1195
1196
1197                 change = int(info["change"])
1198                 if change > newestRevision:
1199                     newestRevision = change
1200
1201                 if info["action"] == "delete":
1202                     # don't increase the file cnt, otherwise details["depotFile123"] will have gaps!
1203                     #fileCnt = fileCnt + 1
1204                     continue
1205
1206                 for prop in ["depotFile", "rev", "action", "type" ]:
1207                     details["%s%s" % (prop, fileCnt)] = info[prop]
1208
1209                 fileCnt = fileCnt + 1
1210
1211             details["change"] = newestRevision
1212             self.updateOptionDict(details)
1213             try:
1214                 self.commit(details, self.extractFilesFromCommit(details), self.branch, self.depotPaths)
1215             except IOError:
1216                 print "IO error with git fast-import. Is your git version recent enough?"
1217                 print self.gitError.read()
1218
1219         else:
1220             changes = []
1221
1222             if len(self.changesFile) > 0:
1223                 output = open(self.changesFile).readlines()
1224                 changeSet = Set()
1225                 for line in output:
1226                     changeSet.add(int(line))
1227
1228                 for change in changeSet:
1229                     changes.append(change)
1230
1231                 changes.sort()
1232             else:
1233                 if self.verbose:
1234                     print "Getting p4 changes for %s...%s" % (', '.join(self.depotPaths),
1235                                                               self.changeRange)
1236                 assert self.depotPaths
1237                 output = read_pipe_lines("p4 changes " + ' '.join (["%s...%s" % (p, self.changeRange)
1238                                                                     for p in self.depotPaths]))
1239
1240                 for line in output:
1241                     changeNum = line.split(" ")[1]
1242                     changes.append(changeNum)
1243
1244                 changes.reverse()
1245
1246                 if len(self.maxChanges) > 0:
1247                     changes = changes[0:min(int(self.maxChanges), len(changes))]
1248
1249             if len(changes) == 0:
1250                 if not self.silent:
1251                     print "No changes to import!"
1252                 return True
1253
1254             self.updatedBranches = set()
1255
1256             cnt = 1
1257             for change in changes:
1258                 description = p4Cmd("describe %s" % change)
1259                 self.updateOptionDict(description)
1260
1261                 if not self.silent:
1262                     sys.stdout.write("\rImporting revision %s (%s%%)" % (change, cnt * 100 / len(changes)))
1263                     sys.stdout.flush()
1264                 cnt = cnt + 1
1265
1266                 try:
1267                     if self.detectBranches:
1268                         branches = self.splitFilesIntoBranches(description)
1269                         for branch in branches.keys():
1270                             ## HACK  --hwn
1271                             branchPrefix = self.depotPaths[0] + branch + "/"
1272
1273                             parent = ""
1274
1275                             filesForCommit = branches[branch]
1276
1277                             if self.verbose:
1278                                 print "branch is %s" % branch
1279
1280                             self.updatedBranches.add(branch)
1281
1282                             if branch not in self.createdBranches:
1283                                 self.createdBranches.add(branch)
1284                                 parent = self.knownBranches[branch]
1285                                 if parent == branch:
1286                                     parent = ""
1287                                 elif self.verbose:
1288                                     print "parent determined through known branches: %s" % parent
1289
1290                             # main branch? use master
1291                             if branch == "main":
1292                                 branch = "master"
1293                             else:
1294
1295                                 ## FIXME
1296                                 branch = self.projectName + branch
1297
1298                             if parent == "main":
1299                                 parent = "master"
1300                             elif len(parent) > 0:
1301                                 ## FIXME
1302                                 parent = self.projectName + parent
1303
1304                             branch = self.refPrefix + branch
1305                             if len(parent) > 0:
1306                                 parent = self.refPrefix + parent
1307
1308                             if self.verbose:
1309                                 print "looking for initial parent for %s; current parent is %s" % (branch, parent)
1310
1311                             if len(parent) == 0 and branch in self.initialParents:
1312                                 parent = self.initialParents[branch]
1313                                 del self.initialParents[branch]
1314
1315                             self.commit(description, filesForCommit, branch, [branchPrefix], parent)
1316                     else:
1317                         files = self.extractFilesFromCommit(description)
1318                         self.commit(description, files, self.branch, self.depotPaths,
1319                                     self.initialParent)
1320                         self.initialParent = ""
1321                 except IOError:
1322                     print self.gitError.read()
1323                     sys.exit(1)
1324
1325             if not self.silent:
1326                 print ""
1327                 if len(self.updatedBranches) > 0:
1328                     sys.stdout.write("Updated branches: ")
1329                     for b in self.updatedBranches:
1330                         sys.stdout.write("%s " % b)
1331                     sys.stdout.write("\n")
1332
1333
1334         self.gitStream.close()
1335         if importProcess.wait() != 0:
1336             die("fast-import failed: %s" % self.gitError.read())
1337         self.gitOutput.close()
1338         self.gitError.close()
1339
1340         return True
1341
1342 class P4Rebase(Command):
1343     def __init__(self):
1344         Command.__init__(self)
1345         self.options = [ ]
1346         self.description = ("Fetches the latest revision from perforce and "
1347                             + "rebases the current work (branch) against it")
1348         self.verbose = False
1349
1350     def run(self, args):
1351         sync = P4Sync()
1352         sync.run([])
1353         print "Rebasing the current branch"
1354         oldHead = read_pipe("git rev-parse HEAD").strip()
1355         system("git rebase p4")
1356         system("git diff-tree --stat --summary -M %s HEAD" % oldHead)
1357         return True
1358
1359 class P4Clone(P4Sync):
1360     def __init__(self):
1361         P4Sync.__init__(self)
1362         self.description = "Creates a new git repository and imports from Perforce into it"
1363         self.usage = "usage: %prog [options] //depot/path[@revRange]"
1364         self.options.append(
1365             optparse.make_option("--destination", dest="cloneDestination",
1366                                  action='store', default=None,
1367                                  help="where to leave result of the clone"))
1368         self.cloneDestination = None
1369         self.needsGit = False
1370
1371     def defaultDestination(self, args):
1372         ## TODO: use common prefix of args?
1373         depotPath = args[0]
1374         depotDir = re.sub("(@[^@]*)$", "", depotPath)
1375         depotDir = re.sub("(#[^#]*)$", "", depotDir)
1376         depotDir = re.sub(r"\.\.\.$,", "", depotDir)
1377         depotDir = re.sub(r"/$", "", depotDir)
1378         return os.path.split(depotDir)[1]
1379
1380     def run(self, args):
1381         if len(args) < 1:
1382             return False
1383
1384         if self.keepRepoPath and not self.cloneDestination:
1385             sys.stderr.write("Must specify destination for --keep-path\n")
1386             sys.exit(1)
1387
1388         depotPaths = args
1389
1390         if not self.cloneDestination and len(depotPaths) > 1:
1391             self.cloneDestination = depotPaths[-1]
1392             depotPaths = depotPaths[:-1]
1393
1394         for p in depotPaths:
1395             if not p.startswith("//"):
1396                 return False
1397
1398         if not self.cloneDestination:
1399             self.cloneDestination = self.defaultDestination(args)
1400
1401         print "Importing from %s into %s" % (', '.join(depotPaths), self.cloneDestination)
1402         os.makedirs(self.cloneDestination)
1403         os.chdir(self.cloneDestination)
1404         system("git init")
1405         self.gitdir = os.getcwd() + "/.git"
1406         if not P4Sync.run(self, depotPaths):
1407             return False
1408         if self.branch != "master":
1409             if gitBranchExists("refs/remotes/p4/master"):
1410                 system("git branch master refs/remotes/p4/master")
1411                 system("git checkout -f")
1412             else:
1413                 print "Could not detect main branch. No checkout/master branch created."
1414
1415         return True
1416
1417 class HelpFormatter(optparse.IndentedHelpFormatter):
1418     def __init__(self):
1419         optparse.IndentedHelpFormatter.__init__(self)
1420
1421     def format_description(self, description):
1422         if description:
1423             return description + "\n"
1424         else:
1425             return ""
1426
1427 def printUsage(commands):
1428     print "usage: %s <command> [options]" % sys.argv[0]
1429     print ""
1430     print "valid commands: %s" % ", ".join(commands)
1431     print ""
1432     print "Try %s <command> --help for command specific help." % sys.argv[0]
1433     print ""
1434
1435 commands = {
1436     "debug" : P4Debug,
1437     "submit" : P4Submit,
1438     "sync" : P4Sync,
1439     "rebase" : P4Rebase,
1440     "clone" : P4Clone,
1441     "rollback" : P4RollBack
1442 }
1443
1444
1445 def main():
1446     if len(sys.argv[1:]) == 0:
1447         printUsage(commands.keys())
1448         sys.exit(2)
1449
1450     cmd = ""
1451     cmdName = sys.argv[1]
1452     try:
1453         klass = commands[cmdName]
1454         cmd = klass()
1455     except KeyError:
1456         print "unknown command %s" % cmdName
1457         print ""
1458         printUsage(commands.keys())
1459         sys.exit(2)
1460
1461     options = cmd.options
1462     cmd.gitdir = os.environ.get("GIT_DIR", None)
1463
1464     args = sys.argv[2:]
1465
1466     if len(options) > 0:
1467         options.append(optparse.make_option("--git-dir", dest="gitdir"))
1468
1469         parser = optparse.OptionParser(cmd.usage.replace("%prog", "%prog " + cmdName),
1470                                        options,
1471                                        description = cmd.description,
1472                                        formatter = HelpFormatter())
1473
1474         (cmd, args) = parser.parse_args(sys.argv[2:], cmd);
1475     global verbose
1476     verbose = cmd.verbose
1477     if cmd.needsGit:
1478         if cmd.gitdir == None:
1479             cmd.gitdir = os.path.abspath(".git")
1480             if not isValidGitDir(cmd.gitdir):
1481                 cmd.gitdir = read_pipe("git rev-parse --git-dir").strip()
1482                 if os.path.exists(cmd.gitdir):
1483                     cdup = read_pipe("git rev-parse --show-cdup").strip()
1484                     if len(cdup) > 0:
1485                         os.chdir(cdup);
1486
1487         if not isValidGitDir(cmd.gitdir):
1488             if isValidGitDir(cmd.gitdir + "/.git"):
1489                 cmd.gitdir += "/.git"
1490             else:
1491                 die("fatal: cannot locate git repository at %s" % cmd.gitdir)
1492
1493         os.environ["GIT_DIR"] = cmd.gitdir
1494
1495     if not cmd.run(args):
1496         parser.print_help()
1497
1498
1499 if __name__ == '__main__':
1500     main()