tests/failfilemerge.py

cmdutil: split functions of log-like commands to new module (API)

cmdutil.py is painfully big and makes Emacs slow. Let's split log-related
functions.

  % wc -l mercurial/cmdutil.py
  4027 mercurial/cmdutil.py

  % wc -l mercurial/cmdutil.py mercurial/logcmdutil.py
  3141 mercurial/cmdutil.py
   933 mercurial/logcmdutil.py
  4074 total

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