##// END OF EJS Templates
rust-pyo3: implementation of LazyAncestors...
rust-pyo3: implementation of LazyAncestors There is a difference in the implementaion of `__contains__` between PyO3 and rust-cpython: if the specified signature in Rust code is for a precise type (e.g., `PyRevision`) rust-cpython would automatically convert the potential resulting `TypeError` into `Ok(false)`, whereas PyO3 let it bubble up. Hence we treat the case manually and add it to the common test. In Mercurial Python code, `None in` for a `LazyAncestors` object can really happens, namely in this lambda from `discover._postprocessobsolete`: ``` ispushed = lambda n: torev(n) in futurecommon ``` This lambda can get called with `n` such that `torev(n)` is `False` (seen in `test-bookmarks-push-pull.t`).

File last commit:

r51699:337bc83c default
r53430:6b694bdf default
Show More
Cargo.toml
21 lines | 600 B | application/toml | TOMLLexer
# 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"