view tests/failfilemerge.py @ 35066:57d56f603f70

run-tests: fix TESTDIR if testdescs are absolute paths

Commit a18eef03d879 made TESTDIR be the location of the arguments that were
passed to run-tests.py instead of just PWD.  It assumed that these tests were
specified using relative paths, so if pwd was /tmp/foo, and the first argument
was /tmp/baz, it would set TESTDIR to /tmp/foo//tmp/baz.

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

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