This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1147

config: update evolution-related config
ClosedPublic

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

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGfec79a3f250f: config: update evolution-related config
Summary

Update the evolution helpers function to support both old-style configuration and
new-style configuration:

experimental.evolution=all is renamed into experimental.evolution=true

experimental.evolution=createmarkers is renamed into
experimental.evolution.createmarkers=true

experimental.evolution=allowunstable is renamed into
experimental.evolution.allowunstable=true

experimental.evolution=exchange is renamed into
experimental.evolution.exchange=true

We choose to not rename individual config options; keeping the same names
would easy the transition for users but it's something that could be easily
done in the future.

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:03 AM
indygreg accepted this revision.Oct 18 2017, 11:57 AM
indygreg added a subscriber: indygreg.

This seems reasonable and is a much, much more flexible approach.

mercurial/obsolete.py
145–146

It feels like we should automatically enable createmarkers in this scenario instead of being user hostile. But this can be done as a follow-up.

This revision is now accepted and ready to land.Oct 18 2017, 11:57 AM
Closed by commit rHGfec79a3f250f: config: update evolution-related config (authored by lothiraldan). · Explain WhyOct 18 2017, 12:08 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/configitems.py (9 lines)
Mmercurial/obsolete.py (52 lines)

Diff 2981

mercurial/configitems.py

) )
coreconfigitem('experimental', 'editortmpinhg', coreconfigitem('experimental', 'editortmpinhg',
default=False, default=False,
) )
coreconfigitem('experimental', 'evolution', coreconfigitem('experimental', 'evolution',
default=list, default=list,
alias=[('experimental', 'stabilization')], alias=[('experimental', 'stabilization')],
) )
coreconfigitem('experimental', 'evolution.allowunstable',
default=None,
)
coreconfigitem('experimental', 'evolution.createmarkers',
default=None,
)
coreconfigitem('experimental', 'evolution.exchange',
default=None,
)
coreconfigitem('experimental', 'evolution.bundle-obsmarker', coreconfigitem('experimental', 'evolution.bundle-obsmarker',
default=False, default=False,
alias=[('experimental', 'stabilization.bundle-obsmarker')], alias=[('experimental', 'stabilization.bundle-obsmarker')],
) )
coreconfigitem('experimental', 'evolution.track-operation', coreconfigitem('experimental', 'evolution.track-operation',
default=True, default=True,
alias=[('experimental', 'stabilization.track-operation')] alias=[('experimental', 'stabilization.track-operation')]
) )

mercurial/obsolete.py

# you have to rely on third party extension extension to enable this. # you have to rely on third party extension extension to enable this.
_enabled = False _enabled = False
# Options for obsolescence # Options for obsolescence
createmarkersopt = 'createmarkers' createmarkersopt = 'createmarkers'
allowunstableopt = 'allowunstable' allowunstableopt = 'allowunstable'
exchangeopt = 'exchange' exchangeopt = 'exchange'
def isenabled(repo, option): def _getoptionvalue(repo, option):
"""Returns True if the given repository has the given obsolete option """Returns True if the given repository has the given obsolete option
enabled. enabled.
""" """
configkey = 'evolution.%s' % option
newconfig = repo.ui.configbool('experimental', configkey)
# Return the value only if defined
if newconfig is not None:
return newconfig
# Fallback on generic option
try:
return repo.ui.configbool('experimental', 'evolution')
except (error.ConfigError, AttributeError):
# Fallback on old-fashion config
# inconsistent config: experimental.evolution
result = set(repo.ui.configlist('experimental', 'evolution')) result = set(repo.ui.configlist('experimental', 'evolution'))
if 'all' in result: if 'all' in result:
return True return True
# For migration purposes, temporarily return true if the config hasn't been # For migration purposes, temporarily return true if the config hasn't
# set but _enabled is true. # been set but _enabled is true.
if len(result) == 0 and _enabled: if len(result) == 0 and _enabled:
return True return True
# Temporary hack for next check
newconfig = repo.ui.config('experimental', 'evolution.createmarkers')
if newconfig:
result.add('createmarkers')
return option in result
def isenabled(repo, option):
"""Returns True if the given repository has the given obsolete option
enabled.
"""
createmarkersvalue = _getoptionvalue(repo, createmarkersopt)
unstabluevalue = _getoptionvalue(repo, allowunstableopt)
exchangevalue = _getoptionvalue(repo, exchangeopt)
# createmarkers must be enabled if other options are enabled # createmarkers must be enabled if other options are enabled
if ((allowunstableopt in result or exchangeopt in result) and if ((unstabluevalue or exchangevalue) and not createmarkersvalue):
not createmarkersopt in result):
raise error.Abort(_("'createmarkers' obsolete option must be enabled " raise error.Abort(_("'createmarkers' obsolete option must be enabled "
"if other obsolete options are enabled")) "if other obsolete options are enabled"))
indygregUnsubmitted
Not Done

It feels like we should automatically enable createmarkers in this scenario instead of being user hostile. But this can be done as a follow-up.

indygreg: It feels like we should automatically enable createmarkers in this scenario instead of being…
return option in result return _getoptionvalue(repo, option)
### obsolescence marker flag ### obsolescence marker flag
## bumpedfix flag ## bumpedfix flag
# #
# When a changeset A' succeed to a changeset A which became public, we call A' # When a changeset A' succeed to a changeset A which became public, we call A'
# "bumped" because it's a successors of a public changesets # "bumped" because it's a successors of a public changesets
# #