diff -r 2e9e62242451 -r 278af66e6595 mercurial/cmdutil.py
--- a/mercurial/cmdutil.py	Tue Jul 23 19:14:16 2024 -0400
+++ b/mercurial/cmdutil.py	Tue Jul 23 19:20:22 2024 -0400
@@ -11,6 +11,7 @@
 import functools
 import os
 import re
+import typing
 
 from typing import (
     Any,
@@ -33,6 +34,11 @@
 )
 from .thirdparty import attr
 
+# Force pytype to use the non-vendored package
+if typing.TYPE_CHECKING:
+    # noinspection PyPackageRequirements
+    import attr
+
 from . import (
     bookmarks,
     bundle2,