Mercurial > hg
view tests/failfilemerge.py @ 31997:11f501f0a213
revsetlang: add a getboolean helper function
This will be used to parse followlines's "descend" argument.
author | Denis Laxalde <denis@laxalde.org> |
---|---|
date | Sat, 15 Apr 2017 11:26:09 +0200 |
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)