view tests/failfilemerge.py @ 39466:83dd656586b1

tests: improve the widening testing in test-narrow-widen*

Before this patch, we are testing `hg tracked --addinclude` by adding a command
which is not introduced in the changesets till now.

If you closely look at the tests, wider/f was introduced on the server after the
narrow clone was done and extending the existing clone to include wider/f does
not make sense. We should test extending a file which exists.

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

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