tests/failfilemerge.py
author Pierre-Yves David <pierre-yves.david@octobus.net>
Tue, 04 Oct 2022 14:33:31 +0200
branchstable
changeset 49425 f0a3aaa07d6a
parent 48966 6000f5b25c9b
permissions -rw-r--r--
shelve: do not add the dirstate backup to the transaction Otherwise the transaction will properly clean up its mess on abort… deleting the backup in the process. This break with dirstate-v2 that has more file than just the dirstate. The dirstate itself is full of various exception and is "fine" when using dirstate-v1.

# extension to emulate interrupting filemerge._filemerge


from mercurial import (
    error,
    extensions,
    filemerge,
)


def failfilemerge(*args, **kwargs):
    raise error.Abort(b"^C")


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