( )⚙ D12217 merge: remove direct rustmod reference

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12217

merge: remove direct rustmod reference
ClosedPublic

Authored by Alphare on Mar 1 2022, 4:41 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGd4486810a179: merge: remove direct rustmod reference
Summary

We shouldn't rely on this member being present in dirstate.py, this creates
unnecessary coupling.
This also can trigger certain issues in edge-cases where the policy is changed
at runtime or multiple Python environments fight, which is an added bonus.

Diff Detail

Repository
rHG Mercurial
Branch
stable
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

Alphare created this revision.Mar 1 2022, 4:41 AM
Alphare added a commit: rHGd4486810a179: merge: remove direct rustmod reference.Mar 1 2022, 10:23 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGd4486810a179: merge: remove direct rustmod reference (authored by Alphare). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/merge.py (5 lines)

Diff 32289

mercurial/merge.py

copies, copies,
encoding, encoding,
error, error,
filemerge, filemerge,
match as matchmod, match as matchmod,
mergestate as mergestatemod, mergestate as mergestatemod,
obsutil, obsutil,
pathutil, pathutil,
policy,
pycompat, pycompat,
scmutil, scmutil,
subrepoutil, subrepoutil,
util, util,
worker, worker,
) )
_pack = struct.pack _pack = struct.pack
# #
# We only allow on Linux and MacOS because that's where fsmonitor is # We only allow on Linux and MacOS because that's where fsmonitor is
# considered stable. # considered stable.
fsmonitorwarning = repo.ui.configbool(b'fsmonitor', b'warn_when_unused') fsmonitorwarning = repo.ui.configbool(b'fsmonitor', b'warn_when_unused')
fsmonitorthreshold = repo.ui.configint( fsmonitorthreshold = repo.ui.configint(
b'fsmonitor', b'warn_update_file_count' b'fsmonitor', b'warn_update_file_count'
) )
# avoid cycle dirstate -> sparse -> merge -> dirstate # avoid cycle dirstate -> sparse -> merge -> dirstate
from . import dirstate dirstate_rustmod = policy.importrust("dirstate")
if dirstate.rustmod is not None: if dirstate_rustmod is not None:
# When using rust status, fsmonitor becomes necessary at higher sizes # When using rust status, fsmonitor becomes necessary at higher sizes
fsmonitorthreshold = repo.ui.configint( fsmonitorthreshold = repo.ui.configint(
b'fsmonitor', b'fsmonitor',
b'warn_update_file_count_rust', b'warn_update_file_count_rust',
) )
try: try:
# avoid cycle: extensions -> cmdutil -> merge # avoid cycle: extensions -> cmdutil -> merge