Mercurial > hg
view tests/failfilemerge.py @ 30109:96a2278ee732
py3: use encoding.environ instead of os.environ
This complains while running hg version on Python 3.5
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Sun, 09 Oct 2016 12:37:10 +0200 |
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)