Mercurial > hg
view tests/failfilemerge.py @ 40808:c460b1643eb0
tests: stabilize test-blackbox.t on Windows
I didn't look into why the error is more detailed, but that seems like it's a
good thing (other than for recording tests).
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Tue, 04 Dec 2018 00:19:33 -0500 |
parents | c0ce60459d84 |
children | 2372284d9457 |
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)