view tests/failfilemerge.py @ 31776:fe9b33bcec6a

util: extract pure tolf/tocrlf() functions from eol extension This can be used for EOL conversion of text files.
author Yuya Nishihara <yuya@tcha.org>
date Wed, 29 Mar 2017 21:28:54 +0900
parents 318a24b52eeb
children c0ce60459d84
line wrap: on
line source

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