This is an archive of the discontinued Mercurial Phabricator instance.

Differential D762

config: backout rename evolution config into stabilization
AbandonedPublic

Authored by lothiraldan on Sep 21 2017, 6:52 AM.

Details

Reviewers
quark
Group Reviewers
hg-reviewers
Summary

The renaming of the evolution related config was a mistake, revert
d434a7f0685c to restore original evolution related config keys.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

lothiraldan created this revision.Sep 21 2017, 6:52 AM
martinvonz added a subscriber: martinvonz.Sep 21 2017, 11:37 AM

The renaming of the evolution related config was a mistake, revert
d434a7f0685c to restore original evolution related config keys.

Why do you consider it a mistake?

lothiraldan added a comment.Sep 21 2017, 12:48 PM
In D762#12843, @martinvonz wrote:

The renaming of the evolution related config was a mistake, revert
d434a7f0685c to restore original evolution related config keys.

Why do you consider it a mistake?

I've put the full explanation on the previous patch (https://phab.mercurial-scm.org/D761), do you want me to copy it on this patch too?

martinvonz added a comment.Sep 21 2017, 1:06 PM
In D762#12865, @lothiraldan wrote:
In D762#12843, @martinvonz wrote:

The renaming of the evolution related config was a mistake, revert
d434a7f0685c to restore original evolution related config keys.

Why do you consider it a mistake?

I've put the full explanation on the previous patch (https://phab.mercurial-scm.org/D761), do you want me to copy it on this patch too?

No, that's fine. I just didn't see the other one first.

quark requested changes to this revision.EditedSep 21 2017, 3:24 PM
quark added a subscriber: quark.

-1 as explained in D761. I believe it's cleaner to split the config into:

experimental.obsstore
experimental.obsexchange
experimental.allowunstable

There are much easier to explain to end-users (I can show you conversation where users are super confused about those configs and their relationship with the evolve extension). We already have:

experimental.allowdivergence
This revision now requires changes to proceed.Sep 21 2017, 3:24 PM
lothiraldan abandoned this revision.Oct 17 2017, 11:09 AM

I've resend as https://phab.mercurial-scm.org/D1146.

I didn't put config directly under experimental but under experimental.evolution. Also I used the exact same configuration option names to make the series easier and more readable.

We could always discuss new namespacing and new names later but the hard-work of splitting the config is done in the new series.

Revision Contents
Changeset List

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

Diff 1958

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', 'stabilization.bundle-obsmarker'): if repo.ui.configbool('experimental', 'evolution.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='on', default='on',
) )
coreconfigitem('experimental', 'crecordtest', coreconfigitem('experimental', 'crecordtest',
default=None, default=None,
) )
coreconfigitem('experimental', 'editortmpinhg', coreconfigitem('experimental', 'editortmpinhg',
default=False, default=False,
) )
coreconfigitem('experimental', 'stabilization', coreconfigitem('experimental', 'evolution',
default=list, default=list,
alias=[('experimental', 'evolution')],
) )
coreconfigitem('experimental', 'stabilization.bundle-obsmarker', coreconfigitem('experimental', 'evolution.bundle-obsmarker',
default=False, default=False,
alias=[('experimental', 'evolution.bundle-obsmarker')],
) )
coreconfigitem('experimental', 'stabilization.track-operation', coreconfigitem('experimental', 'evolution.track-operation',
default=True, default=True,
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', 'stabilization')) 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 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',
'stabilization.track-operation') 'evolution.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]