Mercurial > hg
view tests/failfilemerge.py @ 43276:d201a637c971
py3: encode underlying error message during parse error of %include
author | Denis Laxalde <denis.laxalde@logilab.fr> |
---|---|
date | Thu, 17 Oct 2019 12:10:42 +0200 |
parents | 2372284d9457 |
children | a736ab681b78 |
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("^C") return filemergefn(premerge, repo, mynode, orig, fcd, fco, fca, labels) def extsetup(ui): extensions.wrapfunction(filemerge, '_filemerge', failfilemerge)