Mercurial > hg
view tests/failfilemerge.py @ 46340:7e44d5ca2a2f stable
Added signature for changeset 9da65e3cf370
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Tue, 19 Jan 2021 22:37:35 +0530 |
parents | a736ab681b78 |
children | de8181c5414d |
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(b"^C") return filemergefn(premerge, repo, mynode, orig, fcd, fco, fca, labels) def extsetup(ui): extensions.wrapfunction(filemerge, '_filemerge', failfilemerge)