Mercurial > hg
view tests/failfilemerge.py @ 29188:f00f1de16454
tests: mark test-atomictempfile.py write as binary
author | timeless <timeless@mozdev.org> |
---|---|
date | Wed, 20 Apr 2016 19:55:59 +0000 |
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)