# HG changeset patch # User Pierre-Yves David # Date 1703018406 -3600 # Node ID 4d12ffde8377c892ec0e2baf55ed900352385252 # Parent 3972d090aba28cfc75ca7db3d25b8a8669cc7e15 pytype: ignore some signature mismatch in registrar pytype is grumpy about a sub method having a different signature than the one we use here. pytype error: internalmerge: Overriding method signature mismatch [signature-mismatch] Base signature: 'def _funcregistrarbase._extrasetup(self, name, func) -> Any'. Subclass signature: 'def internalmerge._extrasetup(self, name, func, mergetype, onfailure = None, precheck = None, binary = False, symlink = False) -> Any'. Parameter 'mergetype' must have a default value. diff -r 3972d090aba2 -r 4d12ffde8377 mercurial/registrar.py --- a/mercurial/registrar.py Tue Dec 19 21:38:46 2023 +0100 +++ b/mercurial/registrar.py Tue Dec 19 21:40:06 2023 +0100 @@ -524,7 +524,7 @@ precheck=None, binary=False, symlink=False, - ): + ): # pytype: disable=signature-mismatch func.mergetype = mergetype func.onfailure = onfailure func.precheck = precheck