( )⚙ D11223 obsolete: disable other evolution config options if createmarkers is off

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11223

obsolete: disable other evolution config options if createmarkers is off
ClosedPublic

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

Details

Reviewers
marmoute
Group Reviewers
hg-reviewers
Commits
rHG2cd00052ae4d: obsolete: disable other evolution config options if createmarkers is off
rHGb1e1559f5a45: obsolete: disable other evolution config options if createmarkers is off
Summary

We used to raise an abort in this case, but recent changes to local clone
command (377d8fc20e34) resulted in destrepo both caring about
experimental.evolution config options and not initializing extensions.

So imagine if you had evolve and allowdivergence enabled in your ~/.hgrc. Local
clone stopped working after 377d8fc20e34 because evolve sets
experimental.evolution=all, but only on srcrepo, for destrepo the extension is
not initialized. It's possible to make local cloning work by initializing
extensions for destrepo in some cases, but in other cases (e.g. allowdivergence
in ~/.hgrc, evolve extension in original-repo/.hg/hgrc) it would still fail.

In a discussion with Pierre-Yves David it was decided to simply force other
evolution options to be false if createmarkers is not enabled.

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.

Event Timeline

av6 created this revision.Jul 28 2021, 8:32 AM
marmoute accepted this revision.Jul 28 2021, 10:42 AM
marmoute added a subscriber: marmoute.

This looks like a saner behavior.

av6 added a commit: rHGb1e1559f5a45: obsolete: disable other evolution config options if createmarkers is off.Jul 30 2021, 11:11 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGb1e1559f5a45: obsolete: disable other evolution config options if createmarkers is off (authored by av6). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/obsolete.py (24 lines)
Mtests/test-clone.t (18 lines)

Diff 29749

mercurial/obsolete.py

return option in result return option in result
def getoptions(repo): def getoptions(repo):
"""Returns dicts showing state of obsolescence features.""" """Returns dicts showing state of obsolescence features."""
createmarkersvalue = _getoptionvalue(repo, createmarkersopt) createmarkersvalue = _getoptionvalue(repo, createmarkersopt)
if createmarkersvalue:
unstablevalue = _getoptionvalue(repo, allowunstableopt) unstablevalue = _getoptionvalue(repo, allowunstableopt)
divergencevalue = _getoptionvalue(repo, allowdivergenceopt) divergencevalue = _getoptionvalue(repo, allowdivergenceopt)
exchangevalue = _getoptionvalue(repo, exchangeopt) exchangevalue = _getoptionvalue(repo, exchangeopt)
else:
# createmarkers must be enabled if other options are enabled # if we cannot create obsolescence markers, we shouldn't exchange them
if ( # or perform operations that lead to instability or divergence
unstablevalue or divergencevalue or exchangevalue unstablevalue = False
) and not createmarkersvalue: divergencevalue = False
raise error.Abort( exchangevalue = False
_(
b"'createmarkers' obsolete option must be enabled "
b"if other obsolete options are enabled"
)
)
return { return {
createmarkersopt: createmarkersvalue, createmarkersopt: createmarkersvalue,
allowunstableopt: unstablevalue, allowunstableopt: unstablevalue,
allowdivergenceopt: divergencevalue, allowdivergenceopt: divergencevalue,
exchangeopt: exchangevalue, exchangeopt: exchangevalue,
} }

tests/test-clone.t

adding manifests adding manifests
adding file changes adding file changes
added 14 changesets with 14 changes to 3 files added 14 changesets with 14 changes to 3 files
new changesets acb14030fe0a:0aae7cf88f0d new changesets acb14030fe0a:0aae7cf88f0d
updating to branch stable updating to branch stable
3 files updated, 0 files merged, 0 files removed, 0 files unresolved 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ rm -r ua $ rm -r ua
Local clones don't get confused by unusual experimental.evolution options
$ hg clone \
> --config experimental.evolution=allowunstable,allowdivergence,exchange \
> a ua
updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ rm -r ua
$ hg clone \
> --config experimental.evolution.createmarkers=no \
> --config experimental.evolution.allowunstable=yes \
> --config experimental.evolution.allowdivergence=yes \
> --config experimental.evolution.exchange=yes \
> a ua
updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ rm -r ua
Test clone with special '@' bookmark: Test clone with special '@' bookmark:
$ cd a $ cd a
$ hg bookmark -r a7949464abda @ # branch point of stable from default $ hg bookmark -r a7949464abda @ # branch point of stable from default
$ hg clone . ../i $ hg clone . ../i
updating to bookmark @ updating to bookmark @
2 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg id -i ../i $ hg id -i ../i