view tests/failfilemerge.py @ 38395:59c9d3cc810f

similar: use progress helper

A side-effect is that progress is now reported as 1 *before* we start
checking the first file. That seems to be how we do it in most places.

Also, the right topic is now closed.

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

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