--- a/mercurial/logcmdutil.py	Tue Jul 23 19:14:16 2024 -0400
+++ b/mercurial/logcmdutil.py	Tue Jul 23 19:20:22 2024 -0400
@@ -9,6 +9,7 @@
 import itertools
 import os
 import posixpath
+import typing
 
 from typing import (
     Any,
@@ -24,6 +25,11 @@
 
 from .thirdparty import attr
 
+# Force pytype to use the non-vendored package
+if typing.TYPE_CHECKING:
+    # noinspection PyPackageRequirements
+    import attr
+
 from . import (
     dagop,
     diffutil,