httppeer: refactor how httppeer is created (API) Previously, we passed a bunch of arguments to httppeer.__init__, validated them, then possibly constructed a valid instance. A short while ago, we refactored sshpeer so all the validation and setup work occurs before the constructor. We introduced a makepeer() to hold most of this logic. This commit gives httppeer the same treatment. As a sign that the previous design was poor, __del__ no longer conditionally checks for the presence of an attribute that may not be defined (it is always defined in the new code). .. api:: httppeer.httppeer.__init__ now takes additional arguments. Instances should be obtained by calling httppeer.instance() or httppeer.makepeer() instead. Differential Revision: https://phab.mercurial-scm.org/D2725

     1

# extension to emulate interrupting filemerge._filemerge

     2

     3

from __future__ import absolute_import

     4

     5

from mercurial import (

     6

    error,

     7

    extensions,

     8

    filemerge,

     9

)

    10

    11

def failfilemerge(filemergefn,

    12

                  premerge, repo, wctx, mynode, orig, fcd, fco, fca,

    13

                  labels=None):

    14

    raise error.Abort("^C")

    15

    return filemergefn(premerge, repo, mynode, orig, fcd, fco, fca, labels)

    16

    17

def extsetup(ui):

    18

    extensions.wrapfunction(filemerge, '_filemerge',

    19

                            failfilemerge)