tests/failfilemerge.py
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
Thu, 16 Mar 2017 11:17:55 -0700
changeset 31466 b6bbfbaa205a
parent 30332 318a24b52eeb
child 34122 c0ce60459d84
permissions -rw-r--r--
localrepo: fix deprecation warning version of wfile The patch lingered a bit too long in my local clone and I messed up when I updated the version number. Since nobody caught it, I'm fixing the version after the fact.

# extension to emulate interrupting filemerge._filemerge

from __future__ import absolute_import

from mercurial import (
    error,
    extensions,
    filemerge,
)

def failfilemerge(filemergefn,
                  premerge, repo, mynode, orig, fcd, fco, fca, labels=None):
    raise error.Abort("^C")
    return filemergefn(premerge, repo, mynode, orig, fcd, fco, fca, labels)

def extsetup(ui):
    extensions.wrapfunction(filemerge, '_filemerge',
                            failfilemerge)