Mercurial > hg
view tests/failfilemerge.py @ 45137:3ad0855cc602
phabupdate: allow revisions to be marked "closed"
(Yes, the transaction name and final state in the comment here do differ.)
Differential Revision: https://phab.mercurial-scm.org/D8753
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Wed, 15 Jul 2020 14:06:12 -0400 |
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)