Mercurial > hg
view tests/failfilemerge.py @ 43831:088ba9d94079
rust-dirs-multiset: use `AsRef` instead of concrete types when possible
I also renamed `vec` to `dirstate`, because it was not a great name.
Differential Revision: https://phab.mercurial-scm.org/D7524
author | Raphaël Gomès <rgomes@octobus.net> |
---|---|
date | Fri, 29 Nov 2019 17:19:34 +0100 |
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)