view tests/failfilemerge.py @ 44024:a1ee825fc6c5

tests: fix a copy/paste name duplication in storage.py

Flagged by PyCharm as a redeclared name without usage, because the name matches
the function immediately preceding it.  But since this differs by doing regular
reads instead of raw reads, I assume we still want it.  But I don't see either
function being called anywhere.

Differential Revision: https://phab.mercurial-scm.org/D7769

# 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)