Mercurial > public > mercurial-scm > hg-stable
view tests/failfilemerge.py @ 48607:07069fcd9a6e
filemerge: work with `simplemerge.MergeInput` in `filemerge()`
We currently pass around pairs of file context objects and labels
between functions in the `filemerge` module. I plan to pass around
`simplemerge.MergeInput` instead. This patch prepares for that by
using the type internally in `filemerge.filemerge()`.
Differential Revision: https://phab.mercurial-scm.org/D12017
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Thu, 20 Jan 2022 14:42:50 -0800 |
parents | f45a4a47f6a8 |
children | 6000f5b25c9b |
line wrap: on
line source
# extension to emulate interrupting filemerge._filemerge from __future__ import absolute_import from mercurial import ( error, extensions, filemerge, ) def failfilemerge(*args, **kwargs): raise error.Abort(b"^C") def extsetup(ui): extensions.wrapfunction(filemerge, 'filemerge', failfilemerge)