This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1155

config: gather allowdivergence under the evolution namespace
ClosedPublic

Authored by lothiraldan on Oct 17 2017, 11:04 AM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG29f52e7966dd: config: gather allowdivergence under the evolution namespace
Summary

Grouping all evolution related-config under the experimental.evolution
namespace would helps the future migration outside [experimental].

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

lothiraldan created this revision.Oct 17 2017, 11:04 AM
ryanmce added a subscriber: ryanmce.Oct 17 2017, 6:01 PM

I think this series overall cleans up the namespaces. I don't really love that evolution is still "hiding" under experimental but currently we don't have a way of marking non-"experimental" configs as experimental still so I guess this will have to suffice for now. I'll take a closer look tomorrow if nobody else gets to this first.

quark added a subscriber: quark.Oct 17 2017, 6:51 PM

I'm not a big fan of inserting evolution everywhere. It confuses people. I'd prefer things like experimental.obsstore=bool.

indygreg accepted this revision.Oct 18 2017, 12:05 PM
indygreg added a subscriber: indygreg.

@quark raises a valid point. The good thing is this is all under [experimental] which means there are no BC concerns. I'm all for bikeshedding a better naming strategy when things are marked as non-experimental. Until then, it isn't worth our time IMO.

This revision is now accepted and ready to land.Oct 18 2017, 12:05 PM
Closed by commit rHG29f52e7966dd: config: gather allowdivergence under the evolution namespace (authored by lothiraldan). · Explain WhyOct 18 2017, 12:09 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 2989

hgext/rebase.py

Abort if rebase will create divergence or rebase is noop because of markers Abort if rebase will create divergence or rebase is noop because of markers
`rebaseobsrevs`: set of obsolete revision in source `rebaseobsrevs`: set of obsolete revision in source
`rebaseobsskipped`: set of revisions from source skipped because they have `rebaseobsskipped`: set of revisions from source skipped because they have
successors in destination successors in destination
""" """
# Obsolete node with successors not in dest leads to divergence # Obsolete node with successors not in dest leads to divergence
divergenceok = ui.configbool('experimental', divergenceok = ui.configbool('experimental',
'allowdivergence') 'evolution.allowdivergence')
divergencebasecandidates = rebaseobsrevs - rebaseobsskipped divergencebasecandidates = rebaseobsrevs - rebaseobsskipped
if divergencebasecandidates and not divergenceok: if divergencebasecandidates and not divergenceok:
divhashes = (str(repo[r]) divhashes = (str(repo[r])
for r in divergencebasecandidates) for r in divergencebasecandidates)
msg = _("this rebase will cause " msg = _("this rebase will cause "
"divergences from: %s") "divergences from: %s")
h = _("to force the rebase please set " h = _("to force the rebase please set "
"experimental.allowdivergence=True") "experimental.evolution.allowdivergence=True")
raise error.Abort(msg % (",".join(divhashes),), hint=h) raise error.Abort(msg % (",".join(divhashes),), hint=h)
def successorrevs(unfi, rev): def successorrevs(unfi, rev):
"""yield revision numbers for successors of rev""" """yield revision numbers for successors of rev"""
assert unfi.filtername is None assert unfi.filtername is None
nodemap = unfi.changelog.nodemap nodemap = unfi.changelog.nodemap
for s in obsutil.allsuccessors(unfi.obsstore, [unfi[rev].node()]): for s in obsutil.allsuccessors(unfi.obsstore, [unfi[rev].node()]):
if s in nodemap: if s in nodemap:

mercurial/configitems.py

default=None, default=None,
) )
coreconfigitem('email', 'method', coreconfigitem('email', 'method',
default='smtp', default='smtp',
) )
coreconfigitem('email', 'reply-to', coreconfigitem('email', 'reply-to',
default=None, default=None,
) )
coreconfigitem('experimental', 'allowdivergence',
default=False,
)
coreconfigitem('experimental', 'archivemetatemplate', coreconfigitem('experimental', 'archivemetatemplate',
default=dynamicdefault, default=dynamicdefault,
) )
coreconfigitem('experimental', 'bundle-phases', coreconfigitem('experimental', 'bundle-phases',
default=False, default=False,
) )
coreconfigitem('experimental', 'bundle2-advertise', coreconfigitem('experimental', 'bundle2-advertise',
default=True, default=True,
default=None, default=None,
) )
coreconfigitem('experimental', 'editortmpinhg', coreconfigitem('experimental', 'editortmpinhg',
default=False, default=False,
) )
coreconfigitem('experimental', 'evolution', coreconfigitem('experimental', 'evolution',
default=list, default=list,
) )
coreconfigitem('experimental', 'evolution.allowdivergence',
default=False,
alias=[('experimental', 'allowdivergence')]
)
coreconfigitem('experimental', 'evolution.allowunstable', coreconfigitem('experimental', 'evolution.allowunstable',
default=None, default=None,
) )
coreconfigitem('experimental', 'evolution.createmarkers', coreconfigitem('experimental', 'evolution.createmarkers',
default=None, default=None,
) )
coreconfigitem('experimental', 'evolution.exchange', coreconfigitem('experimental', 'evolution.exchange',
default=None, default=None,

mercurial/help/config.txt

If true, don't show a progress bar. If true, don't show a progress bar.
``assume-tty`` ``assume-tty``
If true, ALWAYS show a progress bar, unless disable is given. If true, ALWAYS show a progress bar, unless disable is given.
``rebase`` ``rebase``
---------- ----------
``allowdivergence`` ``evolution.allowdivergence``
Default to False, when True allow creating divergence when performing Default to False, when True allow creating divergence when performing
rebase of obsolete changesets. rebase of obsolete changesets.
``revsetalias`` ``revsetalias``
--------------- ---------------
Alias definitions for revsets. See :hg:`help revsets` for details. Alias definitions for revsets. See :hg:`help revsets` for details.

tests/test-rebase-obsolete.t

bar foo bar foo
branch: default branch: default
commit: (clean) commit: (clean)
update: 2 new changesets, 3 branch heads (merge) update: 2 new changesets, 3 branch heads (merge)
phases: 8 draft phases: 8 draft
orphan: 1 changesets orphan: 1 changesets
$ hg rebase -s 10 -d 12 $ hg rebase -s 10 -d 12
abort: this rebase will cause divergences from: 121d9e3bc4c6 abort: this rebase will cause divergences from: 121d9e3bc4c6
(to force the rebase please set experimental.allowdivergence=True) (to force the rebase please set experimental.evolution.allowdivergence=True)
[255] [255]
$ hg log -G $ hg log -G
@ 14:73568ab6879d bar foo @ 14:73568ab6879d bar foo
| |
| o 13:77d874d096a2 10' | o 13:77d874d096a2 10'
| | | |
| | o 12:3eb461388009 john doe | | o 12:3eb461388009 john doe
| |/ | |/
x | 10:121d9e3bc4c6 P x | 10:121d9e3bc4c6 P
|/ |/
o 9:4be60e099a77 C o 9:4be60e099a77 C
| |
o 6:9c48361117de D o 6:9c48361117de D
| |
o 2:261e70097290 B2 o 2:261e70097290 B2
| |
o 0:4a2df7238c3b A o 0:4a2df7238c3b A
With experimental.allowdivergence=True, rebase can create divergence With experimental.evolution.allowdivergence=True, rebase can create divergence
$ hg rebase -s 10 -d 12 --config experimental.allowdivergence=True $ hg rebase -s 10 -d 12 --config experimental.evolution.allowdivergence=True
rebasing 10:121d9e3bc4c6 "P" rebasing 10:121d9e3bc4c6 "P"
rebasing 14:73568ab6879d "bar foo" (tip) rebasing 14:73568ab6879d "bar foo" (tip)
$ hg summary $ hg summary
parent: 16:61bd55f69bc4 tip parent: 16:61bd55f69bc4 tip
bar foo bar foo
branch: default branch: default
commit: (clean) commit: (clean)
update: 1 new changesets, 2 branch heads (merge) update: 1 new changesets, 2 branch heads (merge)