diff -r 7405f8a67611 -r 5c48fd4c0e68 hgext/git/manifest.py --- a/hgext/git/manifest.py Tue Feb 04 14:02:20 2025 -0500 +++ b/hgext/git/manifest.py Thu Jan 30 18:22:01 2025 +0100 @@ -11,6 +11,7 @@ ) from mercurial.node import sha1nodeconstants +from mercurial.interfaces.types import MatcherT from mercurial import ( match as matchmod, @@ -288,7 +289,7 @@ elif match(realname): yield pycompat.fsencode(realname) - def walk(self, match: matchmod.basematcher) -> Iterator[bytes]: + def walk(self, match: MatcherT) -> Iterator[bytes]: # TODO: this is a very lazy way to merge in the pending # changes. There is absolutely room for optimization here by # being clever about walking over the sets...