Mercurial > hg
view tests/failfilemerge.py @ 40981:08f5482a6755
py3: spawn all python instances with legacy stdio enabled on Windows
This fixes 6 more tests. See ef7119cd4965.
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Mon, 17 Dec 2018 18:25:18 -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)