Mercurial > hg
view tests/failfilemerge.py @ 30025:4d9999e43ff7
histedit: avoid converting nodeid to context and back again
It looks like this became unnecessary in e767f5aba810 (histedit: fix
preventing strips during histedit, 2015-04-04).
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Tue, 27 Sep 2016 22:09:28 -0700 |
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)