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