Mercurial > hg
view tests/failfilemerge.py @ 28529:045cdf47851a
fsmonitor: flag msc_stdint as no-check-code
I'd rather not modify code that we're vendoring, so I'm just marking
it this way.
author | Augie Fackler <augie@google.com> |
---|---|
date | Mon, 14 Mar 2016 21:15:59 -0400 |
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)