Mercurial > hg
view tests/failfilemerge.py @ 44777:ee0790b67c45 stable
Added signature for changeset cf3e07d7648a
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Fri, 01 May 2020 21:47:39 +0530 |
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)