# HG changeset patch # User Raphaël Gomès <rgomes@octobus.net> # Date 1739875734 -3600 # Tue Feb 18 11:48:54 2025 +0100 # Node ID 1a99bdbdb71b0ea14f2fe219d80a211baa91f0b7 # Parent a60d1eb74dc628a58400b721d6fefa69b94ea7c2 rust: switch `update` module to the `pyo3` implementation This is the second to last module that is needed for a complete switchover from `rust-cpython`, the last being `copy_tracing`, which should follow soon. diff --git a/mercurial/merge.py b/mercurial/merge.py --- a/mercurial/merge.py +++ b/mercurial/merge.py @@ -53,7 +53,7 @@ """The merge action, data about the merge, and message about the merge, for the keyed file.""" -rust_update_mod = policy.importrust("update") +rust_update_mod = policy.importrust("update", pyo3=True) _pack = struct.pack _unpack = struct.unpack