diff -r f5d134e57f51 -r 9d79ffeed7c0 mercurial/interfaces/dirstate.py --- a/mercurial/interfaces/dirstate.py Mon Dec 09 00:01:03 2024 -0500 +++ b/mercurial/interfaces/dirstate.py Mon Dec 09 00:21:38 2024 -0500 @@ -22,10 +22,11 @@ # to avoid circular imports from .. import ( match as matchmod, - scmutil, transaction as txnmod, ) + from . import status as istatus + # TODO: finish adding type hints AddParentChangeCallbackT = Callable[ ["idirstate", Tuple[Any, Any], Tuple[Any, Any]], Any @@ -49,7 +50,7 @@ """The return type of dirstate.flagfunc().""" # TODO: verify and complete this- it came from a pytype *.pyi file - StatusReturnT = Tuple[Any, scmutil.status, Any] + StatusReturnT = Tuple[Any, istatus.Status, Any] """The return type of dirstate.status().""" # TODO: probably doesn't belong here.