view tests/failfilemerge.py @ 41731:92055d539e49

tests: conditionalize msys path mangling in test-bundle.t

This broke in 252cc56c9ff6 when the variables were printed one per line.  The
only reason I can think of is that MSYS knew the former string couldn't be a
list of paths, but thinks this form is.

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