Mercurial > hg
view tests/failfilemerge.py @ 28188:6411140aeda9
rebase: add potential divergent commit hashes to error message (issue5086)
author | Kostia Balytskyi <ikostia@fb.com> |
---|---|
date | Wed, 17 Feb 2016 20:31:34 +0000 |
parents | 61f4d59e9a0b |
children | 424c1632fffb |
line wrap: on
line source
# extension to emulate interupting filemerge._filemerge from __future__ import absolute_import from mercurial import ( filemerge, extensions, error, ) 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)