Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/merge.py @ 52085:43e15277498e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rust-update: add a config item to disable the Rust update fastpath Explanations inline.
author Rapha?l Gom?s <rgomes@octobus.net>
date Wed, 16 Oct 2024 17:21:03 +0200
parents 8b7123c8947b
children e6a44bc91bc2
comparison
equal deleted inserted replaced
52084:8b7123c8947b 52085:43e15277498e
33 mergestate as mergestatemod, 33 mergestate as mergestatemod,
34 obsutil, 34 obsutil,
35 pathutil, 35 pathutil,
36 policy, 36 policy,
37 pycompat, 37 pycompat,
38 requirements,
39 scmutil, 38 scmutil,
40 subrepoutil, 39 subrepoutil,
41 util, 40 util,
42 worker, 41 worker,
43 ) 42 )
2022 2021
2023 update_from_null = False 2022 update_from_null = False
2024 update_from_null_fallback = False 2023 update_from_null_fallback = False
2025 if ( 2024 if (
2026 MAYBE_USE_RUST_UPDATE 2025 MAYBE_USE_RUST_UPDATE
2026 and repo.ui.configbool(b"rust", b"update-from-null")
2027 and rust_update_mod is not None 2027 and rust_update_mod is not None
2028 and p1.rev() == nullrev 2028 and p1.rev() == nullrev
2029 and not branchmerge 2029 and not branchmerge
2030 # TODO it's probably not too hard to pass down the transaction and 2030 # TODO it's probably not too hard to pass down the transaction and
2031 # respect the write patterns from Rust. But since it doesn't affect 2031 # respect the write patterns from Rust. But since it doesn't affect