This is an archive of the discontinued Mercurial Phabricator instance.

Differential D248

config: rename evolution config into stabilization
ClosedPublic

Authored by lothiraldan on Aug 7 2017, 6:09 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGd434a7f0685c: config: rename evolution config into stabilization
Summary

Use aliases for backward-compatibility. Though I'm not sure how to emit
compatibility warnings with aliases.

Test configuration are updated in the next patch.

The renaming is done according to
https://www.mercurial-scm.org/wiki/CEDVocabulary.

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.Aug 7 2017, 6:09 AM
Closed by commit rHGd434a7f0685c: config: rename evolution config into stabilization (authored by lothiraldan). · Explain WhyAug 11 2017, 4:03 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (2 lines)
Mmercurial/configitems.py (9 lines)
Mmercurial/obsolete.py (4 lines)

Diff 802

mercurial/commands.py

# b) introducing a command flag. # b) introducing a command flag.
compopts = {} compopts = {}
complevel = ui.configint('experimental', 'bundlecomplevel') complevel = ui.configint('experimental', 'bundlecomplevel')
if complevel is not None: if complevel is not None:
compopts['level'] = complevel compopts['level'] = complevel
contentopts = {'cg.version': cgversion} contentopts = {'cg.version': cgversion}
if repo.ui.configbool('experimental', 'evolution.bundle-obsmarker'): if repo.ui.configbool('experimental', 'stabilization.bundle-obsmarker'):
contentopts['obsolescence'] = True contentopts['obsolescence'] = True
if repo.ui.configbool('experimental', 'bundle-phases'): if repo.ui.configbool('experimental', 'bundle-phases'):
contentopts['phases'] = True contentopts['phases'] = True
bundle2.writenewbundle(ui, repo, 'bundle', fname, bversion, outgoing, bundle2.writenewbundle(ui, repo, 'bundle', fname, bversion, outgoing,
contentopts, compression=bcompression, contentopts, compression=bcompression,
compopts=compopts) compopts=compopts)
@command('cat', @command('cat',

mercurial/configitems.py

default=None, default=None,
) )
coreconfigitem('experimental', 'disablecopytrace', coreconfigitem('experimental', 'disablecopytrace',
default=False, default=False,
) )
coreconfigitem('experimental', 'editortmpinhg', coreconfigitem('experimental', 'editortmpinhg',
default=False, default=False,
) )
coreconfigitem('experimental', 'evolution', coreconfigitem('experimental', 'stabilization',
default=list, default=list,
alias=[('experimental', 'evolution')],
) )
coreconfigitem('experimental', 'evolution.bundle-obsmarker', coreconfigitem('experimental', 'stabilization.bundle-obsmarker',
default=False, default=False,
alias=[('experimental', 'evolution.bundle-obsmarker')],
) )
coreconfigitem('experimental', 'evolution.track-operation', coreconfigitem('experimental', 'stabilization.track-operation',
default=False, default=False,
alias=[('experimental', 'evolution.track-operation')]
) )
coreconfigitem('experimental', 'exportableenviron', coreconfigitem('experimental', 'exportableenviron',
default=list, default=list,
) )
coreconfigitem('experimental', 'extendedheader.index', coreconfigitem('experimental', 'extendedheader.index',
default=None, default=None,
) )
coreconfigitem('experimental', 'extendedheader.similarity', coreconfigitem('experimental', 'extendedheader.similarity',

mercurial/obsolete.py

createmarkersopt = 'createmarkers' createmarkersopt = 'createmarkers'
allowunstableopt = 'allowunstable' allowunstableopt = 'allowunstable'
exchangeopt = 'exchange' exchangeopt = 'exchange'
def isenabled(repo, option): def isenabled(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.
""" """
result = set(repo.ui.configlist('experimental', 'evolution')) result = set(repo.ui.configlist('experimental', 'stabilization'))
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 been
# set but _enabled is true. # set but _enabled is true.
if len(result) == 0 and _enabled: if len(result) == 0 and _enabled:
return True return True
not take any lock on the repo. not take any lock on the repo.
""" """
# prepare metadata # prepare metadata
if metadata is None: if metadata is None:
metadata = {} metadata = {}
if 'user' not in metadata: if 'user' not in metadata:
metadata['user'] = repo.ui.username() metadata['user'] = repo.ui.username()
useoperation = repo.ui.configbool('experimental', useoperation = repo.ui.configbool('experimental',
'evolution.track-operation') 'stabilization.track-operation')
if useoperation and operation: if useoperation and operation:
metadata['operation'] = operation metadata['operation'] = operation
tr = repo.transaction('add-obsolescence-marker') tr = repo.transaction('add-obsolescence-marker')
try: try:
markerargs = [] markerargs = []
for rel in relations: for rel in relations:
prec = rel[0] prec = rel[0]
sucs = rel[1] sucs = rel[1]