Mercurial > hg
view tests/failfilemerge.py @ 40256:d4d2c567bb72
py3: fix test-parse-date.t
Differential Revision: https://phab.mercurial-scm.org/D5084
author | Mark Thomas <mbthomas@fb.com> |
---|---|
date | Sat, 13 Oct 2018 13:39:07 +0000 |
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)