tests/failfilemerge.py
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
Fri, 05 Aug 2016 14:09:04 +0200
changeset 31373 7548522742b5
parent 30332 318a24b52eeb
child 34122 c0ce60459d84
permissions -rw-r--r--
localrepo: deprecate 'repo.join' in favor of 'repo.vfs.join' localrepo have an insane amount of method. Accessing the feature through the vfs is not really harder and allow us to schedule that method for removal.

# 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)