Mercurial > hg
view tests/failfilemerge.py @ 41638:e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
This makes the output easier to update and read.
author | Boris Feld <boris.feld@octobus.net> |
---|---|
date | Sat, 09 Feb 2019 01:19:43 +0100 |
parents | c0ce60459d84 |
children | 2372284d9457 |
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, wctx, 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)