tests/failfilemerge.py
author Pierre-Yves David <pierre-yves.david@octobus.net>
Wed, 28 Feb 2024 12:56:08 +0100
changeset 51522 5f9350956c03
parent 48875 6000f5b25c9b
permissions -rw-r--r--
branchcache: add more test for the logic around obsolescence and branch heads While working on branch-cache-v3, we noticed some ambiguity in the filtered+obsolete hash. However this was only caught by a rebase test by chance. It seems important to explicitly tests these cases.

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