tests/failfilemerge.py
author Martin von Zweigbergk <martinvonz@google.com>
Thu, 22 Jun 2017 15:59:07 -0700
changeset 33038 f0efd2bffe1e
parent 30332 318a24b52eeb
child 34122 c0ce60459d84
permissions -rw-r--r--
bundle: extract _processchangegroup() method The new method applies the changegroup and fills in op.records, sharing a little bit of code between the two callers. We'll add another caller soon.

# extension to emulate interrupting filemerge._filemerge

from __future__ import absolute_import

from mercurial import (
    error,
    extensions,
    filemerge,
)

def failfilemerge(filemergefn,
                  premerge, repo, 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)