Mercurial > hg
view tests/failfilemerge.py @ 29942:3664537386ab
crecord: delete commented line
author | Nathan Goldbaum <ngoldbau@illinois.edu> |
---|---|
date | Wed, 14 Sep 2016 11:39:47 -0500 |
parents | a7f8939641aa |
children | 318a24b52eeb |
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)