Mercurial > hg
view tests/failfilemerge.py @ 48411:5140461ee947 stable
fsmonitor: incorporate fixes for Python 3.10 (issue6612)
Differential Revision: https://phab.mercurial-scm.org/D11862
author | Raphaël Gomès <rgomes@octobus.net> |
---|---|
date | Mon, 06 Dec 2021 11:10:59 +0100 |
parents | a736ab681b78 |
children | de8181c5414d |
line wrap: on
line source
# extension to emulate interrupting filemerge._filemerge from __future__ import absolute_import from mercurial import ( error, extensions, filemerge, ) def failfilemerge( filemergefn, premerge, repo, wctx, mynode, orig, fcd, fco, fca, labels=None ): raise error.Abort(b"^C") return filemergefn(premerge, repo, mynode, orig, fcd, fco, fca, labels) def extsetup(ui): extensions.wrapfunction(filemerge, '_filemerge', failfilemerge)