Mercurial > hg
view tests/failfilemerge.py @ 45908:122f0b59f5f0
errors: remove trailing "!" in messages about creating new heads on push
Differential Revision: https://phab.mercurial-scm.org/D9380
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Mon, 23 Nov 2020 12:42:57 -0800 |
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)