comparison mercurial/filemerge.py @ 34036:fe04c018eaac

filemerge: add _restorebackup

Differential Revision: https://phab.mercurial-scm.org/D404

34035:96123bdea43e

        if not r:
            ui.debug(" premerge successful\n")
            return 0
        if premerge not in validkeep:
            # restore from backup and try again
            # TODO: Add a workingfilectx.write(otherfilectx) path so we can use
            # util.copy here instead.
            fcd.write(util.readfile(back), fcd.flags())
    return 1 # continue merging

def _mergecheck(repo, mynode, orig, fcd, fco, fca, toolconf):
    tool, toolpath, binary, symlink = toolconf
    if symlink:

    return {
        "l": " [%s]" % labels[0],
        "o": " [%s]" % labels[1],
    }

def _makebackup(repo, ui, fcd, premerge):
    """Makes a backup of the local `fcd` file prior to merging.

    In addition to preserving the user's pre-existing modifications to `fcd`
    (if any), the backup is used to undo certain premerges, confirm whether a

34036:fe04c018eaac

        if not r:
            ui.debug(" premerge successful\n")
            return 0
        if premerge not in validkeep:
            # restore from backup and try again
            _restorebackup(fcd, back)
    return 1 # continue merging

def _mergecheck(repo, mynode, orig, fcd, fco, fca, toolconf):
    tool, toolpath, binary, symlink = toolconf
    if symlink:

    return {
        "l": " [%s]" % labels[0],
        "o": " [%s]" % labels[1],
    }

def _restorebackup(fcd, back):
    # TODO: Add a workingfilectx.write(otherfilectx) path so we can use
    # util.copy here instead.
    fcd.write(util.readfile(back), fcd.flags())

def _makebackup(repo, ui, fcd, premerge):
    """Makes a backup of the local `fcd` file prior to merging.

    In addition to preserving the user's pre-existing modifications to `fcd`
    (if any), the backup is used to undo certain premerges, confirm whether a