Mercurial > hg
view tests/failfilemerge.py @ 49404:c6aac50038bb stable
debug-discovery: deal with case where common is empty
This code was previously confused by case where:
`heads_common == {nullid}`
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Tue, 26 Jul 2022 10:48:06 +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)