view tests/crashgetbundler.py @ 47916:65e3d8028f2e

dirstate: drop the `_merge` method

It only has one caller that only use one of the branch, so lets inline that
branch and clean things up further.

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

from __future__ import absolute_import

from mercurial.i18n import _
from mercurial import changegroup, error, extensions


def abort(orig, *args, **kwargs):
    raise error.Abort(_('this is an exercise'))


def uisetup(ui):
    extensions.wrapfunction(changegroup, 'getbundler', abort)