view tests/failfilemerge.py @ 37552:8b8a845c85fc

httppeer: perform capabilities request in makepeer()

Previously, we constructed an httppeer then always ran _fetchcaps()
to issue the capabilities command.

We want to issue the capabilities command before constructing a
peer instance so we can construct an appropriate peer instance
depending on the capabilities result.

With the code for making and sending requests moved out of httppeer,
it is now possible to send command requests without an httppeer.

This commit creates a new function for making the capabilities
request and calls it as part of makepeer().

This code should be functionality equivalent to what existed before.

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

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