view tests/failfilemerge.py @ 38101:6acf41bb8d40

status: add default of --terse=u to tweakdefaults (BC)

This is in line with both Git and Subversion, and strikes me as a more
humane behavior.

Test output changes are expected once you read test-status.t, and I
feel like we've still got adequate coverage on things.

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

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