Mercurial > hg
view tests/failfilemerge.py @ 35895:265e91da56fd
dirstate: drop deprecated methods (API)
.. api::
beginparentchange() and endparentchange() have been replaced by the
parentchange context manager.
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Fri, 02 Feb 2018 23:57:52 -0500 |
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)