Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/merge.py @ 52986:1a99bdbdb71b
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.
| author | Rapha?l Gom?s <rgomes@octobus.net> |
|---|---|
| date | Tue, 18 Feb 2025 11:48:54 +0100 |
| parents | ea9846b8e539 |
| children |
comparison
equal
deleted
inserted
replaced
| 52985:a60d1eb74dc6 | 52986:1a99bdbdb71b |
|---|---|
| 51 mergestatemod.MergeAction, Optional[MergeResultData], bytes | 51 mergestatemod.MergeAction, Optional[MergeResultData], bytes |
| 52 ] | 52 ] |
| 53 """The merge action, data about the merge, and message about the merge, for | 53 """The merge action, data about the merge, and message about the merge, for |
| 54 the keyed file.""" | 54 the keyed file.""" |
| 55 | 55 |
| 56 rust_update_mod = policy.importrust("update") | 56 rust_update_mod = policy.importrust("update", pyo3=True) |
| 57 | 57 |
| 58 _pack = struct.pack | 58 _pack = struct.pack |
| 59 _unpack = struct.unpack | 59 _unpack = struct.unpack |
| 60 | 60 |
| 61 | 61 |