Mercurial > hg
view tests/failfilemerge.py @ 40911:8fcda0780136
test: enable sparse-revlog for test-ssh.t
We are about to enable sparse-revlog globally. To help with reviewing the tests
change, we isolate them in individual changesets.
Differential Revision: https://phab.mercurial-scm.org/D5338
author | Boris Feld <boris.feld@octobus.net> |
---|---|
date | Mon, 12 Nov 2018 01:18:03 +0100 |
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)