This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11222

fix: use obsolete.isenabled() to check for experimental.allowdivergence
ClosedPublic

Authored by av6 on Jul 28 2021, 8:32 AM.

Details

Reviewers
marmoute
Group Reviewers
hg-reviewers
Commits
rHGe69c82bf3a01: fix: use obsolete.isenabled() to check for experimental.allowdivergence
rHG82c87566bfc0: fix: use obsolete.isenabled() to check for experimental.allowdivergence
Summary

Now that obsolete.isenabled() can also check if divergence is allowed, let's
use it for consistency. Other experimental.evolution options are already
checked via this function.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathPackages
Mhgext/fix.py (6 lines)

Diff 29748

hgext/fix.py

cmdutil, cmdutil,
context, context,
copies, copies,
error, error,
match as matchmod, match as matchmod,
mdiff, mdiff,
merge, merge,
mergestate as mergestatemod, mergestate as mergestatemod,
obsolete,
pycompat, pycompat,
registrar, registrar,
rewriteutil, rewriteutil,
scmutil, scmutil,
util, util,
worker, worker,
) )
) )
return revs return revs
def checkfixablectx(ui, repo, ctx): def checkfixablectx(ui, repo, ctx):
"""Aborts if the revision shouldn't be replaced with a fixed one.""" """Aborts if the revision shouldn't be replaced with a fixed one."""
if ctx.obsolete(): if ctx.obsolete():
# It would be better to actually check if the revision has a successor. # It would be better to actually check if the revision has a successor.
allowdivergence = ui.configbool( if not obsolete.isenabled(repo, obsolete.allowdivergenceopt):
b'experimental', b'evolution.allowdivergence'
)
if not allowdivergence:
raise error.Abort( raise error.Abort(
b'fixing obsolete revision could cause divergence' b'fixing obsolete revision could cause divergence'
) )
def pathstofix(ui, repo, pats, opts, match, basectxs, fixctx): def pathstofix(ui, repo, pats, opts, match, basectxs, fixctx):
"""Returns the set of files that should be fixed in a context """Returns the set of files that should be fixed in a context