##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

typing: add minimal annotations to cmd_impls/graft.py to pytype with 3.10...
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
Raphaël Gomès - - Load All Authors

File last commit:

r53206:56e8841a default
r53248:9042ffea default
Show More
Cargo.toml
26 lines | 563 B | application/toml | TOMLLexer
/ rust / rhg / Cargo.toml
History | Source | Raw |Copy content |Copy permalink
Antoine Cezar
rhg: add rhg crate...
 r45503 [package]
name = "rhg"
version = "0.1.0"
Raphaël Gomès
rhg: use `format_bytes!` for error messages...
 r46598 authors = [
"Antoine Cezar <antoine.cezar@octobus.net>",
"Raphaël Gomès <raphael.gomes@octobus.net>",
]
Raphaël Gomès
rust: move all crates in the main workspace to edition 2021...
 r50524 edition = "2021"
Antoine Cezar
rhg: add rhg crate...
 r45503
[dependencies]
Antoine Cezar
rhg: add RootCommand using hg-core FindRoot operation to prepare `hg root`...
 r45592 hg-core = { path = "../hg-core"}
Raphaël Gomès
rhg: upgrade the remainder of the dependencies...
 r50535 chrono = "0.4.23"
Raphaël Gomès
rust: update `clap` to the latest 4.x version...
 r53204 clap = { version = "4", features = ["cargo"] }
Raphaël Gomès
rhg: upgrade dependencies...
 r49807 derive_more = "0.99.17"
Raphaël Gomès
rhg: upgrade the remainder of the dependencies...
 r50535 home = "0.5.4"
Simon Sapin
rhg: Fall back to Python on --repository with an URL...
 r47463 lazy_static = "1.4.0"
Raphaël Gomès
rhg: upgrade the remainder of the dependencies...
 r50535 log = "0.4.17"
Raphaël Gomès
rust: use `logging_timer` instead of `micro_timer`...
 r50808 logging_timer = "1.1.0"
Raphaël Gomès
rhg: upgrade the remainder of the dependencies...
 r50535 regex = "1.7.0"
Raphaël Gomès
rust: update `env_logger` dependency...
 r53205 env_logger = "0.11"
Simon Sapin
rust: Upgrade to format-bytes 0.3...
 r49323 format-bytes = "0.3.0"
Raphaël Gomès
rhg: expand user and environment variables in ignore includes...
 r52644 shellexpand = { version = "3.1", features = ["full"]}
Raphaël Gomès
rust-dependencies: switch from `users` to `whoami`...
 r51576 whoami = "1.4"
Raphaël Gomès
rhg: upgrade the remainder of the dependencies...
 r50535 which = "4.3.0"
Raphaël Gomès
rust: upgrade `rayon` dependency...
 r51221 rayon = "1.7.0"
Arseniy Alekseyev
rhg: ignore readonly FS error when saving dirstate...
 r52652 libc = "0.2.155"