Skip to content
Snippets Groups Projects
Commit d30810d0 authored by Gregory Szorc's avatar Gregory Szorc
Browse files

obsolete: refactor function for getting obsolete options

The function for returning obsolete option values obtains all
options, validates, then returns the option that was requested.

Let's create a new function to return all obsolete option values
so callers needing multiple values can call that.

Differential Revision: https://phab.mercurial-scm.org/D2667
parent a1d2d042
No related branches found
No related tags found
No related merge requests found
......@@ -133,7 +133,25 @@
return option in result
def getoptions(repo):
"""Returns dicts showing state of obsolescence features."""
createmarkersvalue = _getoptionvalue(repo, createmarkersopt)
unstablevalue = _getoptionvalue(repo, allowunstableopt)
exchangevalue = _getoptionvalue(repo, exchangeopt)
# createmarkers must be enabled if other options are enabled
if ((unstablevalue or exchangevalue) and not createmarkersvalue):
raise error.Abort(_("'createmarkers' obsolete option must be enabled "
"if other obsolete options are enabled"))
return {
createmarkersopt: createmarkersvalue,
allowunstableopt: unstablevalue,
exchangeopt: exchangevalue,
}
def isenabled(repo, option):
"""Returns True if the given repository has the given obsolete option
enabled.
"""
......@@ -136,17 +154,8 @@
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
if ((unstabluevalue or exchangevalue) and not createmarkersvalue):
raise error.Abort(_("'createmarkers' obsolete option must be enabled "
"if other obsolete options are enabled"))
return _getoptionvalue(repo, option)
return getoptions(repo)[option]
# Creating aliases for marker flags because evolve extension looks for
# bumpedfix in obsolete.py
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment