Mercurial > hg-stable
view tests/failfilemerge.py @ 29102:22c53b3a390d
tests: add globs for Windows
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Thu, 05 May 2016 21:14:12 -0400 |
parents | 424c1632fffb |
children | a7f8939641aa |
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)