Mercurial > hg
view contrib/merge-lists/Cargo.toml @ 51874:1b17309cdaab
typing: make `unionrepository` subclass `localrepository` while type checking
This is the same change as 9d4ad05bc91c made for `bundlerepository`, for the
same reasons.
Also, add a comment here to suppress the PyCharm warning that the superclass
constructor is not called, that is new now that there's a simulated superclass.
That lack of a call is by design- `makeunionrepository()` does magic that
PyCharm isn't aware of. But PyCharm has been better at catching problems than
pytype in a lot of cases, so I'd like to reduce the bogus things it flags, to
make the real issues stand out.
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Thu, 19 Sep 2024 16:19:29 -0400 |
parents | 337bc83c1275 |
children |
line wrap: on
line source
# A tool that performs a 3-way merge, resolving conflicts in sorted lists and # leaving other conflicts unchanged. This is useful with Mercurial's support # for partial merge tools (configured in `[partial-merge-tools]`). [package] name = "merge-lists" version = "0.1.0" edition = "2021" # We need https://github.com/rust-lang/rust/pull/89825 rust-version = "1.59" [dependencies] clap = { version = "4.3.17", features = ["derive"] } itertools = "0.10.3" regex = "1.5.5" similar = { version="2.1.0", features = ["bytes"] } [dev-dependencies] assert_cmd = "2.0.4" insta = "1.13.0" tempdir = "0.3.7"