Mercurial > hg
view tests/failfilemerge.py @ 28904:80be5dbe6e74
cmdutil: avoid recycling variable name "name" in namespaces code
This just feels like asking for future trouble and confusion.
author | Nathaniel Manista <nathaniel@google.com> |
---|---|
date | Thu, 14 Apr 2016 15:26:18 -0400 |
parents | 424c1632fffb |
children | a7f8939641aa |
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)