Mercurial > hg
view tests/failfilemerge.py @ 28300:15c5f50e7e13
zeroconf: add whitespace around operator
author | timeless <timeless@mozdev.org> |
---|---|
date | Tue, 01 Mar 2016 09:48:11 +0000 |
parents | 61f4d59e9a0b |
children | 424c1632fffb |
line wrap: on
line source
# extension to emulate interupting filemerge._filemerge from __future__ import absolute_import from mercurial import ( filemerge, extensions, error, ) 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)