Mercurial > hg

view tests/failfilemerge.py @ 51028:f70ce1aedbcb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
manifestrevlog: flag some inconsistency in bundle/union repo inheritance This "work" but still, this is weird, let us point it out.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 10 Oct 2023 10:01:57 +0200
parents 6000f5b25c9b
children
line wrap: on
line source

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