wireproto: use new peer interface The wirepeer class provides concrete implementations of peer interface methods for calling wire protocol commands. It makes sense for this class to inherit from the peer abstract base class. So we change that. Since httppeer and sshpeer have already been converted to the new interface, peerrepository is no longer adding any value. So it has been removed. httppeer and sshpeer have been updated to reflect the loss of peerrepository and the inheritance of the abstract base class in wirepeer. The code changes in wirepeer are reordering of methods to group by interface. Some Python code in tests was updated to reflect changed APIs. .. api:: peer.peerrepository has been removed. Use repository.peer abstract base class to represent a peer repository. Differential Revision: https://phab.mercurial-scm.org/D338

     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, mynode, orig, fcd, fco, fca, labels=None):

    13

    raise error.Abort("^C")

    14

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

    15

    16

def extsetup(ui):

    17

    extensions.wrapfunction(filemerge, '_filemerge',

    18

                            failfilemerge)