Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/cmd_impls/graft.py @ 52383:9042ffea4edd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
typing: add minimal annotations to cmd_impls/graft.py to pytype with 3.10 I'm not sure why the same version of pytype passed in CI with Python 3.11. What's failing on 3.10 is related to `statedata`, which is keyed on bytes, but has various value types. It looks like these several types are treated as a union when run with 3.10, and then all of them need to have the same attributes. This will take awhile to untangle, because `TypedDict` requires str keys, so we'll either have to change the keys (and whoever calls this), or migrate to a class with typed fields (and change all of the callers). There are some changes to this module currently in-flight, so I'm opting for the minimal changes here to minimally affect that, while keeping my ability to run pytype locally and track the changes. It's worth pointing out that I'm starting to use py3.9 type hints here, i.e. `Foo | None` instead of `Optional[Foo]`. That's fine even with py3.8 support because of the `from __future__ import annotations`, which delays evaluation. We already don't support pytype checking with all of the runtime supported versions of Python since at least 0851d94bfdaa, with the `ByteString` usage. The errors at the start of this series were: File "/mnt/c/Users/Matt/hg/mercurial/cmd_impls/graft.py", line 238, in _graft_revisions: No attribute 'get' on bool [attribute-error] In Union[Any, Callable, Dict[bytes, Optional[Any]], bool, bytes, dict] Called from (traceback): line 21, in cmd_graft File "/mnt/c/Users/Matt/hg/mercurial/cmd_impls/graft.py", line 238, in _graft_revisions: No attribute 'get' on bytes [attribute-error] In Union[Any, Callable, Dict[bytes, Optional[Any]], bool, bytes, dict] Called from (traceback): line 21, in cmd_graft File "/mnt/c/Users/Matt/hg/mercurial/cmd_impls/graft.py", line 239, in _graft_revisions: No attribute 'get' on bool [attribute-error] In Union[Any, Callable, Dict[bytes, Optional[Any]], bool, bytes, dict] Called from (traceback): line 21, in cmd_graft File "/mnt/c/Users/Matt/hg/mercurial/cmd_impls/graft.py", line 239, in _graft_revisions: No attribute 'get' on bytes [attribute-error] In Union[Any, Callable, Dict[bytes, Optional[Any]], bool, bytes, dict] Called from (traceback): line 21, in cmd_graft File "/mnt/c/Users/Matt/hg/mercurial/cmd_impls/graft.py", line 241, in _graft_revisions: No attribute 'get' on bool [attribute-error] In Union[Any, Callable, Dict[bytes, Optional[Any]], bool, bytes, dict] Called from (traceback): line 21, in cmd_graft File "/mnt/c/Users/Matt/hg/mercurial/cmd_impls/graft.py", line 241, in _graft_revisions: No attribute 'get' on bytes [attribute-error] In Union[Any, Callable, Dict[bytes, Optional[Any]], bool, bytes, dict] Called from (traceback): line 21, in cmd_graft File "/mnt/c/Users/Matt/hg/mercurial/cmd_impls/graft.py", line 260, in _graft_revisions: unsupported operand type(s) for item assignment: bool [unsupported-operands] No attribute '__setitem__' on bool Called from (traceback): line 21, in cmd_graft File "/mnt/c/Users/Matt/hg/mercurial/cmd_impls/graft.py", line 260, in _graft_revisions: unsupported operand type(s) for item assignment: bytes [unsupported-operands] No attribute '__setitem__' on bytes Called from (traceback): line 21, in cmd_graft File "/mnt/c/Users/Matt/hg/mercurial/cmd_impls/graft.py", line 270, in _graft_revisions: No attribute 'get' on bool [attribute-error] In Union[Any, Callable, Dict[bytes, Optional[Any]], bool, bytes, dict] Called from (traceback): line 21, in cmd_graft File "/mnt/c/Users/Matt/hg/mercurial/cmd_impls/graft.py", line 270, in _graft_revisions: No attribute 'get' on bytes [attribute-error] In Union[Any, Callable, Dict[bytes, Optional[Any]], bool, bytes, dict] Called from (traceback): line 21, in cmd_graft File "/mnt/c/Users/Matt/hg/mercurial/cmd_impls/graft.py", line 280, in _graft_revisions: No attribute 'get' on bool [attribute-error] In Union[Any, Callable, Dict[bytes, Optional[Any]], bool, bytes, dict] Called from (traceback): line 21, in cmd_graft File "/mnt/c/Users/Matt/hg/mercurial/cmd_impls/graft.py", line 280, in _graft_revisions: No attribute 'get' on bytes [attribute-error] In Union[Any, Callable, Dict[bytes, Optional[Any]], bool, bytes, dict] Called from (traceback): line 21, in cmd_graft
author Matt Harbison <matt_harbison@yahoo.com>
date Fri, 29 Nov 2024 19:43:39 -0500
parents d4e30c15626d
children cef86c1d5dfd
comparison
equal deleted inserted replaced
52382:d4e30c15626d 52383:9042ffea4edd
1 # graft.py - implementation of the graft command 1 # graft.py - implementation of the graft command
2 2
3 from __future__ import annotations 3 from __future__ import annotations
4 4
5 import typing
6
7 from typing import (
8 Any,
9 Tuple,
10 )
11
5 from ..i18n import _ 12 from ..i18n import _
6 13
7 from .. import cmdutil, error, logcmdutil, merge as mergemod, state as statemod 14 from .. import cmdutil, error, logcmdutil, merge as mergemod, state as statemod
8 15
9 16
10 def cmd_graft(ui, repo, *revs, **opts): 17 if typing.TYPE_CHECKING:
18 _ActionT = str
19 _CmdArgsT = Any # TODO: (statedata, revs, editor, cont, dry_run, tool)
20
21
22 def cmd_graft(ui, repo, *revs, **opts) -> int:
11 """implement the graft command as defined in mercurial/commands.py""" 23 """implement the graft command as defined in mercurial/commands.py"""
12 ret = _process_args(ui, repo, *revs, **opts) 24 ret = _process_args(ui, repo, *revs, **opts)
13 action, graftstate, args = ret 25 action, graftstate, args = ret
14 if action == "ERROR": 26 if action == "ERROR":
15 return -1 27 return -1
23 return _graft_revisions(ui, repo, graftstate, *args) 35 return _graft_revisions(ui, repo, graftstate, *args)
24 else: 36 else:
25 raise error.ProgrammingError('unknown action: %s' % action) 37 raise error.ProgrammingError('unknown action: %s' % action)
26 38
27 39
28 def _process_args(ui, repo, *revs, **opts): 40 def _process_args(
41 ui, repo, *revs, **opts
42 ) -> Tuple[_ActionT, statemod.cmdstate | None, _CmdArgsT | None]:
29 """process the graft command argument to figure out what to do 43 """process the graft command argument to figure out what to do
30 44
31 This also filter the selected revision to skip the one that cannot be graft 45 This also filter the selected revision to skip the one that cannot be graft
32 or were already grafted. 46 or were already grafted.
33 """ 47 """