Mercurial > hg
view tests/failfilemerge.py @ 45437:e339693addc0
rhg: add harness tests for rhg files
Differential Revision: https://phab.mercurial-scm.org/D8873
author | Antoine Cezar <antoine.cezar@octobus.net> |
---|---|
date | Mon, 03 Aug 2020 11:55:59 +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)