Mercurial > hg
view tests/failfilemerge.py @ 48173:1d70fb83ff4a
hg: let extensions call the func without populating opts keys
This change is to help extensions by not forcing them to populate with
opts[b'bundle'] and opts[b'force'] when calling hg.incoming(...)
Differential Revision: https://phab.mercurial-scm.org/D11619
author | Sushil khanchi <sushilkhanchi97@gmail.com> |
---|---|
date | Wed, 06 Oct 2021 13:32:07 +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)