view tests/failfilemerge.py @ 35159:018aac6d7cb0

hgweb: rename an instance of XMLHttpRequest to xhr in mercurial.js

"xhr" is a really widespread name for this kind of things, no idea where did
"xfr" come from (the original 2228bd109706 doesn't explain that). Let's just
change one letter so the name makes more sense.

# extension to emulate interrupting filemerge._filemerge

from __future__ import absolute_import

from mercurial import (
    error,
    extensions,
    filemerge,
)

def failfilemerge(filemergefn,
                  premerge, repo, wctx, 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)