tests/failfilemerge.py
author Yuya Nishihara <yuya@tcha.org>
Sun, 18 Dec 2016 16:20:04 +0900
changeset 30622 32a07b8a9f77
parent 30342 318a24b52eeb
child 34137 c0ce60459d84
permissions -rw-r--r--
convert: remove unused-but-set variable introduced in db9e883566e8 Spotted by pyflakes.

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