Mercurial > hg-stable
view tests/failfilemerge.py @ 30589:be5b2098a817
revlog: merge hash checking subfunctions
This patch factors the behavior of both methods into 'checkhash'.
author | Remi Chaintron <remi@fb.com> |
---|---|
date | Tue, 13 Dec 2016 14:21:36 +0000 |
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)