This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1197

config: also gather effect-flags on experimental.evolution
ClosedPublic

Authored by lothiraldan on Oct 19 2017, 12:10 PM.

Details

Reviewers
krbullock
Group Reviewers
hg-reviewers
Commits
rHGcc977ec0b8b9: config: also gather effect-flags on experimental.evolution
Summary

Effect-flags config was in flight while the previous evolve config renaming
was written. Now that both landed, gather effect-flags in
experimental.evolution like the others evolve-related configurations.

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 19 2017, 12:10 PM
krbullock accepted this revision.Oct 19 2017, 3:40 PM
This revision is now accepted and ready to land.Oct 19 2017, 3:40 PM
Closed by commit rHGcc977ec0b8b9: config: also gather effect-flags on experimental.evolution (authored by lothiraldan). · Explain WhyOct 19 2017, 3:41 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 3041

mercurial/configitems.py

alias=[('experimental', 'allowdivergence')] 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.effect-flags',
default=False,
alias=[('experimental', 'effect-flags')]
)
coreconfigitem('experimental', 'evolution.exchange', coreconfigitem('experimental', 'evolution.exchange',
default=None, default=None,
) )
coreconfigitem('experimental', 'evolution.bundle-obsmarker', coreconfigitem('experimental', 'evolution.bundle-obsmarker',
default=False, default=False,
) )
coreconfigitem('experimental', 'evolution.track-operation', coreconfigitem('experimental', 'evolution.track-operation',
default=True, default=True,
) )
coreconfigitem('experimental', 'maxdeltachainspan', coreconfigitem('experimental', 'maxdeltachainspan',
default=-1, default=-1,
) )
coreconfigitem('experimental', 'mmapindexthreshold', coreconfigitem('experimental', 'mmapindexthreshold',
default=None, default=None,
) )
coreconfigitem('experimental', 'nonnormalparanoidcheck', coreconfigitem('experimental', 'nonnormalparanoidcheck',
default=False, default=False,
) )
coreconfigitem('experimental', 'effect-flags',
default=False,
)
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',
default=False, default=False,

mercurial/obsolete.py

# Operation metadata handling # Operation metadata handling
useoperation = repo.ui.configbool('experimental', useoperation = repo.ui.configbool('experimental',
'evolution.track-operation') 'evolution.track-operation')
if useoperation and operation: if useoperation and operation:
metadata['operation'] = operation metadata['operation'] = operation
# Effect flag metadata handling # Effect flag metadata handling
saveeffectflag = repo.ui.configbool('experimental', saveeffectflag = repo.ui.configbool('experimental',
'effect-flags') 'evolution.effect-flags')
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]
localmetadata = metadata.copy() localmetadata = metadata.copy()

tests/test-obsmarkers-effectflag.t

Test the 'effect-flags' feature Test the 'effect-flags' feature
Global setup Global setup
============ ============
$ . $TESTDIR/testlib/obsmarker-common.sh $ . $TESTDIR/testlib/obsmarker-common.sh
$ cat >> $HGRCPATH <<EOF $ cat >> $HGRCPATH <<EOF
> [ui] > [ui]
> interactive = true > interactive = true
> [phases] > [phases]
> publish=False > publish=False
> [extensions] > [extensions]
> rebase = > rebase =
> [experimental] > [experimental]
> evolution = all > evolution = all
> effect-flags = 1 > evolution.effect-flags = 1
> EOF > EOF
$ hg init $TESTTMP/effect-flags $ hg init $TESTTMP/effect-flags
$ cd $TESTTMP/effect-flags $ cd $TESTTMP/effect-flags
$ mkcommit ROOT $ mkcommit ROOT
amend touching the description only amend touching the description only
----------------------------------- -----------------------------------