Mercurial > hg
view tests/failfilemerge.py @ 32766:fbe9c4dcc8a0
bisect: improve option validation message
author | Brandon McCaig <bamccaig@gmail.com> |
---|---|
date | Fri, 09 Jun 2017 20:12:39 -0400 |
parents | 318a24b52eeb |
children | c0ce60459d84 |
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, 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)