Mercurial > hg
view tests/failfilemerge.py @ 31593:ae02cc1f5369
util: add a getfstype method
The util version is a thin wrapper of the osutil version, which is not
always available.
author | Jun Wu <quark@fb.com> |
---|---|
date | Thu, 23 Mar 2017 11:58:45 -0700 |
parents | 318a24b52eeb |
children | c0ce60459d84 |
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, 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)