Mercurial > hg
view tests/failfilemerge.py @ 41844:2105ed01c431
tests: make test-status.t compatible with test-check-module-imports.t
Otherwise the later fails on Python 3.
Differential Revision: https://phab.mercurial-scm.org/D6072
author | Pulkit Goyal <pulkit@yandex-team.ru> |
---|---|
date | Tue, 05 Mar 2019 04:32:23 +0530 |
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)