Mercurial > hg
view tests/failfilemerge.py @ 29381:8bfe44494a0d
templates: add support for filerevision webcommand in json style
author | Laura Médioni <laura.medioni@logilab.fr> |
---|---|
date | Fri, 03 Jun 2016 12:32:42 +0200 |
parents | 424c1632fffb |
children | a7f8939641aa |
line wrap: on
line source
# extension to emulate interupting filemerge._filemerge from __future__ import absolute_import from mercurial import ( error, extensions, filemerge, ) def failfilemerge(filemergefn, premerge, repo, 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)